Remove unused versions

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

8 files changed, 11 insertions, 404 deletions

diff --git a/app-portage/esearch/ChangeLog b/app-portage/esearch/ChangeLog
index 825939d06e55..7e08366679b4 100644
--- a/app-portage/esearch/ChangeLog
+++ b/app-portage/esearch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-portage/esearch
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/ChangeLog,v 1.88 2012/04/23 21:03:36 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/ChangeLog,v 1.89 2012/04/24 18:35:30 fuzzyray Exp $
+
+  24 Apr 2012; Paul Varner <fuzzyray@gentoo.org>
+  -files/0.7.2-esync-quiet.patch, -files/0.7.2-make-prefix-aware.patch,
+  -files/0.7.2-update-shebang-lines.patch, -esearch-0.7.2-r2.ebuild,
+  -esearch-1.1.ebuild, -esearch-1.1-r1.ebuild:
+  Remove unused versions
 
 *esearch-1.1-r2 (23 Apr 2012)
 
diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
index 63b7679f6b2b..69f6d887547c 100644
--- a/app-portage/esearch/Manifest
+++ b/app-portage/esearch/Manifest
@@ -1,29 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 0.7.2-esync-quiet.patch 749 RMD160 7ed475c2d31a7fee4f508b4b249a1eee97c0fcea SHA1 d51e20b847d746802f0bbaed6dba9314f56bf1e5 SHA256 f232bc286ac48462e975bea8e9950901b04a9e7c99a089f4d4883a8e86568b2c
-AUX 0.7.2-make-prefix-aware.patch 4654 RMD160 cccb2a5d2012e14605039ec87f1570366ecece84 SHA1 0d50f5d2756abc9527549411d04fced030d85efc SHA256 7e54585de4bfa204eb06ebc54550ae972b5ae56712dbde48f7e04efafe60d3fe
-AUX 0.7.2-update-shebang-lines.patch 769 RMD160 59cf1c177d4f4f9134546780acb7c844787b32e6 SHA1 d1f64b3a3a18c5273020c0202179b251d29c8f2c SHA256 a8380cbd924f2db0ae75e8edc238b329ee6b4448de51065774957a81614675e2
 AUX 1.0-fix-EPREFIX-capability.patch 728 RMD160 2962cef8019cc5cbad54c831614d1c97346a60ac SHA1 2b7c6a0768d946c0110588e3ccc8039b346c3129 SHA256 ce28d23699d7ab0375a2b86a179475480621d67008960f0ff2264cbb3bc44a5b
 AUX 1.0-fix-portage-eprefix-compatibility.patch 1302 RMD160 bd83253a26113bf259821c1a165bec8cb13dda32 SHA1 f1ca7de75b79cc5c83ba31bf1e94baaed2387a3a SHA256 73fe0f7bec6dbcb6c273eb23b2924089404755eb4a443c93c4160dcedbded7f5
 AUX 1.1-Reprint-warnings-detected-during-layman-sync-API.patch 3075 RMD160 5271749456c2022cd5b12630eeddf26680f245ea SHA1 5ffcd95fccfe1e8ec6580621fe7e9657d7189c99 SHA256 00b1eb70c2153fec116d65cbd8c635d38df1b459983682daba8be8473b9a7adc
 AUX 1.1-Use-of-undefined-variable-in-sync.patch 729 RMD160 83c6af7a4e8b6079b187623da933b729bb6f6e34 SHA1 5340884e51f927ada94c4037b7ace1cc84aac26c SHA256 126d951bf5e8dcab411ee10a5e309d9e27beeb2813c1cd1eedca3888c696d0eb
 AUX eupdatedb.cron 659 RMD160 b1ccd63e63bdad7640ad536d8427f825527627b6 SHA1 c3ee7bc0df9744f9fde1396e0d6ad21cecdf1e8f SHA256 f0092005752c82d62c1c5b8b3883329610be7a568569d5a375bfc780f3b3b3e0
-DIST esearch-0.7.2.tar.bz2 11747 RMD160 91daf94ed15ece77f0020b6269906b93a526af6a SHA1 a973679704b036a2d15876694534541410d9c273 SHA256 7e47e8f180b1fe2a00468012b38d6f6d75a629b89294d52d08b97dbc1cc2e08e
 DIST esearch-1.0.tar.gz 18071 RMD160 6ffc724b3979cc322f73369331372eb8cd34002b SHA1 a25795d5b092b8eb9716135c4578994a2a2dc550 SHA256 456ece57d9b55e8d9c70920904770c858701d56b7fbb56af32536a5fdd3c8832
 DIST esearch-1.1.tar.gz 18855 RMD160 c3eb634caa93473416b9777322e5c3e8a7acf31c SHA1 4f4f0b903a5a940479baba280cf24bc86ea833e0 SHA256 2c9234d9ecdbe1460a58140fd0c25cf6b7fe2e894e2f880dd26c6d03dca7be16
