Revison bump to fix undefined variable in esync

(Portage version: 2.1.10.57/cvs/Linux x86_64)

3 files changed, 95 insertions, 1 deletions

diff --git a/app-portage/esearch/ChangeLog b/app-portage/esearch/ChangeLog
index f8e0d81524d0..825939d06e55 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.87 2012/04/16 20:38:06 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/ChangeLog,v 1.88 2012/04/23 21:03:36 fuzzyray Exp $
+
+*esearch-1.1-r2 (23 Apr 2012)
+
+  23 Apr 2012; Paul Varner <fuzzyray@gentoo.org>
+  +files/1.1-Use-of-undefined-variable-in-sync.patch, +esearch-1.1-r2.ebuild:
+  Revison bump to fix undefined variable in esync
 
   16 Apr 2012; Paul Varner <fuzzyray@gentoo.org> ChangeLog:
   Forcing signed manifest.
diff --git a/app-portage/esearch/esearch-1.1-r2.ebuild b/app-portage/esearch/esearch-1.1-r2.ebuild
new file mode 100644
index 000000000000..86135b2a0e82
--- /dev/null
+++ b/app-portage/esearch/esearch-1.1-r2.ebuild
@@ -0,0 +1,60 @@
+# 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.1 2012/04/23 21:03:36 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
+	"${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/files/1.1-Use-of-undefined-variable-in-sync.patch b/app-portage/esearch/files/1.1-Use-of-undefined-variable-in-sync.patch
new file mode 100644
index 000000000000..a7d7d86ac70a
--- /dev/null
+++ b/app-portage/esearch/files/1.1-Use-of-undefined-variable-in-sync.patch
@@ -0,0 +1,28 @@
+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
+