commit:     978c8fd588fa887d0ce86d5403c0b52dcbeab0bb
Author:     Thomas Scholz <thomas.scholz <AT> protonmail <DOT> com>
AuthorDate: Fri Mar  3 17:47:44 2023 +0000
Commit:     Thomas Scholz <thomas.scholz <AT> protonmail <DOT> com>
CommitDate: Fri Mar  3 17:50:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=978c8fd5

app-admin/oet: Reimplemented overlay mounting

Signed-off-by: Thomas Scholz <thomas.scholz <AT> protonmail.com>

 app-admin/oet/Manifest                             |  5 ++--
 app-admin/oet/oet-0.0.0.4.ebuild                   | 35 ----------------------
 .../oet/{oet-0.0.0.2.ebuild => oet-0.0.0.5.ebuild} | 20 ++++++-------
 .../oet/{oet-0.0.0.3.ebuild => oet-0.0.0.7.ebuild} | 22 +++++++-------
 app-admin/oet/oet-9999.ebuild                      | 22 +++++++-------
 5 files changed, 33 insertions(+), 71 deletions(-)

diff --git a/app-admin/oet/Manifest b/app-admin/oet/Manifest
index baece64c0..2241675cb 100644
--- a/app-admin/oet/Manifest
+++ b/app-admin/oet/Manifest
@@ -1,3 +1,2 @@
-DIST oet-0.0.0.2.tar.gz 18284 BLAKE2B 
94db54554b62a2cf598d7c970de9fe4540635f9a877025dea89c2b4580ae9a2dbe784fb27e8cf57a9a5998acad0229356c30167777a6ac56b8b8b41ccc5bc3e2
 SHA512 
82e4a0b26d988b7c3286495d8d5747225aaecc7516979fb70723d3351858750eb32c09663f0238efa638732ce5c21be92b503a15f85b6d6ad6771dab4bdf0836
-DIST oet-0.0.0.3.tar.gz 18750 BLAKE2B 
42931382d172b0fdbc3754898971975dc9a62f36e35a1d1f36d99c906d242072014280ef5c51381b8bb15dfe17ad2f882e213c9061f1fe6e82acaf93753e3316
 SHA512 
cb986b736cc2514808c9242f359c507360c647d64e3450d8c0f992b17d3648ee5385ae93960c21124c0cc77f4c02a0c6d2ad14f4b2f4422d677f41ff8f7292dd
-DIST oet-0.0.0.4.tar.gz 19243 BLAKE2B 
78d262b519c4a434b9290b80f8b22f5b41d124d4c0203eddfcaa6a019a97a158749246cd0d8bd7a9b41944a9d80a5c2921378c57c90897a985323e355a92bac7
 SHA512 
3ed2136b95f91f7ae0fd58a342e8e7d1eba31e785f9cffc66c2f141b7bf67803d6b52dc2b7cbe0216244d9192e1ce0c9ee020f83607d5fc4904e9a3a720c8146
+DIST oet-0.0.0.5.tar.gz 10266 BLAKE2B 
bf85f6e64b9bf17de51ab94629e786a521d2ae6d66ae51b1fd0c1e467f75b402670b912daf5ee4fb2bdb31f0af401ede09d742c9e391d31a007b021d89e40caf
 SHA512 
de9ad98e6def8e2086c87e8d76433ee69cffe25b060775e5bf8764414d67eebd09fa65e76af88b566043b2422375763488023d1581595a6f0f96ecb6fbf58ba5
+DIST oet-0.0.0.7.tar.gz 10932 BLAKE2B 
41630a075d0b3e292b27abe4b40bf326d2730400e8632fe27ff917765781f731bb0094c60c6f05f92238354ea3cccb5eef4a4838e0e7fdcb77ff24be170486fa
 SHA512 
b041944bc5cf8231892b12bd4b40dce5f053996b5b4d712ff77c3ea4792fa374476053ab1ce1cf790f2537a4d1038b2aa445b329142fa2e3b955611d767b452a