-EBUILD esearch-0.7.2-r2.ebuild 2033 RMD160 1cb50e6a787ee9e669ba36e76b7649a3232e3e75 SHA1 25e0c443d2969fbfae480249b730a22ad9a2eafc SHA256 4552798a0771c35347e7ea178af5bee77fb4bc8b2e37111d0aa0dba26365b549
 EBUILD esearch-1.0-r2.ebuild 1710 RMD160 9e681604eaced60397f3fb527b774f0e64919f42 SHA1 486410c031deaf08eea2a8563b3d36fff4088f8c SHA256 5e59bc2cf4e25dc2d24f8a4e93ef570dea91b89517e06e2e505cd7a36024d6fe
-EBUILD esearch-1.1-r1.ebuild 1718 RMD160 9e0f96aa538b7dfc71ed531cd84f46d42a3a8a6b SHA1 00265ff9cf1560eeae1fe27aebca4b2d383f28d9 SHA256 b4906e1ef200120d21d71ae838ca189901797cbd72d60e9af125e26e19dc09c2
 EBUILD esearch-1.1-r2.ebuild 1779 RMD160 dba7f28534d5a295a2663527b1d454ab51472d6f SHA1 6c44cd90d22b99bcacc49265bc17d0c5a83eb18c SHA256 615fd0844e2cbb1f056104e1199df2b6b6a9adf9f1ae4ba7ac6b6f5eb78f2c57
-EBUILD esearch-1.1.ebuild 1640 RMD160 092fa759723c4804541f85f4c5a2abb9f6db4886 SHA1 96bfc2eb08de18f00b440325dc2db9b0c852f721 SHA256 43f466013ddb3f11f385458c0c9b9c3817314f5a1fda2f642c76fa4b4e811504
 EBUILD esearch-9999.ebuild 1374 RMD160 ab11b3204b342d199a8cfd3b03bfac8ee1022801 SHA1 c4ddc820d963e21ff4175e4a65fa8f6e4aad1cb3 SHA256 d322e7a472c5bc2f9c6d4ceb0bdf0fdac88d5715467c38d6a61fcba616223156
-MISC ChangeLog 13736 RMD160 c3b3d01e4ce994bd6cb54ddc9f52bbbfd2563e6d SHA1 b3f6784140f37c68bd57a1c6274297fbea99d46e SHA256 5016d78e7e804b87f02f6f53fdbad86816be151ec1dff001d4e0a7f3144bf293
+MISC ChangeLog 13999 RMD160 b5c11048032ae5905892dde26aa31c4dcb64e3d3 SHA1 24851d5e569365e78d58c1d418049733c1a8950c SHA256 5de0d666cd05482f1c9063489d5ccba85d8135f0ffbd07a782e27688e759863c
 MISC metadata.xml 166 RMD160 ca32b35979234f4c3cb4b824fb3c4b5c41bbb1b5 SHA1 ad2b30d8643bb8c9dc8042a399b172878b7021d7 SHA256 3837555db151fa9c3afbe9eb1edff296df030efb574605d6d2b5b37228c2a021
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk+Vw8IACgkQk7WB/7ncNMHSBgEAoaHFm4hpePt6oV34r+j7PcJb
-PQu+Vwmc9uFyLQlSW1oBAJsBwvtdIu/h41daz8K3zdNocHjg5RGCzzC1xXeZJ47x
-=YM5I
+iF4EAREIAAYFAk+W8ocACgkQk7WB/7ncNMFbrQEAmR3TUQyPpHJH3+QSlYcumiQQ
+iWMWmS+BPmxT+yhtiNcBAKa+JXVl/PpECCy7AU8RooeLuDunpAlZhVnN90LpWjDA
+=i3Dz
 -----END PGP SIGNATURE-----
