Remove unused versions.

(Portage version: 2.1.10.11/cvs/Linux x86_64)

14 files changed, 11 insertions, 886 deletions

diff --git a/app-portage/esearch/ChangeLog b/app-portage/esearch/ChangeLog
index ddc97052a429..6006625cb7b3 100644
--- a/app-portage/esearch/ChangeLog
+++ b/app-portage/esearch/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-portage/esearch
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/ChangeLog,v 1.70 2011/09/02 15:42:55 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/ChangeLog,v 1.71 2011/09/02 15:52:20 fuzzyray Exp $
+
+  02 Sep 2011; Paul Varner <fuzzyray@gentoo.org>
+  -files/120817-unset-emergedefaultopts.patch,
+  -files/124601-remove-deprecated-syntax.patch,
+  -files/132548-multiple-overlay.patch, -files/146555-esearch-manifest2.patch,
+  -files/186994-esync-quiet.patch, -files/231223-fix-deprecated.patch,
+  -files/253216-fix-ebuild-option.patch, -files/97462-esearch-metadata.patch,
+  -files/97969-ignore-missing-ebuilds.patch, -esearch-0.7.1-r7.ebuild,
+  -esearch-0.7.1-r8.ebuild, -esearch-0.7.2.ebuild, -esearch-0.7.2-r1.ebuild:
+  Remove unused versions.
 
   02 Sep 2011; Paul Varner <fuzzyray@gentoo.org> esearch-9999.ebuild:
   Add ewarn to run 'hash -r', due to file location changes from 0.7 versions.
