gentoo auto-resync : 19:08:2023 - 21:39:30

3 files changed, 51 insertions, 28 deletions

diff --git a/app-portage/getuto/Manifest b/app-portage/getuto/Manifest
index 345e7f5885fe..e3b4ccd745c9 100644
--- a/app-portage/getuto/Manifest
+++ b/app-portage/getuto/Manifest
@@ -1,7 +1,7 @@
-DIST getuto-1.0.tar.gz 8218 BLAKE2B 9579bce48cb746db6aabe13b1e809ec73ddd1ea6ed859bbe5b6b860659a2e3747dc8f408c67531854ba6b7f4aa6fc31ac788122eb30d2100213176777d2ca4b3 SHA512 b6de03eef95802d678504321f37093a491a17673ae31b03834bc29a85815aab593fd7e2fe396ac21b83e804939932557c99e69d94d0599e2dbbfb410e1708e2e
 DIST getuto-1.1.tar.gz 9394 BLAKE2B 50a129826a98d1a43e1bee68f4d12707334de6e7dd0408685e4e5b727affe86560199745a65bc810d857afc972ef0e2aab6b712c67061e1379add1b48494c4b5 SHA512 94f88b6562d763aa2b5cea407409e617d9c1bc89db5779fe12cebabf3db22873d60f36e98ca90ce8bbbc4a1f06bb734a1ee059b5735f54cdba24db9f041cc13c
+DIST getuto-1.2.tar.gz 9412 BLAKE2B 0d207ecb83ca0739640a0c7587579b6c4d0437db5b84725dd14a31adee2f10ef1294dac9c159b8757dde42dd2693f82231aed720b7d1db63fa043bd20a5436bc SHA512 2d6ee97461fef1000f3616627c6e9899f5a348f6421e801ded37e96874340260ebb25a6e20138dda073278b8465ed8cebce8537da0e91fa4fc7e661c11f623d9
 DIST libc-1-r1-1.gpkg.tar 20480 BLAKE2B b2c184e20c1a29ff66240e992f9f81219285f525eb63cea081372685cf03a2e231a2edb528259617e74c655fbe61b6e0d8fc0bbdbd8452b6098de58432f019d7 SHA512 ce52f398ea8979ec16161381803740d49a4294c77303880f54090c379ba5eb8e545a3d3550f229cacc18c7763dc3adf7936561ba1c64b43c87692ec66084e4e6
-EBUILD getuto-1.0.ebuild 608 BLAKE2B 99c451fe3ee99e911388c138df8a3684fa2584b332221ba35c7e97e3295376a4c8595365b19b66b3e5c42d6151c8c0a6e14f7df256f335c303c4989e33670b74 SHA512 827ea137370e54a4e8bad393183762ad93d62c34a8627f46b9ec229aa467fb6c35ec6831f9440b67141312260601e35f914a0bbf1c8f6f9ea5f5a337644fcab5
 EBUILD getuto-1.1.ebuild 1089 BLAKE2B f320038ea4725fa226cfc76fae10128f1389dbcd328d87433d69ab9b26444779a228a81dc19765d2efe8ea22b6e21f1c60dc8869b6ad4c6cc63130e841f1dbe5 SHA512 d1c0ecb4d6721606420c8ff35af2824c6b74b99431a8cffa40d6154d03af15b88fb8045c89841359d5324d4c20b03e7bfeb3b190e08aace041850408e93117b5
+EBUILD getuto-1.2.ebuild 1089 BLAKE2B f320038ea4725fa226cfc76fae10128f1389dbcd328d87433d69ab9b26444779a228a81dc19765d2efe8ea22b6e21f1c60dc8869b6ad4c6cc63130e841f1dbe5 SHA512 d1c0ecb4d6721606420c8ff35af2824c6b74b99431a8cffa40d6154d03af15b88fb8045c89841359d5324d4c20b03e7bfeb3b190e08aace041850408e93117b5
 EBUILD getuto-9999.ebuild 1089 BLAKE2B f320038ea4725fa226cfc76fae10128f1389dbcd328d87433d69ab9b26444779a228a81dc19765d2efe8ea22b6e21f1c60dc8869b6ad4c6cc63130e841f1dbe5 SHA512 d1c0ecb4d6721606420c8ff35af2824c6b74b99431a8cffa40d6154d03af15b88fb8045c89841359d5324d4c20b03e7bfeb3b190e08aace041850408e93117b5
 MISC metadata.xml 419 BLAKE2B ec9ec3a23044c8f9970dfb818fb5d5d16498249723f4ffb3bda0c53f19d68e46d0b7c482fcf8c2cac8f31269546a4a600750d57fce84508e4d8307a02d779977 SHA512 6822f2b326b5783deae399912ac479e1e6d18a61fb5d28db9ba9f62d2405abcab51081a499be30b854e16c3b94cf43f7330dc62ca424c40d923eefdaba5a7c9e
diff --git a/app-portage/getuto/getuto-1.0.ebuild b/app-portage/getuto/getuto-1.0.ebuild
deleted file mode 100644
index 21beb1eae2ed..000000000000
--- a/app-portage/getuto/getuto-1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SRC_URI="https://github.com/akhuettel/${PN}/archive/refs/tags/${P}.tar.gz"
-DESCRIPTION="Stand-alone gentoo install trust anchor generation tool"
-HOMEPAGE="
-	https://github.com/akhuettel/getuto/
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-crypt/gnupg
-	dev-libs/openssl
-	sec-keys/openpgp-keys-gentoo-release
-"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_install() {
-	dobin getuto
-}
diff --git a/app-portage/getuto/getuto-1.2.ebuild b/app-portage/getuto/getuto-1.2.ebuild
new file mode 100644
index 000000000000..860cc3595dd0
--- /dev/null
+++ b/app-portage/getuto/getuto-1.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Stand-alone gentoo install trust anchor generation tool"
+HOMEPAGE="https://github.com/projg2/getuto"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/projg2/getuto"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/projg2/getuto/archive/refs/tags/${P}.tar.gz
+	"
+	S=${WORKDIR}/${PN}-${P}
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+SRC_URI+=" test? ( https://mirror.bytemark.co.uk/gentoo/releases/amd64/binpackages/17.1/x86-64/virtual/libc/libc-1-r1-1.gpkg.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-crypt/gnupg
+	dev-libs/openssl
+	sec-keys/openpgp-keys-gentoo-release
+"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		# Don't mangle test data
+		unpack ${P}.tar.gz
+	fi
+
+	if use test ; then
+		cp "${DISTDIR}"/libc-1-r1-1.gpkg.tar "${S}" || die
+	fi
+}
+
+src_install() {
+	dobin getuto
+}