diff --git a/app-admin/oet/oet-0.0.0.4.ebuild b/app-admin/oet/oet-0.0.0.4.ebuild
deleted file mode 100644
index 2543a11a9..000000000
--- a/app-admin/oet/oet-0.0.0.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Update your system into binpkgs in an overlay sandbox"
-HOMEPAGE="https://codeberg.org/bcsthsc/overlay-emerge-tool";
-if [[ "${PV}" == "9999" ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://codeberg.org/bcsthsc/overlay-emerge-tool.git";
-       EGIT_BRANCH="main"
-       [[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
-else
-       
SRC_URI="https://codeberg.org/bcsthsc/overlay-emerge-tool/archive/oet-${PV}.tar.gz";
-       S="${WORKDIR}/overlay-emerge-tool"
-       KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-
-src_install() {
-       dosbin src/oet
-       insinto /usr/share/oet
-       dodir /usr/share/oet
-       doins src/oet_auto_emerge_update.source
-       doins src/oet_interactive.source
-       doman resources/oet.1
-       insinto /etc/${PN}
-       newins resources/default_config config
-}
-
-src_compile() {
-       true
-}

diff --git a/app-admin/oet/oet-0.0.0.2.ebuild b/app-admin/oet/oet-0.0.0.5.ebuild
similarity index 75%
rename from app-admin/oet/oet-0.0.0.2.ebuild
rename to app-admin/oet/oet-0.0.0.5.ebuild
index 4484c4c1f..d41b194c7 100644
--- a/app-admin/oet/oet-0.0.0.2.ebuild
+++ b/app-admin/oet/oet-0.0.0.5.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit autotools
+
 DESCRIPTION="Update your system into binpkgs in an overlay sandbox"
 HOMEPAGE="https://codeberg.org/bcsthsc/overlay-emerge-tool";
 if [[ "${PV}" == "9999" ]]; then
@@ -19,15 +21,13 @@ fi
 LICENSE="LGPL-2"
 SLOT="0"
 
-src_install() {
-       dosbin src/oet
-       insinto /usr/share/oet
-       dodir /usr/share/oet
-       doins src/oet_auto_emerge_update.source
-       doins src/oet_interactive.source
-       doman resources/oet.1
+src_prepare() {
+       if [[ "${PV}" == "9999" ]]; then
+               git describe --tags --abbrev=0 | sed -e "s/oet-//" >.version
+       else
+               echo ${PV} >.version
+       fi
+       default
+       eautoreconf -fi
 }
 
-src_compile() {
-       true
-}

diff --git a/app-admin/oet/oet-0.0.0.3.ebuild b/app-admin/oet/oet-0.0.0.7.ebuild
similarity index 73%
rename from app-admin/oet/oet-0.0.0.3.ebuild
rename to app-admin/oet/oet-0.0.0.7.ebuild
index 98ab66f44..d41b194c7 100644
--- a/app-admin/oet/oet-0.0.0.3.ebuild
+++ b/app-admin/oet/oet-0.0.0.7.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit autotools
+
 DESCRIPTION="Update your system into binpkgs in an overlay sandbox"
 HOMEPAGE="https://codeberg.org/bcsthsc/overlay-emerge-tool";
 if [[ "${PV}" == "9999" ]]; then
@@ -16,18 +18,16 @@ else
        KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="LGPL-3"
+LICENSE="LGPL-2"
 SLOT="0"
 
-src_install() {
-       dosbin src/oet
-       insinto /usr/share/oet
-       dodir /usr/share/oet
-       doins src/oet_auto_emerge_update.source
-       doins src/oet_interactive.source
-       doman resources/oet.1
+src_prepare() {
+       if [[ "${PV}" == "9999" ]]; then
+               git describe --tags --abbrev=0 | sed -e "s/oet-//" >.version
+       else
+               echo ${PV} >.version
+       fi
+       default
+       eautoreconf -fi
 }
 
-src_compile() {
-       true
-}

diff --git a/app-admin/oet/oet-9999.ebuild b/app-admin/oet/oet-9999.ebuild
index 2543a11a9..d41b194c7 100644
--- a/app-admin/oet/oet-9999.ebuild
+++ b/app-admin/oet/oet-9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit autotools
+
 DESCRIPTION="Update your system into binpkgs in an overlay sandbox"
 HOMEPAGE="https://codeberg.org/bcsthsc/overlay-emerge-tool";
 if [[ "${PV}" == "9999" ]]; then
@@ -19,17 +21,13 @@ fi
 LICENSE="LGPL-2"
 SLOT="0"
 
-src_install() {
-       dosbin src/oet
-       insinto /usr/share/oet
-       dodir /usr/share/oet
-       doins src/oet_auto_emerge_update.source
-       doins src/oet_interactive.source
-       doman resources/oet.1
-       insinto /etc/${PN}
-       newins resources/default_config config
+src_prepare() {
+       if [[ "${PV}" == "9999" ]]; then
+               git describe --tags --abbrev=0 | sed -e "s/oet-//" >.version
+       else
+               echo ${PV} >.version
+       fi
+       default
+       eautoreconf -fi
 }
 
-src_compile() {
-       true
-}

Reply via email to