Merge updates from master

6 files changed, 2 insertions, 269 deletions

diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 6c44fed20474..dd6834288d61 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,4 +1,2 @@
-DIST gentoolkit-0.3.0.8.tar.gz 3192497 SHA256 0338dee7c295c32b60a84e529b764d2bc61536fa3aca021cd5a75c6e534864a6 SHA512 50efd701d0d056740bcf7c7cdce652ae7c9e2786f799f5d30946e752b8aa735489d3e0dc5c7664a5810a0f22cec05b9bc7ccc10292b07ac4dd0777658651f72d WHIRLPOOL 5a2455e50d4e0f4df8abab5b81deb6bb00e078dfed1687ae046ce97a0427eafea2d3de9b83ac6de8155d207653d001c6684ac92226fa2320515c6e14c8fea6e0
-DIST gentoolkit-0.3.2.tar.gz 3198294 SHA256 f3bb38d663c1b153447556b5265df5a11b6ed78411e761335b692111c823d9dd SHA512 e174ac7f12d45703515876ea558a661e1d0c5d4cc71d2d64ee793786e2a2d3d2b309500b6e1891774e3415de74922efc77553c0103d695f5dda91def9a6ac637 WHIRLPOOL 67192702f72f437cc31aeeef8bf005c83a4a9322e9fa0de3c1e0d229bfb95d7363f14a8902da5ffbf49dee45cd587286899ea1ead017cd7d18d0f852cc7fd9fb
-DIST gentoolkit-0.3.3.tar.gz 3197037 SHA256 bb1fd78a6063efffd4e8402cd799f2c22ed2bbf440c26390aab68bfb6f4ee982 SHA512 ad142c2c66e7f7a2e4184c8f95e394ee783cd57808e6254e9f5df0f3f60ad842042f773716ca0fd6d7545bb8a2d11c1c167a4ec471eb3238c8ee3a519f70a691 WHIRLPOOL 81c2aa8cb36d9c6abef99729b07c9cc5402d66ccfd8523a4cee57ed99d2b4c2ab0db6c77dccdc90597bd11d60e11823130dd1136eeaba9b2a18383da3e9c5f25
-DIST gentoolkit-0.4.0.tar.gz 3215377 SHA256 3696b45b304b4b789f21d897e09311cf08474dcd9247dd3143bce95ffba5a220 SHA512 6cf693c588d4a2f5bd06fff4e78ef98007e613348048ec993c5430e168baef6c1da01e1843903f3e87ca8e47dd1ffb207acccbc5c0e881fa3093a7880fec9a56 WHIRLPOOL 0114e0e2274b198aca5bbadce6baf5b6595be92e48d322c759826d1143d7d82ea2deb91ba2f8133e5b554567b7ce62081b5e7df24fa3b029bb50041ce99509db
+DIST gentoolkit-0.3.3.tar.gz 3197037 BLAKE2B c2a45971f1f25e3008422b63b59042ca0f2b170b98e10fc4e449ee6be76c0422469cd8bce1b744830404d5a26ba87ded47aab679069965eea266719249475923 SHA512 ad142c2c66e7f7a2e4184c8f95e394ee783cd57808e6254e9f5df0f3f60ad842042f773716ca0fd6d7545bb8a2d11c1c167a4ec471eb3238c8ee3a519f70a691
+DIST gentoolkit-0.4.0.tar.gz 3215377 BLAKE2B 404f81e2f5bce5da4df122156bc76d225497456ad8ec78a50c41e1183390f8e452a6ce8a3473b5371a6712ce1599be33034c5eed64a1852d116c745bc5a775f4 SHA512 6cf693c588d4a2f5bd06fff4e78ef98007e613348048ec993c5430e168baef6c1da01e1843903f3e87ca8e47dd1ffb207acccbc5c0e881fa3093a7880fec9a56
diff --git a/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-476740.patch b/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-476740.patch
deleted file mode 100644
index 8832838bd33f..000000000000
--- a/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-476740.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 87a01450ab33220f6f0821d4f4209004cdc3aa8b Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Tue, 10 Sep 2013 13:52:28 -0500
-Subject: [PATCH] Fix Ctrl-C handling when running emerge (Bug 476740).
-
----
- bin/revdep-rebuild.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/bin/revdep-rebuild.sh b/bin/revdep-rebuild.sh
-index 6cb5608..09f5135 100755
---- a/bin/revdep-rebuild.sh
-+++ b/bin/revdep-rebuild.sh
-@@ -1052,6 +1052,7 @@ portage_settings() {
- 	if [[ -n ${REVDEP_REBUILD_DEFAULT_OPTS} ]]; then
- 		EMERGE_DEFAULT_OPTS=("${REVDEP_REBUILD_DEFAULT_OPTS[@]}")
- 	fi
-+
- }
- 
- ##
-@@ -1138,7 +1139,7 @@ rebuild() {
- 		REBUILD_LIST=$(sort -u "$EBUILDS_FILE")
- 	fi
- 
--	trap - SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM
-+	trap "kill 0" SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM
- 
- 	[[ $QUIET -ne 1 ]] && einfo 'All prepared. Starting rebuild'
- 	echo "emerge --complete-graph=y --oneshot ${EMERGE_DEFAULT_OPTS[@]} ${EMERGE_OPTIONS[@]} $REBUILD_LIST"
--- 
-1.8.3.2
-
diff --git a/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-484340.patch b/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-484340.patch
deleted file mode 100644
index 1a0393dac48d..000000000000
--- a/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-484340.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From db997501ec8e0ef0c5e4426649c17d2498b40e06 Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Tue, 10 Sep 2013 10:59:31 -0500
-Subject: [PATCH] Fix use of REVDEP_REBUILD_DEFAULT_OPTS (Bug 484340).
-
----
- bin/revdep-rebuild.sh | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/bin/revdep-rebuild.sh b/bin/revdep-rebuild.sh
-index 7f848bc..6cb5608 100755
---- a/bin/revdep-rebuild.sh
-+++ b/bin/revdep-rebuild.sh
-@@ -1034,27 +1034,24 @@ portage_settings() {
- 	local ORIG_SEARCH_DIRS="$SEARCH_DIRS"
- 	local ORIG_SEARCH_DIRS_MASK="$SEARCH_DIRS_MASK"
- 	local ORIG_LD_LIBRARY_MASK="$LD_LIBRARY_MASK"
--	local ORIG_REVDEP_REBUILD_DEFAULT_OPTS="$REVDEP_REBUILD_DEFAULT_OPTS"
- 	unset SEARCH_DIRS
- 	unset SEARCH_DIRS_MASK
- 	unset LD_LIBRARY_MASK
--	unset REVDEP_REBUILD_DEFAULT_OPTS
- 
- 	eval $(portageq envvar -v PORTAGE_ROOT PORTAGE_NICENESS EMERGE_DEFAULT_OPTS NOCOLOR SEARCH_DIRS SEARCH_DIRS_MASK LD_LIBRARY_MASK REVDEP_REBUILD_DEFAULT_OPTS)
- 	export NOCOLOR
- 
- 	# Convert quoted paths to array.
- 	eval "EMERGE_DEFAULT_OPTS=(${EMERGE_DEFAULT_OPTS})"
-+	eval "REVDEP_REBUILD_DEFAULT_OPTS=(${REVDEP_REBUILD_DEFAULT_OPTS})"
- 	SEARCH_DIRS="$ORIG_SEARCH_DIRS $SEARCH_DIRS"
- 	SEARCH_DIRS_MASK="$ORIG_SEARCH_DIRS_MASK $SEARCH_DIRS_MASK"
- 	LD_LIBRARY_MASK="$ORIG_LD_LIBRARY_MASK $LD_LIBRARY_MASK"
--	REVDEP_REBUILD_DEFAULT_OPTS="$ORIG_REVDEP_REBUILD_DEFAULT_OPTS $REVDEP_REBUILD_DEFAULT_OPTS"
- 
- 	# Replace EMERGE_DEFAULT_OPTS with REVDEP_REBUILD_DEFAULT_OPTS (if it exists)
- 	if [[ -n ${REVDEP_REBUILD_DEFAULT_OPTS} ]]; then
--		EMERGE_DEFAULT_OPTS=("$REVDEP_REBUILD_DEFAULT_OPTS")
-+		EMERGE_DEFAULT_OPTS=("${REVDEP_REBUILD_DEFAULT_OPTS[@]}")
- 	fi
--
- }
- 
- ##
--- 
-1.8.3.2
-
diff --git a/app-portage/gentoolkit/files/0.3.2-helpers.py-589686.patch b/app-portage/gentoolkit/files/0.3.2-helpers.py-589686.patch
deleted file mode 100644
index 282846c47246..000000000000
--- a/app-portage/gentoolkit/files/0.3.2-helpers.py-589686.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From bc92540f8ce498e8305103619c7085b670ba19b1 Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Mon, 25 Jul 2016 13:01:06 -0500
-Subject: Add missing import of io.open when using python2.7
-
-This fixes the traceback when running equery changes with Python 2.7
-
-X-Gentoo-bug: 589686
-X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=589686
----
- pym/gentoolkit/helpers.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/pym/gentoolkit/helpers.py b/pym/gentoolkit/helpers.py
-index 0d985b6..8d25393 100644
---- a/pym/gentoolkit/helpers.py
-+++ b/pym/gentoolkit/helpers.py
-@@ -26,6 +26,9 @@ __docformat__ = 'epytext'
- # =======
- 
- import os
-+import sys
-+if sys.hexversion < 0x3000000:
-+	from io import open
- import re
- from functools import partial
- from itertools import chain
--- 
-cgit v0.12
-
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.8-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.8-r2.ebuild
deleted file mode 100644
index 040f9c34ec97..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.8-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=(python2_7)
-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="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="sys-apps/portage"
-RDEPEND="${DEPEND}
-	!<=app-portage/gentoolkit-dev-0.2.7
-	sys-apps/gawk"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-revdep-rebuild-484340.patch
-	"${FILESDIR}"/${PV}-revdep-rebuild-476740.patch
-)
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	mv ./bin/revdep-rebuild{,.py} || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# Rename the python versions of revdep-rebuild, since we are not ready
-	# to switch to the python version yet. Link /usr/bin/revdep-rebuild to
-	# revdep-rebuild.sh. Leaving the python version available for potential
-	# testing by a wider audience.
-	dosym revdep-rebuild.sh /usr/bin/revdep-rebuild
-
-	# Create cache directory for revdep-rebuild
-	keepdir /var/cache/revdep-rebuild
-	use prefix || fowners root:0 /var/cache/revdep-rebuild
-	fperms 0700 /var/cache/revdep-rebuild
-
-	# remove on Gentoo Prefix platforms where it's broken anyway
-	if use prefix; then
-		elog "The revdep-rebuild command is removed, the preserve-libs"
-		elog "feature of portage will handle issues."
-		rm "${ED}"/usr/bin/revdep-rebuild*
-		rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
-		rm -rf "${ED}"/etc/revdep-rebuild
-		rm -rf "${ED}"/var
-	fi
-}
-
-pkg_postinst() {
-	# 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-0.3.2-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild
deleted file mode 100644
index eeca23d3292b..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=(python{2_7,3_4,3_5} 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://dev.gentoo.org/~dolsen/releases/gentoolkit/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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}
-	!<=app-portage/gentoolkit-dev-0.2.7
-	sys-apps/gawk
-	sys-apps/gentoo-functions"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-helpers.py-589686.patch
-)
-
-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
-
-	# remove on Gentoo Prefix platforms where it's broken anyway
-	if use prefix; then
-		elog "The revdep-rebuild command is removed, the preserve-libs"
-		elog "feature of portage will handle issues."
-		rm "${ED}"/usr/bin/revdep-rebuild*
-		rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
-		rm -rf "${ED}"/etc/revdep-rebuild
-		rm -rf "${ED}"/var
-	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/install-mask"
-		elog "    app-portage/portpeek"
-		elog "    app-portage/smart-live-rebuild"
-	fi
-}