Remove old versions, update ebuilds to EAPI5, and add patches to fix python

egg info and python 3 compatability.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xDCB4A7FF)

12 files changed, 143 insertions, 391 deletions

diff --git a/app-portage/esearch/ChangeLog b/app-portage/esearch/ChangeLog
index 809eb1bb4777..7b4ae3891b98 100644
--- a/app-portage/esearch/ChangeLog
+++ b/app-portage/esearch/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-portage/esearch
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/ChangeLog,v 1.113 2014/01/18 05:18:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/ChangeLog,v 1.114 2014/02/13 20:28:18 fuzzyray Exp $
+
+*esearch-1.3-r1 (13 Feb 2014)
+
+  13 Feb 2014; Paul Varner <fuzzyray@gentoo.org> -esearch-1.0-r2.ebuild,
+  -esearch-1.1-r2.ebuild, -esearch-1.2.ebuild, +esearch-1.3-r1.ebuild,
+  esearch-9999.ebuild, -files/1.0-fix-EPREFIX-capability.patch,
+  +files/1.3-Fix-python-3-compatability.patch,
+  -files/1.0-fix-portage-eprefix-compatibility.patch,
+  -files/1.1-Reprint-warnings-detected-during-layman-sync-API.patch,
+  -files/1.1-Use-of-undefined-variable-in-sync.patch,
+  +files/1.3-Fix-setup.py.patch:
+  Remove old versions, update ebuilds to EAPI5, and add patches to fix python
+  egg info and python 3 compatability.
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> esearch-1.3.ebuild:
   Add arm64 love.
diff --git a/app-portage/esearch/esearch-1.0-r2.ebuild b/app-portage/esearch/esearch-1.0-r2.ebuild
deleted file mode 100644
index 5d84f8d241b2..000000000000
--- a/app-portage/esearch/esearch-1.0-r2.ebuild
+++ /dev/null
@@ -1,62 +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.0-r2.ebuild,v 1.8 2012/03/02 20:26:34 ranger 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}"
-
-PATCHES=("${FILESDIR}"/${PV}-fix-EPREFIX-capability.patch
-	"${FILESDIR}"/${PV}-fix-portage-eprefix-compatibility.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
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	ewarn "Because file locations have changed, please run 'hash -r' in your active shells."
-}
diff --git a/app-portage/esearch/esearch-1.1-r2.ebuild b/app-portage/esearch/esearch-1.1-r2.ebuild
deleted file mode 100644
index e802dcc13b28..000000000000
--- a/app-portage/esearch/esearch-1.1-r2.ebuild
+++ /dev/null
@@ -1,60 +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-r2.ebuild,v 1.8 2012/07/01 16:44:56 armin76 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
-	"${FILESDIR}"/${PV}-Use-of-undefined-variable-in-sync.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.2.ebuild b/app-portage/esearch/esearch-1.2.ebuild
deleted file mode 100644
index a350563f4dde..000000000000
--- a/app-portage/esearch/esearch-1.2.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.2.ebuild,v 1.1 2012/06/04 21:20:28 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/esearch-1.3-r1.ebuild b/app-portage/esearch/esearch-1.3-r1.ebuild
new file mode 100644
index 000000000000..3ec95286162c
--- /dev/null
+++ b/app-portage/esearch/esearch-1.3-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-1.3-r1.ebuild,v 1.1 2014/02/13 20:28:18 fuzzyray Exp $
+
+EAPI="5"
+PYTHON_COMPAT=(python{2_6,2_7,3_2,3_3})
+PYTHON_REQ_USE="readline(+)"
+
+inherit distutils-r1
+
+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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-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}-Fix-setup.py.patch
+	"${FILESDIR}"/${PV}-Fix-python-3-compatability.patch
+)
+
+python_prepare_all() {
+	python_export_best
+	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version \
+		|| die "setup.py set_version failed"
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	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 \
+			|| die "rm failed to remove ${ED}/usr/share/man/fr"
+	fi
+
+	if ! use linguas_it ; then
+		rm -rf "${ED}"/usr/share/man/it \
+			|| die "rm failed to remove ${ED}/usr/share/man/it"
+	fi
+}
diff --git a/app-portage/esearch/esearch-9999.ebuild b/app-portage/esearch/esearch-9999.ebuild
index 1634cdbdfda5..754b90fd6d89 100644
--- a/app-portage/esearch/esearch-9999.ebuild
+++ b/app-portage/esearch/esearch-9999.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-9999.ebuild,v 1.5 2012/12/11 08:17:36 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-9999.ebuild,v 1.6 2014/02/13 20:28:18 fuzzyray Exp $
 
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] *-jython 2.7-pypy-*"
-PYTHON_USE_WITH="readline"
-PYTHON_NONVERSIONED_EXECUTABLES=(".*")
+EAPI="5"
+PYTHON_COMPAT=(python{2_6,2_7,3_2,3_3})
+PYTHON_REQ_USE="readline(+)"
 
