gentoo auto-resync : 03:10:2023 - 17:49:12

7 files changed, 78 insertions, 57 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 0c2eb76a92fb..dfa43d3c178d 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index a73ad8a49be1..c00c8a2d71e5 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,6 +1,8 @@
 AUX gentoolkit-0.6.1-data_files.patch 1157 BLAKE2B 1b6bebcc9de77532df7f3eef8e19cb82ed011e36eb20e8dc7f0fcaaabf856c7845cf3c46722c947b8235e3745e2754f227ac02f7ca48ed14af5aa0c4ff7ae906 SHA512 309d36852d4b631cb8767b85059a33f430021598b83fd26cffbddf4ce6487f10a8588ccd835335c48b62ebfd36ddf5f6cf6bc0cc980192f7ceaea90991089891
 AUX gentoolkit-0.6.1-pkgindex.patch 1637 BLAKE2B 836024b833e516dcf2aa005b1ca8ed7a542c9cf4ac5eef7b79f0e05474a0994ef02aa3f14b7fe71b8e4e823f79743e40f7f61bc5e8b0481d3d1ea261ffd90606 SHA512 6afb4dad8a74f8fe2cc285d34f70c7a50db5977dee22129b81160d2e2a069ca8fd7f9b67f57d59e6ebe750a1518447e6cf4f85c6468777a3cfe7e54162c496bc
 DIST gentoolkit-0.6.1.tar.gz 3195781 BLAKE2B 27e370de77586b375dc70caa1abba4c2bc4207e8f08e0a7ea2953097135506949db71ff9102a0ead198e4dea425440c57b94ac7a811ca2d5e0016fc7e234bb0d SHA512 1ffc466b69a9c53f1bbd40f6f4d1eb33d5f0f4287bb65ba1a7b1b2675ad61ecffa55ed9fda7c1ae8148744f0a77e224315eb1903dfd61a2a3dab1600fc672d2d
+DIST gentoolkit-0.6.2.tar.bz2 3186974 BLAKE2B 48f388962e70842b7959467b7697b98121ee2a27bca6e2fc2ebb69782ece1df9b63b4451e19ebacf5a627a9c6feb17f7af395229d2eb870d8bbde1da80262593 SHA512 a1c9157758453f214e6131237df2bc91c49c28a4411ecbb0f74768ae0dd7c4fe8272cfc354a424f6acc8cc322d4eaa35ef98147fe749bc41cb680bb3acfdc2ac
 EBUILD gentoolkit-0.6.1-r3.ebuild 2061 BLAKE2B f3cbbe94e63f285e9eb5826f98fe311649ea2b82ff034ba738ebeb851d9a6f757688f5fce84d7142074fd1a1cdfaf811ebd52f0321ed127a006f7bb5fd608d38 SHA512 75037990e0dbd389e1ff755831fb8773529696596b380cda30a0936b8efd03a39f544e042e57b10a1e080eb0f18ee317eb78fff960f3e7c2195b664846a44e23
-EBUILD gentoolkit-9999.ebuild 1980 BLAKE2B 94e5415feadb6463b4746251f87ce50628cb1b3dd39983fce42b3921e25ab28502c0c0dad5e1b154ca339392732c601ca9a51a9340e5d38ec86a518e01a3cc6a SHA512 46c0cddab0da0ee67ed444bea74fa658b4b476da55d4c5f07c4f431c89bdf443f8bc28d2d47215b4a565ddc1c742130c656dbf8eb941dfc079756ecb2de60849
+EBUILD gentoolkit-0.6.2.ebuild 1995 BLAKE2B 038f05f22a88dda546be2f2c148d5031b0a6d0618eec531e24c1f313d78eba50743bd190b76da5ed2157681f98ef9a9bed0958313b96f98dc6b0f60d3a58c914 SHA512 5849591a8471a5b08a81e54589afc24a59dfe02827314ad7ac9493c2e0505ee1c6705c3a6d72879a880bb94bfb95fed566e34660ecec705a8a0a0982c787c87d
+EBUILD gentoolkit-9999.ebuild 1993 BLAKE2B 1455426d3691ce60a3c5e1782eea30bfc4928bbd2fc223f8149707dd2b401d084058551a537df2a038ade84bdc2ef66252dee17dece51cd127d35cffd174cf0a SHA512 8c5fb4f27bf71a69d2e2d69409588a93173cc1a94451416a971c1f46ce3dfabe213990ceb399d6021f0f27546e068f8efa73e4e96b33060a7d16369ece959165
 MISC metadata.xml 737 BLAKE2B 4145e08f0b544b2bd32a5322944bad4d019d5a693e23ace8d7b0592230c6660bf7ef4d1df4f8852745af7939c8e88e58aa04233d3a69a6e7ad624349b8e335f0 SHA512 28ec82f6a523f69d2c908b4e2cf9823ff8825e39a01187b74d37f90ee78cec751002cdf0786b177df048a5cb1c728bb29fc9f2f743b18200bf307eccdf052ce8
