Remove unused patches from the files directory.

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0x38AC371E)

8 files changed, 8 insertions, 222 deletions

diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog
index b9868c623e9c..9723239c511a 100644
--- a/app-portage/gentoolkit/ChangeLog
+++ b/app-portage/gentoolkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/gentoolkit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.280 2012/11/05 23:59:49 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.281 2012/11/06 19:10:00 fuzzyray Exp $
+
+  06 Nov 2012; Paul Varner <fuzzyray@gentoo.org>
+  -files/0.3.0.4-gentoolkit-375293.patch, -files/0.3.0.4-euse-376393.patch,
+  -files/0.3.0.4-equery-380573.patch, -files/0.3.0.4-euse.patch,
+  -files/0.3.0.4-euse-379599.patch, -files/0.3.0.4-euse-382219.patch,
+  -files/0.3.0.4-setup-394909.patch:
+  Remove unused patches from the files directory.
 
 *gentoolkit-0.3.0.7 (05 Nov 2012)
 
diff --git a/app-portage/gentoolkit/files/0.3.0.4-equery-380573.patch b/app-portage/gentoolkit/files/0.3.0.4-equery-380573.patch
deleted file mode 100644
index f7aa743ef739..000000000000
--- a/app-portage/gentoolkit/files/0.3.0.4-equery-380573.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 92e6be628307b0643307202ba9994cab9a4dd439 Mon Sep 17 00:00:00 2001
-From: dol-sen <brian.dolbec@gmail.com>
-Date: Thu, 25 Aug 2011 00:04:47 -0700
-Subject: [PATCH] fix bug 380573.
-
----
- pym/gentoolkit/equery/meta.py |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pym/gentoolkit/equery/meta.py b/pym/gentoolkit/equery/meta.py
-index 01e090a..f617cfa 100644
---- a/pym/gentoolkit/equery/meta.py
-+++ b/pym/gentoolkit/equery/meta.py
-@@ -22,7 +22,7 @@ from functools import partial
- 
- import gentoolkit.pprinter as pp
- from gentoolkit import errors
--from gentoolkit import keyword
-+from gentoolkit.keyword import Keyword
- from gentoolkit.equery import format_options, mod_usage, CONFIG
- from gentoolkit.helpers import print_sequence, print_file
- from gentoolkit.textwrap_ import TextWrapper
-@@ -217,7 +217,7 @@ def format_keywords(keywords):
- 
- 	result = []
- 
--	for kw in sorted(keywords, keyword.compare_strs):
-+	for kw in sorted(keywords, key=Keyword):
- 		if kw.startswith('-'):
- 			# arch masked
- 			kw = pp.keyword(kw, stable=False, hard_masked=True)
--- 
-1.7.3.4
-
diff --git a/app-portage/gentoolkit/files/0.3.0.4-euse-376393.patch b/app-portage/gentoolkit/files/0.3.0.4-euse-376393.patch
deleted file mode 100644
index 17dc804c8fed..000000000000
--- a/app-portage/gentoolkit/files/0.3.0.4-euse-376393.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Wed, 27 Jul 2011 19:01:34 +0000 (-0500)
-Subject: Fix missing parenthises in euse.  Bug 376393
-X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fgentoolkit.git;a=commitdiff_plain;h=9ad547e5f33fce1dfb378809252d871265a82c58;hp=af81292035e8d3559b11ab16fc54ccd921cb3587
-
-Fix missing parenthises in euse.  Bug 376393
----
-
-diff --git a/bin/euse b/bin/euse
-index 65fb119..be47cc9 100755
---- a/bin/euse
-+++ b/bin/euse
-@@ -508,7 +508,7 @@ get_flagstatus_helper_pkg() {
- 			atoms=($(
- 				echo "${atoms[@]}" | python -c "
- from __future__ import print_function;import portage.dep as dep, sys
--print(' '.join(dep.match_to_list('$5-$6',sys.stdin.read().split()))"))
-+print(' '.join(dep.match_to_list('$5-$6',sys.stdin.read().split())))"))
- 		fi
- 		flags=$(for atom in ${atoms[@]}; do
- 			[[ -z $atom ]] && continue
diff --git a/app-portage/gentoolkit/files/0.3.0.4-euse-379599.patch b/app-portage/gentoolkit/files/0.3.0.4-euse-379599.patch
deleted file mode 100644
index dc43784e2eb4..000000000000
--- a/app-portage/gentoolkit/files/0.3.0.4-euse-379599.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6edc15a5690a3c26a3c530669a922e01f50ab830 Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Wed, 24 Aug 2011 12:28:06 -0500
-Subject: [PATCH] Fix traversal of cascading profiles by euse (Bug 379559).
- Thanks to Ian Abbot for the patch!
-
----
- bin/euse |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bin/euse b/bin/euse
-index be47cc9..bedba35 100755
---- a/bin/euse
-+++ b/bin/euse
-@@ -439,7 +439,6 @@ traverse_profile() {
- 	
- 	curdir="${2:-$(get_real_path ${MAKE_PROFILE_PATH})}"
- 	
--	[[ -f "${curdir}/${1}" ]] && rvalue="${curdir}/${1} ${rvalue}"
- 	if [[ -f "${curdir}/parent" ]]; then
- 		for parent in $(egrep -v '(^#|^ *$)' ${curdir}/parent); do
- 			# Bug 231394, handle parent path being absolute
-@@ -448,9 +447,10 @@ traverse_profile() {
- 			else
- 				pdir="$(get_real_path ${curdir}/${parent})"
- 			fi
--			rvalue="$(traverse_profile ${1} ${pdir}) ${rvalue}"
-+			rvalue="${rvalue} $(traverse_profile ${1} ${pdir})"
- 		done
- 	fi
-+	[[ -f "${curdir}/${1}" ]] && rvalue="${rvalue} ${curdir}/${1}"
- 
- 	echo "${rvalue}"
- } # }}}
--- 
-1.7.3.4
-
diff --git a/app-portage/gentoolkit/files/0.3.0.4-euse-382219.patch b/app-portage/gentoolkit/files/0.3.0.4-euse-382219.patch
deleted file mode 100644
index 168ca3db99cb..000000000000
--- a/app-portage/gentoolkit/files/0.3.0.4-euse-382219.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4a1fe09bfdff516e28aab23eea102984fedb429a Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Wed, 7 Sep 2011 14:39:10 +0200
-Subject: [PATCH] Add missing quotes
-
----
- bin/euse |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/bin/euse b/bin/euse
-index bedba35..febe732 100755
---- a/bin/euse
-+++ b/bin/euse
-@@ -275,21 +275,21 @@ get_useflags() {
- 	# backup portdir so get_portdir() doesn't give false results later
- 	portdir_backup="${PORTDIR}"
- 	
--	ACTIVE_FLAGS[0]="$(reduce_incrementals ${USE})"
-+	ACTIVE_FLAGS[0]="$(reduce_incrementals "${USE}")"
- 	USE=""
- 	for x in $(get_all_make_conf); do
- 		source "${x}"
--		ACTIVE_FLAGS[1]="$(reduce_incrementals ${ACTIVE_FLAGS[1]} ${USE})"
-+		ACTIVE_FLAGS[1]="$(reduce_incrementals "${ACTIVE_FLAGS[1]}" "${USE}")"
- 	done
- 	USE=""
- 	for x in $(get_all_make_defaults); do
- 		source "${x}"
- 		ACTIVE_FLAGS[2]="${ACTIVE_FLAGS[2]} ${USE}"
- 	done
--	ACTIVE_FLAGS[2]="$(reduce_incrementals ${ACTIVE_FLAGS[2]})"
-+	ACTIVE_FLAGS[2]="$(reduce_incrementals "${ACTIVE_FLAGS[2]}")"
- 	USE=""
- 	source "${MAKE_GLOBALS_PATH}"
--	ACTIVE_FLAGS[3]="$(reduce_incrementals ${USE})"
-+	ACTIVE_FLAGS[3]="$(reduce_incrementals "${USE}")"
- 
- 	# restore saved env variables
- 	USE="${ACTIVE_FLAGS[0]}"
--- 
-1.7.3.4
-
diff --git a/app-portage/gentoolkit/files/0.3.0.4-euse.patch b/app-portage/gentoolkit/files/0.3.0.4-euse.patch
deleted file mode 100644
index 17dc804c8fed..000000000000
--- a/app-portage/gentoolkit/files/0.3.0.4-euse.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Wed, 27 Jul 2011 19:01:34 +0000 (-0500)
-Subject: Fix missing parenthises in euse.  Bug 376393
-X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fgentoolkit.git;a=commitdiff_plain;h=9ad547e5f33fce1dfb378809252d871265a82c58;hp=af81292035e8d3559b11ab16fc54ccd921cb3587
-
-Fix missing parenthises in euse.  Bug 376393
----
-
-diff --git a/bin/euse b/bin/euse
-index 65fb119..be47cc9 100755
---- a/bin/euse
-+++ b/bin/euse
-@@ -508,7 +508,7 @@ get_flagstatus_helper_pkg() {
- 			atoms=($(
- 				echo "${atoms[@]}" | python -c "
- from __future__ import print_function;import portage.dep as dep, sys
--print(' '.join(dep.match_to_list('$5-$6',sys.stdin.read().split()))"))
-+print(' '.join(dep.match_to_list('$5-$6',sys.stdin.read().split())))"))
- 		fi
- 		flags=$(for atom in ${atoms[@]}; do
- 			[[ -z $atom ]] && continue
diff --git a/app-portage/gentoolkit/files/0.3.0.4-gentoolkit-375293.patch b/app-portage/gentoolkit/files/0.3.0.4-gentoolkit-375293.patch
deleted file mode 100644
index bc0bad5323c0..000000000000
--- a/app-portage/gentoolkit/files/0.3.0.4-gentoolkit-375293.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0382df255affced93b59322611a58bf98aec6c64 Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Fri, 15 Jul 2011 14:59:23 -0500
-Subject: [PATCH] Do not index ChangeLog entries with an invalid CPV. (Bug 375293)
-
----
- pym/gentoolkit/helpers.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/pym/gentoolkit/helpers.py b/pym/gentoolkit/helpers.py
-index 225a198..a0b29ab 100644
---- a/pym/gentoolkit/helpers.py
-+++ b/pym/gentoolkit/helpers.py
-@@ -175,7 +175,7 @@ class ChangeLog(object):
- 			if not pkg_name.strip():
- 				continue
- 			try:
--				entry_ver = CPV(pkg_name)
-+				entry_ver = CPV(pkg_name, validate=True)
- 			except errors.GentoolkitInvalidCPV:
- 				if self.invalid_entry_is_fatal:
- 					raise ValueError(entry_ver)
--- 
-1.7.3.4
-
diff --git a/app-portage/gentoolkit/files/0.3.0.4-setup-394909.patch b/app-portage/gentoolkit/files/0.3.0.4-setup-394909.patch
deleted file mode 100644
index 93bd6264cc52..000000000000
--- a/app-portage/gentoolkit/files/0.3.0.4-setup-394909.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 10aaed2b07c11065418d0e9e2c7aa52ae0837300 Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Mon, 19 Dec 2011 13:38:40 -0600
-Subject: [PATCH] Fix setup.py to work with EPREFIX changes in Portage (Bug
- 394909).
-
----
- setup.py |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index f65a933..1efba94 100755
---- a/setup.py
-+++ b/setup.py
-@@ -22,7 +22,7 @@ cwd = os.getcwd()
- try: 
- 	from portage.const import EPREFIX 
- except ImportError: 
--	EPREFIX='/' 
-+	EPREFIX='' 
- 
- 
- # Bash files that need `VERSION=""` subbed, relative to this dir:
-@@ -127,10 +127,10 @@ core.setup(
- 	package_data = test_data,
- 	scripts=(glob('bin/*')),
- 	data_files=(
--		(os.path.join(EPREFIX, 'etc/env.d'), ['data/99gentoolkit-env']),
--		(os.path.join(EPREFIX, 'etc/revdep-rebuild'), ['data/revdep-rebuild/99revdep-rebuild']),
--		(os.path.join(EPREFIX, 'etc/eclean'), glob('data/eclean/*')),
--		(os.path.join(EPREFIX, 'usr/share/man/man1'), glob('man/*')),
-+		(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'etc/env.d'), ['data/99gentoolkit-env']),
-+		(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'etc/revdep-rebuild'), ['data/revdep-rebuild/99revdep-rebuild']),
-+		(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'etc/eclean'), glob('data/eclean/*')),
-+		(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/man1'), glob('man/*')),
- 	),
- 	cmdclass={
- 		'test': load_test(),
--- 
-1.7.8
-