-inherit distutils python git-2
+inherit distutils-r1 git-2
 
 EGIT_REPO_URI="git://github.com/fuzzyray/esearch.git"
 
@@ -25,18 +23,15 @@ KEYWORDS=""
 DEPEND="sys-apps/portage"
 RDEPEND="${DEPEND}"
 
-distutils_src_compile_pre_hook() {
-	echo VERSION="9999-${EGIT_VERSION}" "$(PYTHON)" setup.py set_version
-	VERSION="9999-${EGIT_VERSION}" "$(PYTHON)" setup.py set_version
+python_prepare_all() {
+	python_export_best
+	echo VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
+	VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
 }
 
-src_compile() {
-	distutils_src_compile
-}
-
-src_install() {
-	python_convert_shebangs -r "" build-*/scripts-*
-	distutils_src_install
+python_install_all() {
+	distutils-r1_python_install_all
 	dodoc eupdatedb.cron || die "dodoc failed"
 
 	# Remove unused man pages according to the linguas flags
diff --git a/app-portage/esearch/files/1.0-fix-EPREFIX-capability.patch b/app-portage/esearch/files/1.0-fix-EPREFIX-capability.patch
deleted file mode 100644
index edf9a600a2e2..000000000000
--- a/app-portage/esearch/files/1.0-fix-EPREFIX-capability.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8399831cd2f5968fc45d0f1dc4e131368161e39a Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Fri, 9 Dec 2011 23:58:52 -0800
-Subject: [PATCH] apply zmedico's patch to fix EPREFIX capability.
-
----
- esearch/search.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/esearch/search.py b/esearch/search.py
-index 8498687..f296cb7 100755
---- a/esearch/search.py
-+++ b/esearch/search.py
-@@ -15,7 +15,7 @@ from os import listdir, getenv, system
- from os.path import isdir, exists
- import re
- 
--sys.path.insert(0, "/usr/lib/portage/pym")
-+#sys.path.insert(0, "/usr/lib/portage/pym")
- # commented out so it can run from the git checkout
- #sys.path.insert(0, "/usr/lib/esearch")
- 
--- 
-1.7.8
-
diff --git a/app-portage/esearch/files/1.0-fix-portage-eprefix-compatibility.patch b/app-portage/esearch/files/1.0-fix-portage-eprefix-compatibility.patch
deleted file mode 100644
index a4f9b1ba06ff..000000000000
--- a/app-portage/esearch/files/1.0-fix-portage-eprefix-compatibility.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a160eedd0b176cfa3da755762a8e40a38b753114 Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Mon, 19 Dec 2011 13:09:42 -0600
-Subject: [PATCH] Fix setup.py to work with EPREFIX changes in Portage.
-
----
- setup.py |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 2990e33..b24cd8f 100755
---- a/setup.py
-+++ b/setup.py
-@@ -22,7 +22,7 @@ cwd = os.getcwd()
- try: 
- 	from portage.const import EPREFIX 
- except ImportError: 
--	EPREFIX='/' 
-+	EPREFIX='' 
- 
- # Python files that need `__version__ = ""` subbed, relative to this dir:
- python_scripts = [os.path.join(cwd, path) for path in (
-@@ -80,9 +80,9 @@ core.setup(
- 	packages=packages,
- 	scripts=(glob('bin/*')),
- 	data_files=(
--		(os.path.join(EPREFIX, 'usr/share/man/man1'), glob('man/en/*')),
--		(os.path.join(EPREFIX, 'usr/share/man/fr/man1'), glob('man/fr/*')),
--		(os.path.join(EPREFIX, 'usr/share/man/it/man1'), glob('man/it/*')),
-+		(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/man1'), glob('man/en/*')),
-+		(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/fr/man1'), glob('man/fr/*')),
-+		(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/it/man1'), glob('man/it/*')),
- 	),
- 	cmdclass={
- 		'set_version': set_version,
--- 
-1.7.8
-
diff --git a/app-portage/esearch/files/1.1-Reprint-warnings-detected-during-layman-sync-API.patch b/app-portage/esearch/files/1.1-Reprint-warnings-detected-during-layman-sync-API.patch
deleted file mode 100644
index 2c202100a688..000000000000
--- a/app-portage/esearch/files/1.1-Reprint-warnings-detected-during-layman-sync-API.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 32797b3ac5992c1711f9d965a967d00cbe014c78 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Sun, 15 Apr 2012 16:12:51 -0700
-Subject: [PATCH] Reprint warnings detected during layman sync API operations
- at the end of the sync output.
-
----
- esearch/common.py |    8 +++++++-
- esearch/sync.py   |   17 ++++++++++++-----
- 2 files changed, 19 insertions(+), 6 deletions(-)
-
-diff --git a/esearch/common.py b/esearch/common.py
-index c092026..a97102f 100755
---- a/esearch/common.py
-+++ b/esearch/common.py
-@@ -10,7 +10,7 @@ from __future__ import print_function
- 
- import sys
- from portage import catpkgsplit
--from portage.output import red, green
-+from portage.output import red, green, yellow
- 
- from . import __version__
- 
-@@ -101,3 +101,9 @@ def error(msg, fatal=True, stderr=CONFIG['stderr']):
-     print('', file=stderr)
-     if fatal:
-         sys.exit(1)
-+
-+def warn(msg, fatal=False, stdout=CONFIG['stdout']):
-+    print(yellow(" * Warning:"), msg, file=stdout)
-+    print('', file=stdout)
-+    if fatal:
-+        sys.exit(1)
-diff --git a/esearch/sync.py b/esearch/sync.py
-index a05f1cf..5748698 100755
---- a/esearch/sync.py
-+++ b/esearch/sync.py
-@@ -29,7 +29,7 @@ except ImportError:
- 
- from esearch.common import (CONFIG, SyncOpts, error, outofdateerror,
-     logfile_sync, laymanlog_sync, tmp_path, tmp_prefix, version,
--    EPREFIX, COMPACT)
-+    EPREFIX, COMPACT, warn)
- from esearch.update import updatedb
- from esearch.search import searchdb
- 
-@@ -166,8 +166,8 @@ def layman_sync(config):
-             error("'" + config['layman-cmd'] + "' failed, see " +
-                 laymanlog_sync + " for errors", fatal=False)
-             print("")
--            return False
--        return True
-+            return False, []
-+        return True, []
-     # run the api to sync
-     emsg("Running the Layman API", config)
-     if config['verbose']<1:
-@@ -179,6 +179,7 @@ def layman_sync(config):
-         verbose=config['verbose']>0, nocolor=config['nocolor'])
-     repos = _layman.get_installed()
-     success = _layman.sync(repos, output_results=config['verbose']>0)
-+    warnings = _layman.sync_results[1]
-     if not success:
-         error("Syncing with the layman api "\
-              "failed.\n   Failures were:", fatal=False)
-@@ -186,7 +187,7 @@ def layman_sync(config):
-         for ovl, result in fatals:
-             error(result, fatal=False)
- 
--    return success
-+    return success, warnings
- 
- 
- def sync(config):
-@@ -194,7 +195,8 @@ def sync(config):
-     tree_old = gettree("old", config)
- 
-     if config['layman-sync']:
--        if not layman_sync(config):
-+        success, warnings = layman_sync(config)
-+        if not success:
-             return False
- 
-     if config['verbose'] >= 0:
-@@ -266,6 +268,11 @@ def sync(config):
-         emsg("No updates found", config)
-         success = True
- 
-+    if warnings:
-+        print("", file=config['stdout'])
-+        for ovl, result in warnings:
-+            warn(result)
-+
-     # multiple pkgname search method
-     # build our re search list
-     #pkg_patterns = []
--- 
-1.7.8.5
-
diff --git a/app-portage/esearch/files/1.1-Use-of-undefined-variable-in-sync.patch b/app-portage/esearch/files/1.1-Use-of-undefined-variable-in-sync.patch
deleted file mode 100644
index a7d7d86ac70a..000000000000
--- a/app-portage/esearch/files/1.1-Use-of-undefined-variable-in-sync.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From be82bbc05e3f31d52f45561125e02d764cce7e7f Mon Sep 17 00:00:00 2001
-From: gdvl <gdvl@gentp>
-Date: Sat, 21 Apr 2012 12:14:03 +0200
-Subject: [PATCH] Use of undefined variable in sync()
-
-The variable 'warnings' in sync() is undefined if esync is called
-without --layman-sync. This causes esync to fail when executing the
-'if warnings ...' statement.
----
- esearch/sync.py |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/esearch/sync.py b/esearch/sync.py
-index 5748698..a147ac1 100755
---- a/esearch/sync.py
-+++ b/esearch/sync.py
-@@ -192,6 +192,8 @@ def layman_sync(config):
- 
- def sync(config):
- 
-+    warnings = None
-+
-     tree_old = gettree("old", config)
- 
-     if config['layman-sync']:
--- 
-1.7.8.5
-
diff --git a/app-portage/esearch/files/1.3-Fix-python-3-compatability.patch b/app-portage/esearch/files/1.3-Fix-python-3-compatability.patch
new file mode 100644
index 000000000000..36c9d2255b8c
--- /dev/null
+++ b/app-portage/esearch/files/1.3-Fix-python-3-compatability.patch
@@ -0,0 +1,34 @@
+From 3978f923ac814aef014cf412b63d11fd94f60692 Mon Sep 17 00:00:00 2001
+From: Paul Varner <fuzzyray@gentoo.org>
+Date: Wed, 8 May 2013 14:26:48 -0500
+Subject: [PATCH 1/2] Fix python 3 compatability with 'esearch -e' (Bug 469076)
+
+Thanks to zmedico for the patch.
+---
+ esearch/search.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/esearch/search.py b/esearch/search.py
+index f91f5b1..696a0f0 100755
+--- a/esearch/search.py
++++ b/esearch/search.py
+@@ -22,6 +22,7 @@ import re
+ try:
+     from portage.output import bold, red, green, darkgreen, turquoise, blue, nocolor
+     from portage import settings, pkgcmp, pkgsplit, portdb, best
++    from portage.util import cmp_sort_key
+ except ImportError:
+     print("Critical: portage imports failed!")
+     sys.exit(1)
+@@ -107,7 +108,7 @@ def searchEbuilds(path, portdir=True, searchdef="", repo_num="",
+                     data['defebuild'] = (searchdef, pkgs[-1][3])
+         if not portdir:
+             config['found_in_overlay'] = True
+-        pkgs.sort(mypkgcmp)
++        pkgs.sort(key=cmp_sort_key(mypkgcmp))
+         for pkg in pkgs:
+             rev = ""
+             if pkg[2] != "r0":
+-- 
+1.8.5.4
+
diff --git a/app-portage/esearch/files/1.3-Fix-setup.py.patch b/app-portage/esearch/files/1.3-Fix-setup.py.patch
new file mode 100644
index 000000000000..aad5d49f2f56
--- /dev/null
+++ b/app-portage/esearch/files/1.3-Fix-setup.py.patch
@@ -0,0 +1,28 @@
+From 94e77b115f5b14b7dfea50e4a7b77047e4b47263 Mon Sep 17 00:00:00 2001
+From: Paul Varner <fuzzyray@gentoo.org>
+Date: Tue, 18 Dec 2012 04:33:27 -0600
+Subject: [PATCH 1/3] Fix setup.py so that either VERSION or PVR will set the
+ version.
+
+This fixes the issue with egg-info always having a version number of
+9999.  Fix is from Brian Dolbec courtesy of mirrorselect.
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 9d2addd..45a4c06 100755
+--- a/setup.py
++++ b/setup.py
+@@ -14,7 +14,7 @@ import io
+ 
+ sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'pym'))
+ 
+-__version__ = os.getenv('VERSION', default='9999')
++__version__ = os.getenv('VERSION', default=os.getenv('PVR', default='9999'))
+ 
+ cwd = os.getcwd()
+ 
+-- 
+1.8.5.4
+