diff --git a/app-portage/esearch/esearch-0.7.1-r7.ebuild b/app-portage/esearch/esearch-0.7.1-r7.ebuild
deleted file mode 100644
index 29cdce391cde..000000000000
--- a/app-portage/esearch/esearch-0.7.1-r7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-0.7.1-r7.ebuild,v 1.2 2009/03/07 19:54:57 betelgeuse Exp $
-
-EAPI="2"
-
-inherit base eutils
-
-DESCRIPTION="Replacement for 'emerge --search' with search-index"
-HOMEPAGE="http://david-peter.de/esearch.html"
-SRC_URI="http://david-peter.de/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="linguas_it"
-
-RDEPEND=">=dev-lang/python-2.2[readline]
-	>=sys-apps/portage-2.0.50"
-
-PATCHES=( "${FILESDIR}"/97462-esearch-metadata.patch
-	"${FILESDIR}"/97969-ignore-missing-ebuilds.patch
-	"${FILESDIR}"/120817-unset-emergedefaultopts.patch
-	"${FILESDIR}"/124601-remove-deprecated-syntax.patch
-	"${FILESDIR}"/132548-multiple-overlay.patch
-	"${FILESDIR}"/231223-fix-deprecated.patch
-	"${FILESDIR}"/253216-fix-ebuild-option.patch
-	"${FILESDIR}"/186994-esync-quiet.patch
-	"${FILESDIR}"/146555-esearch-manifest2.patch )
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/bin/ /usr/sbin/ || die "dodir failed"
-
-	exeinto /usr/lib/esearch
-	doexe eupdatedb.py esearch.py esync.py common.py || die "doexe failed"
-
-	dosym /usr/lib/esearch/esearch.py /usr/bin/esearch || die "dosym failed"
-	dosym /usr/lib/esearch/eupdatedb.py /usr/sbin/eupdatedb || die "dosym failed"
-	dosym /usr/lib/esearch/esync.py /usr/sbin/esync || die "dosym failed"
-
-	doman en/{esearch,eupdatedb,esync}.1 || die "doman failed"
-	dodoc ChangeLog "${FILESDIR}/eupdatedb.cron" || die "dodoc failed"
-
-	if use linguas_it ; then
-		insinto /usr/share/man/it/man1
-		doins it/{esearch,eupdatedb,esync}.1 || die "doins failed"
-	fi
-}
diff --git a/app-portage/esearch/esearch-0.7.1-r8.ebuild b/app-portage/esearch/esearch-0.7.1-r8.ebuild
deleted file mode 100644
index 4c2f7901ec95..000000000000
--- a/app-portage/esearch/esearch-0.7.1-r8.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-0.7.1-r8.ebuild,v 1.2 2011/02/23 17:01:42 arfrever Exp $
-
-EAPI=3
-PYTHON_DEPEND=2:2.4
-PYTHON_USE_WITH=readline
-
-inherit base eutils multilib python
-
-DESCRIPTION="Replacement for 'emerge --search' with search-index"
-HOMEPAGE="http://david-peter.de/esearch.html"
-SRC_URI="http://david-peter.de/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="linguas_it"
-
-RDEPEND=">=sys-apps/portage-2.0.50"
-
-PATCHES=( "${FILESDIR}"/97462-esearch-metadata.patch
-	"${FILESDIR}"/97969-ignore-missing-ebuilds.patch
-	"${FILESDIR}"/120817-unset-emergedefaultopts.patch
-	"${FILESDIR}"/124601-remove-deprecated-syntax.patch
-	"${FILESDIR}"/132548-multiple-overlay.patch
-	"${FILESDIR}"/231223-fix-deprecated.patch
-	"${FILESDIR}"/253216-fix-ebuild-option.patch
-	"${FILESDIR}"/186994-esync-quiet.patch
-	"${FILESDIR}"/146555-esearch-manifest2.patch )
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/bin/ /usr/sbin/ || die "dodir failed"
-
-	exeinto /usr/$(get_libdir)/esearch
-	doexe eupdatedb.py esearch.py esync.py common.py || die "doexe failed"
-
-	dosym /usr/$(get_libdir)/esearch/esearch.py /usr/bin/esearch || die "dosym failed"
-	dosym /usr/$(get_libdir)/esearch/eupdatedb.py /usr/sbin/eupdatedb || die "dosym failed"
-	dosym /usr/$(get_libdir)/esearch/esync.py /usr/sbin/esync || die "dosym failed"
-
-	doman en/{esearch,eupdatedb,esync}.1 || die "doman failed"
-	dodoc ChangeLog "${FILESDIR}/eupdatedb.cron" || die "dodoc failed"
-
-	if use linguas_it ; then
-		insinto /usr/share/man/it/man1
-		doins it/{esearch,eupdatedb,esync}.1 || die "doins failed"
-	fi
-
-	python_convert_shebangs -r 2 "${D}"
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/esearch
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/esearch
-}
diff --git a/app-portage/esearch/esearch-0.7.2-r1.ebuild b/app-portage/esearch/esearch-0.7.2-r1.ebuild
deleted file mode 100644
index f64902187f05..000000000000
--- a/app-portage/esearch/esearch-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-0.7.2-r1.ebuild,v 1.3 2011/08/25 00:28:11 darkside Exp $
-
-EAPI=3
-PYTHON_DEPEND=2:2.4
-PYTHON_USE_WITH=readline
-
-inherit base eutils multilib python
-
-DESCRIPTION="Replacement for 'emerge --search' with search-index"
-HOMEPAGE="http://david-peter.de/esearch.html"
-SRC_URI="mirror://gentoo/${P}.tar.bz2 http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="linguas_fr linguas_it"
-
-RDEPEND="sys-apps/portage"
-
-PATCHES=( "${FILESDIR}/${PV}-esync-quiet.patch" )
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/bin/ /usr/sbin/ || die "dodir failed"
-
-	exeinto /usr/$(get_libdir)/esearch
-	doexe eupdatedb.py esearch.py esync.py common.py || die "doexe failed"
-
-	dosym /usr/$(get_libdir)/esearch/esearch.py /usr/bin/esearch || die "dosym failed"
-	dosym /usr/$(get_libdir)/esearch/eupdatedb.py /usr/sbin/eupdatedb || die "dosym failed"
-	dosym /usr/$(get_libdir)/esearch/esync.py /usr/sbin/esync || die "dosym failed"
-
-	doman en/{esearch,eupdatedb,esync}.1 || die "doman failed"
-	dodoc ChangeLog "${FILESDIR}/eupdatedb.cron" || die "dodoc failed"
-
-	if use linguas_it ; then
-		insinto /usr/share/man/it/man1
-		doins it/{esearch,eupdatedb,esync}.1 || die "doins failed"
-	fi
-
-	if use linguas_fr ; then
-		insinto /usr/share/man/fr/man1
-		doins fr/{esearch,eupdatedb,esync}.1 || die "doins failed"
-	fi
-
-	python_convert_shebangs -r 2 "${D}"
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/esearch
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/esearch
-}
diff --git a/app-portage/esearch/esearch-0.7.2.ebuild b/app-portage/esearch/esearch-0.7.2.ebuild
deleted file mode 100644
index 19d2e07ef5ee..000000000000
--- a/app-portage/esearch/esearch-0.7.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-0.7.2.ebuild,v 1.1 2011/07/22 18:59:39 fuzzyray Exp $
-
-EAPI=3
-PYTHON_DEPEND=2:2.4
-PYTHON_USE_WITH=readline
-
-inherit base eutils multilib python
-
-DESCRIPTION="Replacement for 'emerge --search' with search-index"
-HOMEPAGE="http://david-peter.de/esearch.html"
-SRC_URI="mirror://gentoo/${P}.tar.bz2 http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="linguas_fr linguas_it"
-
-RDEPEND="sys-apps/portage"
-
-#PATCHES=()
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/bin/ /usr/sbin/ || die "dodir failed"
-
-	exeinto /usr/$(get_libdir)/esearch
-	doexe eupdatedb.py esearch.py esync.py common.py || die "doexe failed"
-
-	dosym /usr/$(get_libdir)/esearch/esearch.py /usr/bin/esearch || die "dosym failed"
-	dosym /usr/$(get_libdir)/esearch/eupdatedb.py /usr/sbin/eupdatedb || die "dosym failed"
-	dosym /usr/$(get_libdir)/esearch/esync.py /usr/sbin/esync || die "dosym failed"
-
-	doman en/{esearch,eupdatedb,esync}.1 || die "doman failed"
-	dodoc ChangeLog "${FILESDIR}/eupdatedb.cron" || die "dodoc failed"
-
-	if use linguas_it ; then
-		insinto /usr/share/man/it/man1
-		doins it/{esearch,eupdatedb,esync}.1 || die "doins failed"
-	fi
-
-	if use linguas_fr ; then
-		insinto /usr/share/man/fr/man1
-		doins fr/{esearch,eupdatedb,esync}.1 || die "doins failed"
-	fi
-
-	python_convert_shebangs -r 2 "${D}"
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/esearch
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/esearch
-}
diff --git a/app-portage/esearch/files/120817-unset-emergedefaultopts.patch b/app-portage/esearch/files/120817-unset-emergedefaultopts.patch
deleted file mode 100644
index 5afeaea0c40c..000000000000
--- a/app-portage/esearch/files/120817-unset-emergedefaultopts.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- esync.py	2006-04-23 19:52:23.000000000 -0400
-+++ esync.py.new	2006-04-24 00:33:55.217967750 -0400
-@@ -22,7 +22,7 @@
- 
- from common import needdbversion
- 
--syncprogram =   "/usr/bin/emerge sync"
-+syncprogram =   "EMERGE_DEFAULT_OPTS=\"\" /usr/bin/emerge sync"
- logfile_sync =  "/var/log/emerge-sync.log"
- tmp_prefix =    "/tmp/esync"
- 
-@@ -72,9 +72,9 @@
-     if arg in ("-h", "--help"):
-         usage()
-     elif arg in ("-w", "--webrsync"):
--        syncprogram = "/usr/sbin/emerge-webrsync"
-+        syncprogram = "EMERGE_DEFAULT_OPTS=\"\" /usr/sbin/emerge-webrsync"
-     elif arg in ("-m", "--metadata"):
--        syncprogram = "/usr/bin/emerge --metadata"
-+        syncprogram = "EMERGE_DEFAULT_OPTS=\"\" /usr/bin/emerge --metadata"
-     elif arg in ("-n", "--nocolor"):
-         eoptions = "-n"
-         nocolor()
diff --git a/app-portage/esearch/files/124601-remove-deprecated-syntax.patch b/app-portage/esearch/files/124601-remove-deprecated-syntax.patch
deleted file mode 100644
index bc6c74ed317b..000000000000
--- a/app-portage/esearch/files/124601-remove-deprecated-syntax.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Only in esearch-0.7.1-patched: diff
-diff -ur esearch-0.7.1/en/esync.1 esearch-0.7.1-patched/en/esync.1
---- esearch-0.7.1/en/esync.1	2006-06-05 16:27:11.000000000 +0200
-+++ esearch-0.7.1-patched/en/esync.1	2006-06-05 16:31:38.000000000 +0200
-@@ -1,16 +1,16 @@
- .TH esearch 1 "February 13, 2005" "esync"
- 
- .SH "NAME"
--esync \- Calls 'emerge sync' and 'eupdatedb' and shows updates
-+esync \- Calls 'emerge --sync' and 'eupdatedb' and shows updates
- 
- .SH "SYNOPSIS"
- .B esync
- [ options ]
- 
- .SH "DESCRIPTION"
--esync first imports the old esearch index, then calls 'emerge sync'
--or 'emerge-webrsync' and 'eupdatedb'. Then it shows the new and the
--updated packages.
-+esync first imports the old esearch index, then calls 'emerge --sync'
-+(or an alternative command: see options) and 'eupdatedb'. Then it
-+shows the new and the updated packages.
- 
- .SH "OPTIONS"
- .TP
-@@ -18,10 +18,10 @@
- Print help message
- .TP
- .B \-\-webrsync, \-w
--Use 'emerge-webrsync' instead of 'emerge sync'
-+Use 'emerge-webrsync' instead of 'emerge --sync'
- .TP
- .B \-\-metadata, \-m
--Use 'emerge --metadata' instead of 'emerge sync'
-+Use 'emerge --metadata' instead of 'emerge --sync'
- .TP
- .B \-\-nocolor, \-n
- Don't use ANSI codes for colored output
-diff -ur esearch-0.7.1/it/esync.1 esearch-0.7.1-patched/it/esync.1
---- esearch-0.7.1/it/esync.1	2006-06-05 16:27:11.000000000 +0200
-+++ esearch-0.7.1-patched/it/esync.1	2006-06-05 16:24:43.000000000 +0200
-@@ -1,7 +1,7 @@
- .TH esearch 1 "08 Luglio 2004" "esearch"
- 
- .SH "NOME"
--esync \- Esegue 'emerge sync' e 'eupdatedb' mostrando gli aggiornamenti
-+esync \- Esegue 'emerge --sync' e 'eupdatedb' mostrando gli aggiornamenti
- 
- .SH "SINTASSI"
- .B esync
-@@ -9,8 +9,8 @@
- 
- .SH "DESCRIZIONE"
- esync prima importa il vecchio indice di esearch, quindi esegue
--'emerge sync' o 'emerge-webrsync' e 'eupdatedb'. Quindi mostra i
--nuovi pacchetti e quelli aggiornati.
-+'emerge --sync' (o un comando alternativo: vedi opzioni) e 'eupdatedb'.
-+Quindi mostra i nuovi pacchetti e quelli aggiornati.
- 
- .SH "OPZIONI"
- .TP
-@@ -18,10 +18,10 @@
- Stampa un messaggio di aiuto.
- .TP
- .B \-\-webrsync, \-w
--Usa 'emerge-webrsync' invece di 'emerge sync'.
-+Usa 'emerge-webrsync' invece di 'emerge --sync'.
- .TP
- .B \-\-metadata, \-m
--Usa 'emerge --metadata' invece di 'emerge sync'.
-+Usa 'emerge --metadata' invece di 'emerge --sync'.
- .TP
- .B \-\-nocolor, \-n
- Non usa i codici colore ANSI per la stampa.
-diff -ur esearch-0.7.1/esync.py esearch-0.7.1-patched/esync.py
---- esearch-0.7.1/esync.py	2006-06-05 16:27:11.000000000 +0200
-+++ esearch-0.7.1-patched/esync.py	2006-06-05 16:22:22.000000000 +0200
-@@ -22,7 +22,7 @@
- 
- from common import needdbversion
- 
--syncprogram =   "EMERGE_DEFAULT_OPTS=\"\" /usr/bin/emerge sync"
-+syncprogram =   "EMERGE_DEFAULT_OPTS=\"\" /usr/bin/emerge --sync"
- logfile_sync =  "/var/log/emerge-sync.log"
- tmp_prefix =    "/tmp/esync"
- 
-@@ -42,10 +42,10 @@
-     print "    Print this help message"
-     print ""
-     print darkgreen("  --webrsync") + ", " + darkgreen("-w")
--    print "    Use 'emerge-webrsync' instead of 'emerge sync'"
-+    print "    Use 'emerge-webrsync' instead of 'emerge --sync'"
-     print ""
-     print darkgreen("  --metadata") + ", " + darkgreen("-m")
--    print "    Use 'emerge --metadata' instead of 'emerge sync'"
-+    print "    Use 'emerge --metadata' instead of 'emerge --sync'"
-     print ""
-     print darkgreen("  --nocolor") + ", " + darkgreen("-n")
-     print "    Don't use ANSI codes for colored output"
diff --git a/app-portage/esearch/files/132548-multiple-overlay.patch b/app-portage/esearch/files/132548-multiple-overlay.patch
deleted file mode 100644
index 474fa3ffea42..000000000000
--- a/app-portage/esearch/files/132548-multiple-overlay.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-diff -Naru esearch-0.7.1/esearch.py esearch-0.7.1-tmp/esearch.py
---- esearch-0.7.1/esearch.py	2006-05-16 19:12:07.795314560 +0200
-+++ esearch-0.7.1-tmp/esearch.py	2006-05-18 23:08:28.363580608 +0200
-@@ -64,16 +64,16 @@
-     if fatal:
-         sys.exit(1)
- 
--def searchEbuilds(path, portdir = True, searchdef = ""):
--    global ebuilds, output, defebuild
-+def searchEbuilds(path, portdir = True, searchdef = "", repo_num = ""):
-+    global ebuilds, output, defebuild, found_in_overlay
-     pv = ""
-     pkgs = []
-     nr = len(ebuilds) + 1
- 
-     if portdir:
--        rep = darkgreen("Portage")
-+        rep = darkgreen("Portage    ")
-     else:
--        rep = red("Overlay")
-+        rep = red("Overlay "+str(repo_num)+"  ")
- 
-     if isdir(path):
-         list = listdir(path)
-@@ -82,18 +82,20 @@
-             if file[-7:] == ".ebuild":
-                 pv = file[:-7]
-                 pkgs.append(pkgsplit(pv))
--                pkgs[-1].append(path + "/" + file)
-+                pkgs[-1].append(path + file)
-                 if searchdef != "" and pv == searchdef:
-                     defebuild = (searchdef, pkgs[-1][3])
-+		if not portdir:
-+		    found_in_overlay = True
-         pkgs.sort(pkgcmp)
-         for pkg in pkgs:
-             rev = ""
-             if pkg[2] != "r0":
-                 rev = "-" + pkg[2]
-             output.append(" " + rep + " [" + bold(str(nr)) + "] " + pkg[0] + "-" + pkg[1] + rev + "\n")
--            ebuilds.append(pkg[3])
-+            ebuilds.append(pkg[len(pkg)-1])
-             nr += 1
--
-+ 
- NORMAL =  1
- COMPACT = 2
- VERBOSE = 3
-@@ -105,6 +107,7 @@
- fullname =   False
- pattern =    False
- instonly =   False
-+found_in_overlay = False
- 
- try:
-     opts = getopt(sys.argv[1:], "hSFIcveo:d:n", ["help", "searchdesc", "fullname", "instonly", "compact", "verbose", "ebuild", "own=", "directory=", "nocolor"])
-@@ -128,7 +131,7 @@
-         from output import blue
-         from common import version
-         outputm = VERBOSE
--    elif arg in ("-e", "--ebuilds"):
-+    elif arg in ("-e", "--ebuild"):
-         from os import listdir, getenv, system
-         from os.path import isdir
-         from portage import settings, pkgcmp, pkgsplit
-@@ -313,12 +316,14 @@
-                 else:
-                     searchdef = ""
- 
--                searchEbuilds("%s/%s/" % (portdir, pkg[1]), True, searchdef)
-+                searchEbuilds("%s/%s/" % (portdir, pkg[1]), True, searchdef, "")
-                 if overlay:
--                    searchEbuilds("%s/%s/" % (overlay, pkg[1]), False, searchdef)
-+                    repo_num=1
-+                    for repo in overlay.split():
-+                        searchEbuilds("%s/%s/" % ( repo, pkg[1]), False, searchdef,repo_num)
-+                        repo_num += 1
- 
-                 output.append("\n")
--
-             count += 1
- 
-     regexlist[i][2] = "".join(output)
-@@ -338,34 +343,42 @@
-     if outputm == NORMAL:
-         print ""
- 
--if outputm == EBUILDS and count != 0:
--    if count > 1:
--        defebuild = (0, 0)
- 
--    if len(ebuilds) == 1:
--        nr = 1
--    else:
--        if defebuild[0] != 0:
--            print bold("Show Ebuild"), " (" + darkgreen(defebuild[0]) + "): ",
-+if outputm == EBUILDS:
-+    if overlay and found_in_overlay:
-+        repo_num=1
-+        for repo in overlay.split():
-+            print red("Overlay "+str(repo_num)+" : "+repo)
-+            repo_num += 1
-+    
-+    if count != 0:
-+        if count > 1:
-+            defebuild = (0, 0)
-+
-+        if len(ebuilds) == 1:
-+            nr = 1
-         else:
--            print bold("Show Ebuild: "),
-+            if defebuild[0] != 0:
-+                print bold("\nShow Ebuild"), " (" + darkgreen(defebuild[0]) + "): ",
-+            else:
-+                print bold("\nShow Ebuild: "),
-+            try:
-+                nr = sys.stdin.readline()
-+            except KeyboardInterrupt:
-+                sys.exit(1)
-         try:
--            nr = sys.stdin.readline()
--        except KeyboardInterrupt:
--            sys.exit(1)
--    try:
--        editor = getenv("EDITOR")
--        if editor:
--            system(editor + " " + ebuilds[int(nr) - 1])
--        else:
--            print ""
--            error("Please set EDITOR", False)
--    except IndexError:
--        print ""
--        error("No such ebuild", False)
--    except ValueError:
--        if defebuild[0] != 0:
--            system(editor + " " + defebuild[1])
--        else:
-+            editor = getenv("EDITOR")
-+            if editor:
-+                system(editor + " " + ebuilds[int(nr) - 1])
-+            else:
-+                print ""
-+                error("Please set EDITOR", False)
-+        except IndexError:
-             print ""
--            error("Please enter a valid number", False)
-+            error("No such ebuild", False)
-+        except ValueError:
-+            if defebuild[0] != 0:
-+                system(editor + " " + defebuild[1])
-+            else:
-+                print ""
-+                error("Please enter a valid number", False)
diff --git a/app-portage/esearch/files/146555-esearch-manifest2.patch b/app-portage/esearch/files/146555-esearch-manifest2.patch
deleted file mode 100644
index 6daf7f95e75f..000000000000
--- a/app-portage/esearch/files/146555-esearch-manifest2.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nur esearch.orig/eupdatedb.py esearch/eupdatedb.py
---- esearch.orig/eupdatedb.py	2008-12-30 21:57:59.000000000 -0800
-+++ esearch/eupdatedb.py	2008-12-31 16:50:52.000000000 -0800
-@@ -9,6 +9,7 @@
- from time import time
- start = time()
- 
-+import os
- import sys
- import re
- from os import stat, unlink, environ, open, fdopen, O_RDONLY, O_EXCL, O_CREAT, O_WRONLY
-@@ -22,8 +23,12 @@
- import portage
- try:
-     from portage.output import red, darkgreen, green, bold, nocolor
-+    from portage.manifest import Manifest
-+    from portage.exception import PortageException
- except ImportError:
-     from output import red, darkgreen, green, bold, nocolor
-+    from portage_manifest import Manifest
-+    from portage_exception import PortageException
- 
- from common import needdbversion, version
- 
-@@ -66,14 +71,15 @@
- def getfs(pkg):
-     # from /usr/bin/emerge
-     try:
--        mysum = 0
--        mydigest = portage.portdb.finddigest(pkg)
--
--        myfilefd = open(mydigest, O_RDONLY)
--        myfile = fdopen(myfilefd, "r")
--        for line in myfile.readlines():
--            mysum += int(line.split(" ")[3])
--        myfile.close()
-+        myebuild = portage.portdb.findname(pkg)
-+        pkgdir = os.path.dirname(myebuild)
-+        mf = Manifest(pkgdir, portage.settings["DISTDIR"])
-+        if hasattr(portage.portdb, "getFetchMap"):
-+            fetchlist = portage.portdb.getFetchMap(pkg)
-+        else:
-+            fetchlist = portage.portdb.getfetchlist(pkg,
-+                mysettings=portage.settings, all=True)[1]
-+        mysum = mf.getDistfilesSize(fetchlist)
-         mystr = str(mysum/1024)
-         mycount = len(mystr)
-         while (mycount > 3):
-@@ -82,7 +88,7 @@
-         mysum = mystr + " kB"
- 
-         return mysum
--    except:
-+    except (PortageException, KeyError):
-         return "[no/bad digest]"
- 
- try:
diff --git a/app-portage/esearch/files/186994-esync-quiet.patch b/app-portage/esearch/files/186994-esync-quiet.patch
deleted file mode 100644
index ba1e4cc7c86d..000000000000
--- a/app-portage/esearch/files/186994-esync-quiet.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-diff -ru esearch-0.7.1-r6/en/esync.1 esearch-0.7.1-r7/en/esync.1
---- esearch-0.7.1-r6/en/esync.1	2009-01-02 10:53:39.000000000 -0600
-+++ esearch-0.7.1-r7/en/esync.1	2009-01-02 10:45:03.000000000 -0600
-@@ -1,34 +1,36 @@
--.TH esearch 1 "February 13, 2005" "esync"
--
-+.TH "esearch" "1" "February 13, 2005" "esync" ""
- .SH "NAME"
--esync \- Calls 'emerge --sync' and 'eupdatedb' and shows updates
-+esync \- Calls 'emerge \-\-sync' and 'eupdatedb' and shows updates
- 
- .SH "SYNOPSIS"
- .B esync
- [ options ]
- 
- .SH "DESCRIPTION"
--esync first imports the old esearch index, then calls 'emerge --sync'
-+esync first imports the old esearch index, then calls 'emerge \-\-sync'
- (or an alternative command: see options) and 'eupdatedb'. Then it
- shows the new and the updated packages.
- 
- .SH "OPTIONS"
--.TP
-+.TP 
- .B \-\-help, \-h
- Print help message
--.TP
-+.TP 
- .B \-\-webrsync, \-w
--Use 'emerge-webrsync' instead of 'emerge --sync'
--.TP
-+Use 'emerge\-webrsync' instead of 'emerge \-\-sync'
-+.TP 
- .B \-\-metadata, \-m
--Use 'emerge --metadata' instead of 'emerge --sync'
--.TP
-+Use 'emerge \-\-metadata' instead of 'emerge \-\-sync'
-+.TP 
- .B \-\-nocolor, \-n
- Don't use ANSI codes for colored output
--.TP
-+.TP 
-+.B  \-\-quiet, \\-q
-+Less output (implies \-\-nospinner)
-+.TP 
- .B \-\-verbose, \-v
- Verbose output
--.TP
-+.TP 
- .B \-\-nospinner, \­s
- Don't display the remaining index count
- 
-diff -ru esearch-0.7.1-r6/esync.py esearch-0.7.1-r7/esync.py
---- esearch-0.7.1-r6/esync.py	2009-01-02 10:53:40.000000000 -0600
-+++ esearch-0.7.1-r7/esync.py	2009-01-02 10:50:59.000000000 -0600
-@@ -35,6 +35,7 @@
- eupdatedb_extra_options = ""
- showtitles = "notitles" not in portage.features
- verbose = False
-+quiet = False
- 
- def usage():
-     print "esync (0.7.1) - Calls 'emerge sync' and 'eupdatedb' and shows updates"
-@@ -53,6 +54,9 @@
-     print darkgreen("  --nocolor") + ", " + darkgreen("-n")
-     print "    Don't use ANSI codes for colored output"
-     print ""
-+    print darkgreen("  --quiet") + ", " + darkgreen("-q")
-+    print "    Less output (implies --nospinner)"
-+    print ""
-     print darkgreen("  --verbose") + ", " + darkgreen("-v")
-     print "    Verbose output"
-     print ""
-@@ -63,7 +67,7 @@
-     sys.exit(0)
- 
- try:
--    opts = getopt(sys.argv[1:], "hwmnvs", ["help", "webrsync", "nocolor", "verbose", "metadata", "nospinner"])
-+    opts = getopt(sys.argv[1:], "hwmnvs", ["help", "webrsync", "nocolor", "quiet", "verbose", "metadata", "nospinner"])
- except GetoptError, error:
-     print red(" * Error:"), error, "(see", darkgreen("--help"), "for all options)"
-     print
-@@ -82,8 +86,13 @@
-         eoptions = "-n"
-         nocolor()
-         showtitles = False
-+    elif arg in ("-q", "--quiet"):
-+        eupdatedb_extra_options = "-q"
-+        quiet = True
-+        verbose = False
-     elif arg in ("-v", "--verbose"):
-         verbose = True
-+        quiet = False
-     elif arg in ("-s", "--nospinner"):
-         eupdatedb_extra_options = "-q"
- 
-@@ -92,6 +101,7 @@
-     global showtitles
-     if showtitles:
-         xtermTitle(msg)
-+    if quiet: return
-     print green(" *"), msg
- 
- def outofdateerror():
-@@ -131,9 +141,9 @@
- 
- tree_old = gettree("old")
- 
--emsg("Doing '" + syncprogram + "' now")
-+if not quiet: emsg("Doing '" + syncprogram + "' now")
- 
--if verbose == True:
-+if verbose:
-     errorcode = os.system(syncprogram + " | tee " + logfile_sync + " 2>&1")
- else:
-     errorcode = os.system(syncprogram + " > " + logfile_sync + " 2>&1")
-@@ -143,16 +153,17 @@
-     print ""
-     sys.exit(1)
- 
--print ""
-+if not quiet:
-+    print ""
-+    emsg("Doing 'eupdatedb' now")
-+    print ""
- 
--emsg("Doing 'eupdatedb' now")
--print ""
- if os.system("/usr/sbin/eupdatedb " + eoptions + " " + eupdatedb_extra_options) != 0:
-     print ""
-     print red(" * Error:"), "eupdatedb failed"
-     sys.exit(1)
- 
--print ""
-+if not quiet: print ""
- 
- tree_new = gettree("new")
- 
-@@ -181,6 +192,7 @@
-     if (pkg not in old_keys) or (old[pkg] != new[pkg]):
-         os.system("/usr/bin/esearch " + eoptions + " -Fc ^" + pkg + "$ | head -n1")
-         haspkg = True
-+        break
- 
- if not haspkg:
-     emsg("No updates found")
diff --git a/app-portage/esearch/files/231223-fix-deprecated.patch b/app-portage/esearch/files/231223-fix-deprecated.patch
deleted file mode 100644
index e5d858d48679..000000000000
--- a/app-portage/esearch/files/231223-fix-deprecated.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ru esearch.orig/esearch.py esearch/esearch.py
---- esearch.orig/esearch.py	2008-12-30 21:14:03.000000000 -0600
-+++ esearch/esearch.py	2008-12-30 21:10:22.000000000 -0600
-@@ -13,7 +13,10 @@
- sys.path.insert(0, "/usr/lib/portage/pym")
- sys.path.insert(0, "/usr/lib/esearch")
- 
--from output import bold, red, green, darkgreen, turquoise, nocolor
-+try:
-+    from portage.output import bold, red, green, darkgreen, turquoise, nocolor
-+except ImportError:
-+    from output import bold, red, green, darkgreen, turquoise, nocolor, blue
- from os.path import exists
- import re
- 
-@@ -128,7 +131,10 @@
-     elif arg in ("-v", "--verbose"):
-         import string
-         from portage import portdb, best, settings
--        from output import blue
-+        try:
-+            from portage.output import blue
-+        except ImportError:
-+            from output import blue
-         from common import version
-         outputm = VERBOSE
-     elif arg in ("-e", "--ebuild"):
-diff -ru esearch.orig/esync.py esearch/esync.py
---- esearch.orig/esync.py	2008-12-30 21:14:05.000000000 -0600
-+++ esearch/esync.py	2008-12-30 20:58:16.000000000 -0600
-@@ -18,7 +18,10 @@
- sys.path.insert(0, "/usr/lib/portage/pym")
- 
- import portage
--from output import red, green, bold, darkgreen, nocolor, xtermTitle
-+try:
-+    from portage.output import red, green, bold, darkgreen, nocolor, xtermTitle
-+except ImportError:
-+    from output import red, green, bold, darkgreen, nocolor, xtermTitle
- 
- from common import needdbversion
- 
-diff -ru esearch.orig/eupdatedb.py esearch/eupdatedb.py
---- esearch.orig/eupdatedb.py	2008-12-30 21:14:08.000000000 -0600
-+++ esearch/eupdatedb.py	2008-12-30 20:58:16.000000000 -0600
-@@ -20,7 +20,10 @@
- sys.path.insert(0, "/usr/lib/esearch")
- 
- import portage
--from output import red, darkgreen, green, bold, nocolor
-+try:
-+    from portage.output import red, darkgreen, green, bold, nocolor
-+except ImportError:
-+    from output import red, darkgreen, green, bold, nocolor
- 
- from common import needdbversion, version
- 
diff --git a/app-portage/esearch/files/253216-fix-ebuild-option.patch b/app-portage/esearch/files/253216-fix-ebuild-option.patch
deleted file mode 100644
index c80778a64f88..000000000000
--- a/app-portage/esearch/files/253216-fix-ebuild-option.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ru esearch.orig/esearch.py esearch/esearch.py
---- esearch.orig/esearch.py	2008-12-30 22:47:31.000000000 -0600
-+++ esearch/esearch.py	2008-12-30 22:49:34.000000000 -0600
-@@ -67,6 +67,9 @@
-     if fatal:
-         sys.exit(1)
- 
-+def mypkgcmp(pkg1, pkg2):
-+	return pkgcmp(pkg1[:3], pkg2[:3])
-+
- def searchEbuilds(path, portdir = True, searchdef = "", repo_num = ""):
-     global ebuilds, output, defebuild, found_in_overlay
-     pv = ""
-@@ -79,18 +82,18 @@
-         rep = red("Overlay "+str(repo_num)+"  ")
- 
-     if isdir(path):
--        list = listdir(path)
-+        filelist = listdir(path)
- 
--        for file in list:
-+        for file in filelist:
-             if file[-7:] == ".ebuild":
-                 pv = file[:-7]
--                pkgs.append(pkgsplit(pv))
-+                pkgs.append(list(pkgsplit(pv)))
-                 pkgs[-1].append(path + file)
-                 if searchdef != "" and pv == searchdef:
-                     defebuild = (searchdef, pkgs[-1][3])
- 		if not portdir:
- 		    found_in_overlay = True
--        pkgs.sort(pkgcmp)
-+        pkgs.sort(mypkgcmp)
-         for pkg in pkgs:
-             rev = ""
-             if pkg[2] != "r0":
diff --git a/app-portage/esearch/files/97462-esearch-metadata.patch b/app-portage/esearch/files/97462-esearch-metadata.patch
deleted file mode 100644
index a01c6b342134..000000000000
--- a/app-portage/esearch/files/97462-esearch-metadata.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ur esearch-0.7.1/en/esync.1 esearch-0.7.1-patched/en/esync.1
---- en/esync.1	2005-02-13 18:12:03.000000000 +0100
-+++ en/esync.1	2006-06-05 13:37:40.000000000 +0200
-@@ -20,6 +20,9 @@
- .B \-\-webrsync, \-w
- Use 'emerge-webrsync' instead of 'emerge sync'
- .TP
-+.B \-\-metadata, \-m
-+Use 'emerge --metadata' instead of 'emerge sync'
-+.TP
- .B \-\-nocolor, \-n
- Don't use ANSI codes for colored output
- .TP
-diff -ur esearch-0.7.1/it/esync.1 esearch-0.7.1-patched/it/esync.1
---- it/esync.1	2005-02-13 17:23:38.000000000 +0100
-+++ it/esync.1	2006-06-05 13:40:13.000000000 +0200
-@@ -20,6 +20,9 @@
- .B \-\-webrsync, \-w
- Usa 'emerge-webrsync' invece di 'emerge sync'.
- .TP
-+.B \-\-metadata, \-m
-+Usa 'emerge --metadata' invece di 'emerge sync'.
-+.TP
- .B \-\-nocolor, \-n
- Non usa i codici colore ANSI per la stampa.
- .TP
-diff -ur esearch-0.7.1/esync.py esearch-0.7.1-patched/esync.py
---- esync.py	2005-02-13 17:53:38.000000000 +0100
-+++ esync.py	2006-06-05 13:37:40.000000000 +0200
-@@ -44,6 +44,9 @@
-     print darkgreen("  --webrsync") + ", " + darkgreen("-w")
-     print "    Use 'emerge-webrsync' instead of 'emerge sync'"
-     print ""
-+    print darkgreen("  --metadata") + ", " + darkgreen("-m")
-+    print "    Use 'emerge --metadata' instead of 'emerge sync'"
-+    print ""
-     print darkgreen("  --nocolor") + ", " + darkgreen("-n")
-     print "    Don't use ANSI codes for colored output"
-     print ""
-@@ -57,7 +60,7 @@
-     sys.exit(0)
- 
- try:
--    opts = getopt(sys.argv[1:], "hwnvs", ["help", "webrsync", "nocolor", "verbose", "nospinner"])
-+    opts = getopt(sys.argv[1:], "hwmnvs", ["help", "webrsync", "nocolor", "verbose", "metadata", "nospinner"])
- except GetoptError, error:
-     print red(" * Error:"), error, "(see", darkgreen("--help"), "for all options)"
-     print
-@@ -70,6 +73,8 @@
-         usage()
-     elif arg in ("-w", "--webrsync"):
-         syncprogram = "/usr/sbin/emerge-webrsync"
-+    elif arg in ("-m", "--metadata"):
-+        syncprogram = "/usr/bin/emerge --metadata"
-     elif arg in ("-n", "--nocolor"):
-         eoptions = "-n"
-         nocolor()
diff --git a/app-portage/esearch/files/97969-ignore-missing-ebuilds.patch b/app-portage/esearch/files/97969-ignore-missing-ebuilds.patch
deleted file mode 100644
index 9f3a04a895c3..000000000000
--- a/app-portage/esearch/files/97969-ignore-missing-ebuilds.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/esearch.py	2006-04-23 19:48:38.088214000 -0400
-+++ b/esearch.py	2006-04-23 19:33:21.482929750 -0400
-@@ -222,7 +222,11 @@
- 
-                 if outputm == VERBOSE:
-                     mpv = best(portdb.xmatch("match-all", pkg[1]))
--                    iuse_split = string.split(portdb.aux_get(pkg[1] + "-" +  pkg[3], ["IUSE"])[0], " ")
-+                    try:
-+                        iuse_split = string.split(portdb.aux_get(pkg[1] + "-" +  pkg[3], ["IUSE"])[0], " ")
-+                    except KeyError, e:
-+                        print "Package %s is no longer in the portage tree." % pkg[1] + "-" + pkg[3]
-+                        continue
-                     iuse_split.sort()
-                     iuse = ""
-