gentoo resync : 03.03.2021

3 files changed, 81 insertions, 21 deletions

diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index ade620a0ab22..566323e53dda 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,6 +1,8 @@
 AUX gentoolkit-0.5.0-python3_9.patch 1425 BLAKE2B 51663e01d48f6f192cfe96972c584337e62495d553251ffe360c4e928e208d528b453faefeb3c2d1641c9e662151b8ba91ebb7f1ec6b3a2c67fcb18eaefe3495 SHA512 327ff6d6aa77293f7bff3be6e543e3bb1b4fcf226d3e913668c69fdb9de2d2e04a73d9e73526910ae4e2c3b0bce3f87249cb31d55928b58a9c4274b97525e9d3
 AUX gentoolkit-0.5.0-r1-python3_9.patch 1220 BLAKE2B ce01d9a8cdd214d585b0e4ee61ce21aba2880deb76c666f6a0fd5833d340a24b741be68e6923a942353d53ad0c4d66014290548d52fe76bad4cc0069b6322d29 SHA512 19ab5bd0bd76571106e12f361ef41a7eb4fb573afe5e5d61c547e4df1d2697c80db8307623edbdffcdaee9472ab56c1b61e133cfbf3845b174a10f4e7aec7d44
 DIST gentoolkit-0.5.0.tar.gz 3206598 BLAKE2B a379dcbbaba9d52c241fea020b87c458384e44092539947909e14fd6c63fd9cc06d076b8081874edf17fc50e80fe48ceab3400c90046867dc409e7ac39c17231 SHA512 8a5c344f3a17c4c779abbcaa35b5e3f147106dbc61310d0d1a816ec8080914271fa45c311a8feeb1bfe14195af7cf34c0b29142d6e43e2de232dae96fbd00861
+DIST gentoolkit-0.5.1.tar.gz 3203805 BLAKE2B de2cd69aec9be79f498b1180a90afb54e77f9d8a47636cd722f2028a906d43874132d55a71bf373b3d10c7c10034f5d8ce0280a35041b0c60a1d5aa2ed6296a1 SHA512 667e464853b17ae297c59fb06e8f4563119a1382470d064c5721ae898e61173e9af5b071c7618d315232e6974fec205e27559785d2816253711de3e83d9e1911
 EBUILD gentoolkit-0.5.0-r2.ebuild 2490 BLAKE2B a14343782b8f6943d974f423f656c60de63ba4c2a7b6a1345d15c41bbc29390e7b8b71a4ba247450265dfd1e53af9209d7a73e40ecc1aa84ceb209693fa4bbac SHA512 e4b719571a47baa440f08cf1224a21a9a2b6b5227cacd038bab27b0ac0b6494739b233d423c363d406d9a198d556fedd7851dee3cee8c4de651e70de58cf1569
-EBUILD gentoolkit-9999.ebuild 2203 BLAKE2B f85d7c8e23d2aac60af447dc089e74c2d37ef4a853fd7bfdcec94c92706c76e336cc6b893621ccc563822a9cd59a3dd60ca4bbe78823d93ed25859ea70fc222f SHA512 97df6852f611332ef5dd73909af693053ee37bfa35bea6b35ee32323936c5abbf912af089a37b5c819b6ddbbdfa1169a52f75378ff0b6581541c7886c5fad7f7
+EBUILD gentoolkit-0.5.1.ebuild 2026 BLAKE2B ab662489907b94e807f76f01fd03538ec2e6621a14dacd421040a4ff458eb67adb32720a62f03960eed46427cf3c65d47c2dae4c967340545bfc0f1939685ae2 SHA512 911fb664006315a3a2610d70d1019317c4b5c9ee1bfcaa81b60dbc714d0a297040127d8e24354d57c872f9e240e2247912c386ec7a9a5d4fa0eb1c085f1c9828
+EBUILD gentoolkit-9999.ebuild 2026 BLAKE2B ab662489907b94e807f76f01fd03538ec2e6621a14dacd421040a4ff458eb67adb32720a62f03960eed46427cf3c65d47c2dae4c967340545bfc0f1939685ae2 SHA512 911fb664006315a3a2610d70d1019317c4b5c9ee1bfcaa81b60dbc714d0a297040127d8e24354d57c872f9e240e2247912c386ec7a9a5d4fa0eb1c085f1c9828
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.5.1.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.1.ebuild
new file mode 100644
index 000000000000..a05cb33f75d4
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.5.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_REQ_USE="xml(+),threads(+)"
+
+inherit distutils-r1
+
+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.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	sys-apps/gawk
+	sys-apps/gentoo-functions"
+
+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() {
+	# Create cache directory for revdep-rebuild
+	mkdir -p -m 0755 "${EROOT}"/var/cache
+	mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild
+
+	# 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 53c6017a27bc..a05cb33f75d4 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -7,18 +7,21 @@ DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git"
-inherit distutils-r1 git-r3
+inherit distutils-r1
+
+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.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
-
-KEYWORDS=""
 
 DEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]"
@@ -42,25 +45,11 @@ python_prepare_all() {
 	fi
 }
 
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.4.0"; then
-		SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
-	fi
-}
-
 pkg_postinst() {
 	# Create cache directory for revdep-rebuild
 	mkdir -p -m 0755 "${EROOT}"/var/cache
 	mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild
 
-	if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
-		elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
-		elog "part of the gentoolkit package."
-		elog "The gentoolkit-dev package is now deprecated in favor of a single"
-		elog "gentoolkit package.   The remaining tools from gentoolkit-dev"
-		elog "are now obsolete/unused with the git based tree."
-	fi
-
 	# Only show the elog information on a new install
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		elog