diff --git a/app-portage/gentoolkit/gentoolkit-0.6.2.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.2.ebuild
new file mode 100644
index 000000000000..1e92fde3bb89
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.6.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_REQ_USE="xml(+),threads(+)"
+
+inherit distutils-r1 tmpfiles
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Need newer Portage for eclean-pkg API, bug #900224
+DEPEND="
+	>=sys-apps/portage-3.0.52[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	app-alternatives/awk
+	sys-apps/gentoo-functions
+"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
+
+	if use prefix-guest ; then
+		# use correct repo name, bug #632223
+		sed -i \
+			-e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \
+			pym/gentoolkit/profile.py || die
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process revdep-rebuild.conf
+
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "For further information on gentoolkit, please read the gentoolkit"
+		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
+		elog
+		elog "Another alternative to equery is app-portage/portage-utils"
+		elog
+		elog "Additional tools that may be of interest:"
+		elog
+		elog "    app-admin/eclean-kernel"
+		elog "    app-portage/diffmask"
+		elog "    app-portage/flaggie"
+		elog "    app-portage/portpeek"
+		elog "    app-portage/smart-live-rebuild"
+	fi
+}
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index 3d3ffd4270cd..018a60d8df98 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
diff --git a/app-portage/getuto/Manifest b/app-portage/getuto/Manifest
index 8321058f3861..63af53fce772 100644
--- a/app-portage/getuto/Manifest
+++ b/app-portage/getuto/Manifest
@@ -1,9 +1,7 @@
-DIST getuto-1.6.tar.gz 9956 BLAKE2B 30ccbbe39993473a30bc6267c221ce23c78efa2b112ee1f2e65836f8b72f4e23f223a17c129293a2d3b5e1ca0c993960ef53905ca2af030e381a77c9e30fff5e SHA512 56277b0a64d31ff7e1637ec2288733c0a1c72045700b32c2d261e2d5ad854c1ae17c0f8e70f6080a008bb09fd0e8dcf8256aeb99615e446f4e6a441b9a1a088b
-DIST getuto-1.7.tar.gz 10096 BLAKE2B 952d5a8dca09dcecfc78e055c96b70c997c459767966631142f24ff8c0ce003b5520084aa0938971e61124fad2747c8457a79dadddf76858869fc1de8da9ecab SHA512 43ba49df85c32aaade2b08ca0bc2bdac9edfd4b363a85a84833a17a84fb87dcdb987625bd61862371025ad2b4c364a1fa8d93138bafd7abe4a99fdb2791b3e7b
 DIST getuto-1.8.tar.gz 10196 BLAKE2B 0733057de68c3fc76869984557f84b703be4d1c996080191fe12fe8f4171bbb595c206dfc0c45174a07f0c49b532cb9a30faf3746f9f8e1cecd9fbb4768b5897 SHA512 70e31394ff95e14b4d892e546be1fa4bf3805994056c406bd94a1089fefb2df10d919689f711b5de2517ce03ecdc821826d5640dae87fd1d78baf79b4b55780d
+DIST getuto-1.9.tar.gz 10222 BLAKE2B a2a2ad64097166c86a299e32242edef88c8213b479d8a83399eece29c5f204f3362c48d29638347dde624913ceea4a3ec2bb7bf0936e3065c715ad13dd85caf9 SHA512 fc0e74f90d52dbf637e55d79f70397a71d20ece9f23d11989c152d140d2d08135eee9268bc726bf6504a6a45cf8572803471deb5d192378e6cb76d8f8c00499b
 DIST libc-1-r1-1.gpkg.tar 20480 BLAKE2B b2c184e20c1a29ff66240e992f9f81219285f525eb63cea081372685cf03a2e231a2edb528259617e74c655fbe61b6e0d8fc0bbdbd8452b6098de58432f019d7 SHA512 ce52f398ea8979ec16161381803740d49a4294c77303880f54090c379ba5eb8e545a3d3550f229cacc18c7763dc3adf7936561ba1c64b43c87692ec66084e4e6