diff --git a/app-portage/esearch/esearch-0.7.2-r2.ebuild b/app-portage/esearch/esearch-0.7.2-r2.ebuild
deleted file mode 100644
index 48d02f7d4ff2..000000000000
--- a/app-portage/esearch/esearch-0.7.2-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 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-r2.ebuild,v 1.6 2012/02/26 08:57:59 patrick Exp $
-
-EAPI=3
-PYTHON_DEPEND=2:2.5
-PYTHON_USE_WITH=readline
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-
-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 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="linguas_fr linguas_it"
-
-RDEPEND="sys-apps/portage"
-
-PATCHES=( "${FILESDIR}"/${PV}-esync-quiet.patch
-	"${FILESDIR}"/${PV}-make-prefix-aware.patch
-	"${FILESDIR}"/${PV}-update-shebang-lines.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 ../$(get_libdir)/esearch/esearch.py /usr/bin/esearch || die "dosym failed"
-	dosym ../$(get_libdir)/esearch/eupdatedb.py /usr/sbin/eupdatedb || die "dosym failed"
-	dosym ../$(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 "${ED}"
-}
-
-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-1.1-r1.ebuild b/app-portage/esearch/esearch-1.1-r1.ebuild
deleted file mode 100644
index d08ec5c8e2fb..000000000000
--- a/app-portage/esearch/esearch-1.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-1.1-r1.ebuild,v 1.1 2012/04/16 19:56:55 fuzzyray Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 2.7-pypy-* *-jython"
-PYTHON_USE_WITH="readline"
-PYTHON_NONVERSIONED_EXECUTABLES=(".*")
-
-inherit base distutils python
-
-DESCRIPTION="Replacement for 'emerge --search' with search-index"
-HOMEPAGE="http://david-peter.de/esearch.html"
-SRC_URI="mirror://github/fuzzyray/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="linguas_fr linguas_it"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-
-DEPEND="sys-apps/portage"
-RDEPEND="${DEPEND}"
-
-# Populate the patches array for any patches for -rX releases
-# It is an array of patch file names of the form:
-# "${FILESDIR}"/${PV}-fix-EPREFIX-capability.patch
-PATCHES=( "${FILESDIR}"/${PV}-Reprint-warnings-detected-during-layman-sync-API.patch )
-
-distutils_src_compile_pre_hook() {
-	echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version
-	VERSION="${PVR}" "$(PYTHON)" setup.py set_version \
-		|| die "setup.py set_version failed"
-}
-
-src_prepare() {
-	base_src_prepare
-	distutils_src_prepare
-}
-
-src_compile() {
-	distutils_src_compile
-}
-
-src_install() {
-	python_convert_shebangs -r "" build-*/scripts-*
-	distutils_src_install
-	dodoc eupdatedb.cron || die "dodoc failed"
-
-	# Remove unused man pages according to the linguas flags
-	if ! use linguas_fr ; then
-		rm -rf "${ED}"/usr/share/man/fr
-	fi
-
-	if ! use linguas_it ; then
-		rm -rf "${ED}"/usr/share/man/it
-	fi
-}
diff --git a/app-portage/esearch/esearch-1.1.ebuild b/app-portage/esearch/esearch-1.1.ebuild
deleted file mode 100644
index 3b15abf7b5c5..000000000000
--- a/app-portage/esearch/esearch-1.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-1.1.ebuild,v 1.1 2012/04/13 21:49:41 fuzzyray Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 2.7-pypy-* *-jython"
-PYTHON_USE_WITH="readline"
-PYTHON_NONVERSIONED_EXECUTABLES=(".*")
-
-inherit base distutils python
-
-DESCRIPTION="Replacement for 'emerge --search' with search-index"
-HOMEPAGE="http://david-peter.de/esearch.html"
-SRC_URI="mirror://github/fuzzyray/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="linguas_fr linguas_it"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-
-DEPEND="sys-apps/portage"
-RDEPEND="${DEPEND}"
-
-# Populate the patches array for any patches for -rX releases
-# It is an array of patch file names of the form:
-# "${FILESDIR}"/${PV}-fix-EPREFIX-capability.patch"
-PATCHES=()
-
-distutils_src_compile_pre_hook() {
-	echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version
-	VERSION="${PVR}" "$(PYTHON)" setup.py set_version \
-		|| die "setup.py set_version failed"
-}
-
-src_prepare() {
-	base_src_prepare
-	distutils_src_prepare
-}
-
-src_compile() {
-	distutils_src_compile
-}
-
-src_install() {
-	python_convert_shebangs -r "" build-*/scripts-*
-	distutils_src_install
-	dodoc eupdatedb.cron || die "dodoc failed"
-
-	# Remove unused man pages according to the linguas flags
-	if ! use linguas_fr ; then
-		rm -rf "${ED}"/usr/share/man/fr
-	fi
-
-	if ! use linguas_it ; then
-		rm -rf "${ED}"/usr/share/man/it
-	fi
-}
diff --git a/app-portage/esearch/files/0.7.2-esync-quiet.patch b/app-portage/esearch/files/0.7.2-esync-quiet.patch
deleted file mode 100644
index e218f76344a6..000000000000
--- a/app-portage/esearch/files/0.7.2-esync-quiet.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit a1e10395afeb138df9c8f39fb3c9c1f53897239f
-Author: dol-sen <brian.dolbec@gmail.com>
-Date:   Sun Jul 31 20:33:31 2011 -0700
-
-    re-add quiet options to getopt, bug 377119
-
-diff --git a/esync.py b/esync.py
-index f74a0f8..eda504f 100755
---- a/esync.py
-+++ b/esync.py
-@@ -70,7 +70,10 @@ def usage():
-     sys.exit(0)
- 
- try:
--    opts = getopt(sys.argv[1:], "hwdmnvs", ["help", "webrsync", "delta-webrsync", "nocolor", "verbose", "metadata", "nospinner"])
-+    opts = getopt(sys.argv[1:], "hwdmnqvs",
-+        ["help", "webrsync", "delta-webrsync",
-+        "nocolor", "verbose", "metadata", "nospinner",
-+        "quiet"])
- except GetoptError, error:
-     print red(" * Error:"), error, "(see", darkgreen("--help"), "for all options)"
-     print
diff --git a/app-portage/esearch/files/0.7.2-make-prefix-aware.patch b/app-portage/esearch/files/0.7.2-make-prefix-aware.patch
deleted file mode 100644
index fbe29b8e3219..000000000000
--- a/app-portage/esearch/files/0.7.2-make-prefix-aware.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From 8def0d5c01ba121c9952a987a721db59e2396261 Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Wed, 24 Aug 2011 17:17:32 -0500
-Subject: [PATCH] Make prefix aware.
-
----
- esearch.py   |   12 +++++++++---
- esync.py     |   27 ++++++++++++++++-----------
- eupdatedb.py |   13 +++++++++----
- 3 files changed, 34 insertions(+), 18 deletions(-)
-
-diff --git a/esearch.py b/esearch.py
-index 68c311d..1f15ee9 100755
---- a/esearch.py
-+++ b/esearch.py
-@@ -9,9 +9,15 @@
- 
- from getopt import *
- import sys
-+import os
- 
--sys.path.insert(0, "/usr/lib/portage/pym")
--sys.path.insert(0, "/usr/lib/esearch")
-+try:
-+	from portage.const import EPREFIX
-+except ImportError:
-+	EPREFIX = ''
-+
-+sys.path.insert(0, EPREFIX + "/usr/lib/portage/pym")
-+sys.path.insert(0, EPREFIX + "/usr/lib/esearch")
- 
- try:
-     from portage.output import bold, red, green, darkgreen, turquoise, nocolor
-@@ -22,7 +28,7 @@ import re
- 
- from common import needdbversion
- 
--esearchdbdir =  "/var/cache/edb/"
-+esearchdbdir =  EPREFIX + "/var/cache/edb/"
- 
- def usage():
-     print "esearch (0.7.1) - Replacement for 'emerge search' with search-index"
-diff --git a/esync.py b/esync.py
-index eda504f..2fcc6be 100755
---- a/esync.py
-+++ b/esync.py
-@@ -15,7 +15,12 @@ import os
- import sys
- from getopt import *
- 
--sys.path.insert(0, "/usr/lib/portage/pym")
-+try:
-+	from portage.const import EPREFIX
-+except ImportError:
-+	EPREFIX = ''
-+
-+sys.path.insert(0, EPREFIX + "/usr/lib/portage/pym")
- 
- import portage
- try:
-@@ -25,11 +30,11 @@ except ImportError:
- 
- from common import needdbversion
- 
--syncprogram =   "EMERGE_DEFAULT_OPTS=\"\" /usr/bin/emerge --sync"
--logfile_sync =  "/var/log/emerge-sync.log"
--tmp_prefix =    "/tmp/esync"
-+syncprogram =   "EMERGE_DEFAULT_OPTS=\"\" " + EPREFIX + "/usr/bin/emerge --sync"
-+logfile_sync =  EPREFIX + "/var/log/emerge-sync.log"
-+tmp_prefix =    EPREFIX + "/tmp/esync"
- 
--sys.path.append("/tmp")
-+sys.path.append(EPREFIX + "/tmp")
- 
- eoptions = ""
- eupdatedb_extra_options = ""
-@@ -85,11 +90,11 @@ for a in opts[0]:
-     if arg in ("-h", "--help"):
-         usage()
-     elif arg in ("-w", "--webrsync"):
--        syncprogram = "EMERGE_DEFAULT_OPTS=\"\" /usr/sbin/emerge-webrsync"
-+        syncprogram = "EMERGE_DEFAULT_OPTS=\"\" " + EPREFIX + "/usr/sbin/emerge-webrsync"
-     elif arg in ("-d", "--delta-webrsync"):
--        syncprogram = "EMERGE_DEFAULT_OPTS=\"\" /usr/bin/emerge-delta-webrsync -u"
-+        syncprogram = "EMERGE_DEFAULT_OPTS=\"\" " + EPREFIX + "/usr/bin/emerge-delta-webrsync -u"
-     elif arg in ("-m", "--metadata"):
--        syncprogram = "EMERGE_DEFAULT_OPTS=\"\" /usr/bin/emerge --metadata"
-+        syncprogram = "EMERGE_DEFAULT_OPTS=\"\" " + EPREFIX + "/usr/bin/emerge --metadata"
-     elif arg in ("-n", "--nocolor"):
-         eoptions = "-n"
-         nocolor()
-@@ -123,7 +128,7 @@ def gettree(tree):
-         target = tmp_prefix + tree + "tree.pyc"
-         if os.path.exists(target):
-             os.unlink(target)
--        os.symlink("/var/cache/edb/esearchdb.pyc", target)
-+        os.symlink(EPREFIX + "/var/cache/edb/esearchdb.pyc", target)
-     except OSError, e:
-         if e.errno != 17:
-             print e
-@@ -166,7 +171,7 @@ if not quiet:
-     emsg("Doing 'eupdatedb' now")
-     print ""
- 
--if os.system("/usr/sbin/eupdatedb " + eoptions + " " + eupdatedb_extra_options) != 0:
-+if os.system(EPREFIX + "/usr/sbin/eupdatedb " + eoptions + " " + eupdatedb_extra_options) != 0:
-     print ""
-     print red(" * Error:"), "eupdatedb failed"
-     sys.exit(1)
-@@ -198,7 +203,7 @@ haspkg = False
- 
- for (pkg, version) in items:
-     if (pkg not in old_keys) or (old[pkg] != new[pkg]):
--        os.system("/usr/bin/esearch " + eoptions + " -Fc ^" + pkg + "$ | head -n1")
-+        os.system(EPREFIX + "/usr/bin/esearch " + eoptions + " -Fc ^" + pkg + "$ | head -n1")
-         haspkg = True
- 
- if not haspkg:
-diff --git a/eupdatedb.py b/eupdatedb.py
-index 6619b92..e423ea0 100755
---- a/eupdatedb.py
-+++ b/eupdatedb.py
-@@ -17,8 +17,13 @@ from os.path import exists
- from shutil import copyfile
- from getopt import *
- 
--sys.path.insert(0, "/usr/lib/portage/pym")
--sys.path.insert(0, "/usr/lib/esearch")
-+try:
-+	from portage.const import EPREFIX
-+except ImportError:
-+	EPREFIX = ''
-+
-+sys.path.insert(0, EPREFIX + "/usr/lib/portage/pym")
-+sys.path.insert(0, EPREFIX + "/usr/lib/esearch")
- 
- import portage
- try:
-@@ -32,8 +37,8 @@ except ImportError:
- 
- from common import needdbversion, version
- 
--esearchdbdir =  "/var/cache/edb/"
--tmpfile =       "/tmp/esearchdb.py.tmp"
-+esearchdbdir =  EPREFIX + "/var/cache/edb/"
-+tmpfile =       EPREFIX + "/tmp/esearchdb.py.tmp"
- 
- vartree = portage.vartree()
- 
--- 
-1.7.6
-
diff --git a/app-portage/esearch/files/0.7.2-update-shebang-lines.patch b/app-portage/esearch/files/0.7.2-update-shebang-lines.patch
deleted file mode 100644
index 4817df7ad5d1..000000000000
--- a/app-portage/esearch/files/0.7.2-update-shebang-lines.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From adb18c5758f533a56c228c2c772b4c34a6be2dc2 Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Wed, 24 Aug 2011 18:27:11 -0500
-Subject: [PATCH] Update shebang lines to work with prefix
-
----
- common.py |    2 +-
- esync.py  |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/common.py b/common.py
-index 197bd21..e121927 100755
---- a/common.py
-+++ b/common.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python
- #
- # Some functions for esearch,
- # eupdatedb and esync.
-diff --git a/esync.py b/esync.py
-index 2fcc6be..b9e77b6 100755
---- a/esync.py
-+++ b/esync.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -u
-+#!/usr/bin/env python
- #
- # 'python -u' for unbuffered output, so you can call
- #   $ esync | tee esync.log
--- 
-1.7.6
-