Backport fix for bug #288361.

Package-Manager: portage-15217-svn/cvs/Linux x86_64

4 files changed, 92 insertions, 2 deletions

diff --git a/app-admin/python-updater/ChangeLog b/app-admin/python-updater/ChangeLog
index 262751b7c624..6189bfb78d42 100644
--- a/app-admin/python-updater/ChangeLog
+++ b/app-admin/python-updater/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/python-updater
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/ChangeLog,v 1.44 2010/01/29 17:17:00 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/ChangeLog,v 1.45 2010/01/29 17:37:11 arfrever Exp $
+
+*python-updater-0.7-r1 (29 Jan 2010)
+
+  29 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +python-updater-0.7-r1.ebuild, +files/python-updater-0.7-fix_import.patch:
+  Backport fix for bug #288361.
 
 *python-updater-0.8 (29 Jan 2010)
 
diff --git a/app-admin/python-updater/Manifest b/app-admin/python-updater/Manifest
index f33f98e00bfc..4f7720c26bfa 100644
--- a/app-admin/python-updater/Manifest
+++ b/app-admin/python-updater/Manifest
@@ -1,7 +1,9 @@
+AUX python-updater-0.7-fix_import.patch 1251 RMD160 14ee61c0ff3bfd2f2823d499d4ed9ff675760195 SHA1 e948d3b11211c655c77b99e01cb19e84e559f666 SHA256 b0981f5c4f2bccc5056143e09897ca33a233f7bd1a04a05a288df760e02d4308
 DIST python-updater-0.7.tar.bz2 6436 RMD160 e85d3bbfd87f640c1c540855126ccd85ff073340 SHA1 0286e9f6b41587e5cc837b19b90e51ab3a281595 SHA256 cfcd89b94ac9cb6929c808fe94a774d2e3922a48aefd8ead871bbbf4682dc686
 DIST python-updater-0.8.tar.bz2 8137 RMD160 8988317da5d93046753fcd254c177cc2118aa06e SHA1 6a312a6ba9c23506990618af6072521a4deee9c1 SHA256 9e9cec0921fca089fa49fb72cbab5e9374a52c951febc377bbed02ac0142ba4f
+EBUILD python-updater-0.7-r1.ebuild 894 RMD160 b6ad859875e4c2007489f1b8cc3e3a128978f456 SHA1 299cae792484ca8be51b462e8589496e53b8cbf8 SHA256 a9d86025dc69621e18b75ce7c935fe33b7421672a4e34443eeb99eeca8d7cc6f
 EBUILD python-updater-0.7.ebuild 751 RMD160 642ea6e39cdf0c46aeaf7b4e8e46716af17dea48 SHA1 2aeea22a62367c9ba821f1dc85a176501e73b5f9 SHA256 23b28a3857733e667cf725fb99c23e6b386fbf239b127b25d4eaf5c1bf990d83
 EBUILD python-updater-0.8.ebuild 787 RMD160 8a86f242bb744a0b1a68641dc2e4c6ff0219ac7c SHA1 bac3e0e9d6d4c4f6bd6596a6913a00c2755faaa7 SHA256 d96863aab6ce84bf8b80fb7609e1637a531a1c5ccd127a2a515915561de8948a
 EBUILD python-updater-9999.ebuild 797 RMD160 baf577ebc6a0c8bcba37bc9850cf5d0c27d28a3e SHA1 7dfce5f3afc24f8bad5d7ca282acdebd0458b180 SHA256 96685de6730989b66c41bd27687c59e0d0dadcbb1111dae8181a2c872079f737
-MISC ChangeLog 5755 RMD160 16e7d68f2d58224217d008a5c0878354c85750bd SHA1 b6dce77e694c529b46b9a1ad096b3ce5bc77c2e6 SHA256 20dfe1a8f87a9f02c0d333f5a8f360e8c6cfe36acbbc8d9c0ffd8ca96716ee8c
+MISC ChangeLog 5976 RMD160 ac902284b5bb99d1495a81dcb2ace2da00096908 SHA1 5f2fe3af39a72b1d1b83ce9b892f2e3cf5801990 SHA256 85ce1b012bdafbfe8338ef5f0c8b34e90bda1589a5882d85cc9b7f0d707b1331
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
diff --git a/app-admin/python-updater/files/python-updater-0.7-fix_import.patch b/app-admin/python-updater/files/python-updater-0.7-fix_import.patch
new file mode 100644
index 000000000000..bf46ce4cae8f
--- /dev/null
+++ b/app-admin/python-updater/files/python-updater-0.7-fix_import.patch
@@ -0,0 +1,49 @@
+--- python-updater
++++ python-updater
+@@ -34,7 +34,6 @@
+ VERBOSE=0
+ PKGS_TO_REMERGE=""
+ PKGS_COUNT_REMERGE=0
+-PORTAGE_PYTHON="/usr/bin/python"
+ PYTHON_VERSIONS="3.2 3.1 3.0 2.7 2.6 2.5 2.4 2.3 2.2 2.1"
+ 
+ SUPPORTED_PMS="portage pkgcore paludis"
+@@ -132,26 +131,6 @@
+     return 1
+ }
+ 
+-# get_portage_python(oldpy,newpy)
+-# Find where portage is, in pythonX.Y or somewhere else?
+-get_portage_python() {
+-    if [[ $# -lt 2 ]]; then
+-        eerror "get_portage_python(): Missing arguments."
+-        exit 1
+-    fi
+-    local oldpy="$1" newpy="$2"
+-
+-    pybin=/usr/bin/python
+-    for py in ${pybin} ${pybin}${oldpy} ${pybin}${newpy}; do
+-        if ${py} -c "import portage" > /dev/null 2>&1; then
+-            echo -n "${py}"
+-            return 0
+-        fi
+-    done
+-    eerror "Couldn't determine portage python"
+-    return 1
+-}
+-
+ # get_portage_portdir()
+ # Check if portage knows about PORTDIR and return it
+ get_portage_portdir() {
+@@ -294,11 +273,6 @@
+     fi
+ fi
+ 
+-# Get portage python
+-PORTAGE_PYTHON="$(get_portage_python ${OLD_PY_VER} ${NEW_PY_VER})"
+-[[ $? != 0 ]] && exit 1
+-
+-
+ einfo "Starting Python Updater from ${OLD_PY_VER} to ${NEW_PY_VER} :"
+ if [[ CHECK_SONAME -ne 0 ]]; then
+     if ! type -P scanelf >/dev/null 2>&1; then
diff --git a/app-admin/python-updater/python-updater-0.7-r1.ebuild b/app-admin/python-updater/python-updater-0.7-r1.ebuild
new file mode 100644
index 000000000000..e6ff4a284f39
--- /dev/null
+++ b/app-admin/python-updater/python-updater-0.7-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-0.7-r1.ebuild,v 1.1 2010/01/29 17:37:11 arfrever Exp $
+
+inherit eutils
+
+DESCRIPTION="Script used to remerge python packages when changing Python version."
+HOMEPAGE="http://www.gentoo.org/proj/en/Python"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!<dev-lang/python-2.3.6-r2
+	>=sys-apps/portage-2.1.2"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Delete vulnerable code.
+	epatch "${FILESDIR}/${P}-fix_import.patch"
+}
+
+src_install()
+{
+	dosbin ${PN} || die "dosbin failed"
+	doman ${PN}.1 || die "doman failed"
+	dodoc AUTHORS ChangeLog || die "dodoc failed"
+}