-EBUILD getuto-1.6.ebuild 1116 BLAKE2B 76bc04236a23d51dfe96605a13cd53e3809771cf37219654c63aad16bca079dc790da7b4dd4f1bb1ae250aae9b73609aa8750c932e0f7c9b631cfeb4b16d6750 SHA512 0271e571ed14ca2c073884111a7591c7418d8b7a05adbd8ec27e14ae79cf9addaaed195972938f5cdd9ff00d95268be4590fed8c73b08ae52be17cd1ca3acadc
-EBUILD getuto-1.7.ebuild 1116 BLAKE2B 76bc04236a23d51dfe96605a13cd53e3809771cf37219654c63aad16bca079dc790da7b4dd4f1bb1ae250aae9b73609aa8750c932e0f7c9b631cfeb4b16d6750 SHA512 0271e571ed14ca2c073884111a7591c7418d8b7a05adbd8ec27e14ae79cf9addaaed195972938f5cdd9ff00d95268be4590fed8c73b08ae52be17cd1ca3acadc
 EBUILD getuto-1.8.ebuild 1114 BLAKE2B 082e8cb2f9a568791cf8444b6f9ef4cd7078fac2660656e502a9c6a33ca3417634fd846feebc361c5e38ae2645f974801df3ba97c3d9c60aab98b91f85d8abbf SHA512 9bbafcffe389afbb3e5111564860aaad919214126d96387ec0137eb5131a6850b488fad5f46642fef305d5aa8c65f17400b11a73992d186b7fff077f86fbcee0
+EBUILD getuto-1.9.ebuild 1108 BLAKE2B 3430732ea96bc6031b81cdba9fb8bbb5255c4fe499d409d4e7ed22f3651a0cef0aa1b085542c0a4e9dba38e66c8e6fc8b92631033507a68c61d089dcbc083f01 SHA512 096111d60f0cec2857ba74230cd79fcb3e87f578043cd88a6be324753bfedc8ae9edee74799b3efc88e59cb8210892f80ef793e68f0f4b09d1a995b6d453e369
 EBUILD getuto-9999.ebuild 1116 BLAKE2B 76bc04236a23d51dfe96605a13cd53e3809771cf37219654c63aad16bca079dc790da7b4dd4f1bb1ae250aae9b73609aa8750c932e0f7c9b631cfeb4b16d6750 SHA512 0271e571ed14ca2c073884111a7591c7418d8b7a05adbd8ec27e14ae79cf9addaaed195972938f5cdd9ff00d95268be4590fed8c73b08ae52be17cd1ca3acadc
 MISC metadata.xml 419 BLAKE2B ec9ec3a23044c8f9970dfb818fb5d5d16498249723f4ffb3bda0c53f19d68e46d0b7c482fcf8c2cac8f31269546a4a600750d57fce84508e4d8307a02d779977 SHA512 6822f2b326b5783deae399912ac479e1e6d18a61fb5d28db9ba9f62d2405abcab51081a499be30b854e16c3b94cf43f7330dc62ca424c40d923eefdaba5a7c9e
diff --git a/app-portage/getuto/getuto-1.7.ebuild b/app-portage/getuto/getuto-1.7.ebuild
deleted file mode 100644
index 4778eb372c02..000000000000
--- a/app-portage/getuto/getuto-1.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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
-	sys-apps/gentoo-functions
-"
-
-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
-}
diff --git a/app-portage/getuto/getuto-1.6.ebuild b/app-portage/getuto/getuto-1.9.ebuild
index 4778eb372c02..35240625153e 100644
--- a/app-portage/getuto/getuto-1.6.ebuild
+++ b/app-portage/getuto/getuto-1.9.ebuild
@@ -15,7 +15,7 @@ else
 	"
 	S=${WORKDIR}/${PN}-${P}
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	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 )"