gentoo resync : 26.11.2017

3 files changed, 0 insertions, 109 deletions

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
-