gentoo resync : 06.08.2019

4 files changed, 82 insertions, 6 deletions

diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index b7ced10b260c..6ed7d64cdfb8 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,6 +1,8 @@
 DIST gentoolkit-0.4.2.tar.gz 3215652 BLAKE2B 97b4dcac7293b50161169a6c777623cb1c51e2f74020e0fa2f1f4441c203c03a1269c8c55e1461c5780ebfb8234d364837073d582a52a99f2d40c92e6b77a7f0 SHA512 3a9eac2fd214bcfe39380193cb2118edcd759dbf3eb165e7240525ce1047aa984f1d1f1d3a15324218d9be1f0a1ec960ae08a63191392f1bb3422277a52697ff
 DIST gentoolkit-0.4.5.tar.gz 3218757 BLAKE2B 9ac6e7bdee622ff3069ee0f59a1834f36496f2bd07c53a67677571e0cfc99366ba64d03fca8bd964c3517d7cbcb7d4d5d08e9f3ec721d7adf598b13944fea659 SHA512 6b459684a59c5a72f09da34a2e9491b98f49c861f763bddb52ae002413a2c89d7841d84658577e6fec36a096889265a1207eaf981adfdd5e9db6ad79ca364df3
+DIST gentoolkit-0.4.6.tar.gz 3205641 BLAKE2B 7da91a313c8a9263eb7b4abd6207ece9dd602a5069a87f1e78ada13fc9f396e1f2afddaf0637c473445034cf57b5ca7631e209361a88fa3892d302b20f4cc986 SHA512 3aa3c9af7e994313400607943b9090fd813227ddd6d550b50fbcf7eeb4053da8bcdb41c9ef2579d957d2f279fdcc4e2f2ceca1091c5fd457df4204dd11792d6e
 EBUILD gentoolkit-0.4.2-r1.ebuild 2307 BLAKE2B 5c0ac9e4540cdbe88d6fb4bac6166454eb69a9213065f58699d40cf54b102f70b1a776ef801317cf9c46c6eb21093818d89ecdb1b2a304aaa3c3a99a6ca428c1 SHA512 019378d8e227b69a99529e30e640008673c0a2c3ac4039aa6294ea3dd0d2da2dfca0718acd8ec0874b811b32686c8c23a41ea0397936dc5db71b3e870cfd3085
-EBUILD gentoolkit-0.4.5.ebuild 2317 BLAKE2B 16f6a9a1570f4a5234a45c7db4422a0f05222adc0ea1e796ba01e84f2e685aa84c7c4e29d1271d111a62f40079ddac702106221f021c607c9c252ba9e6e270db SHA512 4d8181000ccb5e97b9acfbd03156bef80a839af092e181832a96641686b817daaa410c379b2e9d126f3889582d35cf5becc02112e549a36b54f5022f942b21b7
-EBUILD gentoolkit-9999.ebuild 2064 BLAKE2B d9f1a0876416a436698229553022d526f2697f7ffa8d0a33541a45ba78b646a21a1de760e899a0567fc68ca07f1b539d659e8a9cd6b1624f3e3ac3e65a4ef142 SHA512 6d01ddd645b27361fb6cde18036e23998415e1f2ecddf41f87eeeb35fde803631dd369e09facf83ea64fa628dbd0644e35dd621de07f35422841ad8cd7129d78
+EBUILD gentoolkit-0.4.5.ebuild 2313 BLAKE2B 5e535377f50f8042485f62537363dea9bb388ce4f231544a139b6e7b17d5fb76b365e492191103ba710d1db681810d6cdf328638473be667d31fb62204f9842f SHA512 74af9a60874ca0e6ab2fc94f1ebf3017f05df946aa3aa257634be50de88ac9051e78cf5bd9a3dd547369d80c4a29152172c13046896c86b49d641ceecab8dc37
+EBUILD gentoolkit-0.4.6.ebuild 2313 BLAKE2B 5e535377f50f8042485f62537363dea9bb388ce4f231544a139b6e7b17d5fb76b365e492191103ba710d1db681810d6cdf328638473be667d31fb62204f9842f SHA512 74af9a60874ca0e6ab2fc94f1ebf3017f05df946aa3aa257634be50de88ac9051e78cf5bd9a3dd547369d80c4a29152172c13046896c86b49d641ceecab8dc37
+EBUILD gentoolkit-9999.ebuild 2060 BLAKE2B 8534d42030279b810cafddbb21dd397071bd2f8bbadc74be63caa941fe19d539a427fa7106f18d13d75c9ee99e58b4f6cc6e106a885dc5f7f3cab7c111774096 SHA512 2b44c33b5b55ad3caeb3fa7f069da9cc03d89f27a5303d00549399b39a93bdd3c0cacf28d2f7bee6eeebc2f4cd8a305c3b625e35ac52d80f98894f694a946c60
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild
index 5e01ac6b8c52..8d07e9bfe4b0 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild
@@ -43,8 +43,8 @@ pkg_preinst() {
 
 pkg_postinst() {
 	# Create cache directory for revdep-rebuild
-	mkdir -p -m 0755 "${EROOT%/}"/var/cache
-	mkdir -p -m 0700 "${EROOT%/}"/var/cache/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"
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
new file mode 100644
index 000000000000..8d07e9bfe4b0
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_REQ_USE="xml(+),threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
+SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	sys-apps/gawk
+	sys-apps/gentoo-functions"
+
+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
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
+
+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
+		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/install-mask"
+		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 d3fb68d9097d..9503857df3b2 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -43,8 +43,8 @@ pkg_preinst() {
 
 pkg_postinst() {
 	# Create cache directory for revdep-rebuild
-	mkdir -p -m 0755 "${EROOT%/}"/var/cache
-	mkdir -p -m 0700 "${EROOT%/}"/var/cache/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"