Fix regression from bug #370935 on non-prefix portages. Thanks to maksbotan for reporting.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 91 insertions, 2 deletions

diff --git a/app-admin/python-updater/ChangeLog b/app-admin/python-updater/ChangeLog
index b8349b17a1a9..4d576665c052 100644
--- a/app-admin/python-updater/ChangeLog
+++ b/app-admin/python-updater/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/python-updater
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/ChangeLog,v 1.75 2012/03/02 22:08:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/ChangeLog,v 1.76 2012/03/03 18:05:31 marienz Exp $
+
+*python-updater-0.10-r2 (03 Mar 2012)
+
+  03 Mar 2012; Marien Zwart <marienz@gentoo.org>
+  +files/python-updater-0.10-only-alias-sed-if-exists.patch,
+  +python-updater-0.10-r2.ebuild:
+  Fix regression from bug #370935 on non-prefix portages. Thanks to maksbotan
+  for reporting.
 
   02 Mar 2012; Brent Baude <ranger@gentoo.org> python-updater-0.10.ebuild:
   Marking python-updater-0.10 ppc64 for bug 400861
diff --git a/app-admin/python-updater/Manifest b/app-admin/python-updater/Manifest
index e02e2e96f67b..f75faaef901e 100644
--- a/app-admin/python-updater/Manifest
+++ b/app-admin/python-updater/Manifest
@@ -1,11 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX python-updater-0.10-expand-aliases.patch 171 RMD160 db523fe5f44fb95e541dae711c4a447bb5b067e4 SHA1 b0430d54d362f8c3e5fe67f97cb03511ebce4243 SHA256 734ff3178594cfc7717bf61a07f3686c9d4d664feb28623ae06b9ea0493b8757
+AUX python-updater-0.10-only-alias-sed-if-exists.patch 965 RMD160 6aa56ab35a49aa04c6194e3f30fdc89981e30cc5 SHA1 2af38fcfb457fda46c8b2dc792de83626205e267 SHA256 d9d824edc1478550245e51a3635064c3d245de38f8551a7d9e6225f82d8f5362
 AUX python-updater-0.9-sed.patch 275 RMD160 447e703befd7306389b8d8ae186c2dd8148ebcbd SHA1 9291431a480eebc12c4f366df95c3ef9f6ff9f0f SHA256 2de9c74bed523e5ef07ca9f85f63872fe80d713011afc3c7d3a325f3d58b1a45
 DIST python-updater-0.10.tar.bz2 9245 RMD160 664a6e0ceecb3cd8f5bbcf1fd3774b87791bf2af SHA1 bd62b25d58fc16f640be92aaf9843644360fb767 SHA256 7defcf844e3751ce0ead132116b727f947715c7545a7a2f8ffba7cf375213520
 DIST python-updater-0.9.tar.bz2 7789 RMD160 5da6945368186fd7eb9efb37b6b81ebe7660fc58 SHA1 f64e11d4f106088c7a4bf866ba0be1a2b831cd9f SHA256 a4b065c264e1909e1d6a7f9a0d5dacce224f946468313e34e8775df0b6689384
 EBUILD python-updater-0.10-r1.ebuild 1289 RMD160 51cfeadfc768546d51e3714963f04a2ec4bee398 SHA1 c8408c265673672962e01a8a13470d451a01a84b SHA256 d781ffb38fb66a617529a5593ebe0afb81ebe52d32fcf4145816b5994f395785
+EBUILD python-updater-0.10-r2.ebuild 1349 RMD160 575796ef9fab0a183d8795e69524c1451033b6c8 SHA1 49972b691a89c008ee13e8b2c6da984781e0e977 SHA256 bfd712bcd021496196bad800370d93c422f1001ee8d8b7700560afe49e11649b
 EBUILD python-updater-0.10.ebuild 1169 RMD160 af36e812eedda48ed03027dd739ef7240ddcdf61 SHA1 4596bc469a71d364b033305102b4ff792b7bd3d8 SHA256 02a95f151bd8c4c18e04b64233482d002c95fb92965a096686f2f203559d80be
 EBUILD python-updater-0.9-r1.ebuild 883 RMD160 76bdcd71d5c0c15264291796481a44dbf9a48ef9 SHA1 a1018759e473cb2837dc57ffe160fa99cfcc044c SHA256 bb3417bcf80a0a9c2f4ac72ac8051d7b48d3bb6d706b321b2379c1a2478373f0
 EBUILD python-updater-0.9.ebuild 777 RMD160 a9f4cc957e557d06779eeeb740e99f8c3e0c4680 SHA1 e0a6185afc672e1253a6b70e2e24ddc55c98a5b3 SHA256 4d34c071cea0229f82b7d54ebfd1748df5c0268ed2c2124aa33a8dfd8a277a5e
 EBUILD python-updater-9999.ebuild 1086 RMD160 89a38537a74df742b696c54ff1ee6e767b4ae520 SHA1 0af4ae6ad364d343f143d498bcab9c4398de8343 SHA256 b571662164921f3a60bce1fd005b4679499310fe0d06393b54ee2cfa78a4b4bb
-MISC ChangeLog 10280 RMD160 aaaef2e2ca7901f7647aa7b824d72e0af4c1a507 SHA1 1c594647adb0b77d6072fb3d556ee3cbd6512120 SHA256 715ce2f738d639b4891de9d40762a0c97ed23ee5e706e9e6e563516e81c575d1
+MISC ChangeLog 10560 RMD160 ff0d23bc4684a788378d1d11a460b5650d1ae68c SHA1 e7b14d0c83d6b2e695958942599a2eed364d720e SHA256 7c9b359f202c9b968ced42c4bb4feb675d93072cb053144d4cd9a6b437616766
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk9SXXUACgkQpnr2roL0g0nKUAD+LqO9rZHWAUu+xCcP6TMztSRP
+Q7UX1lOn9DZ8kIIXCakBAIt1INh9XmMrI7x8N8BVCjh7Ah90+K7VqSSqB9XsIaPm
+=BDeN
+-----END PGP SIGNATURE-----
diff --git a/app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch b/app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch
new file mode 100644
index 000000000000..20051f51594d
--- /dev/null
+++ b/app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch
@@ -0,0 +1,23 @@
+Only alias sed to /usr/lib/portage/bin/ebuild-helpers/sed if the
+latter exists (which should be the case on prefix portages, but not on
+normal ones). Fixes fallout from bug #370935 on non-prefix portages.
+
+--- python-updater
++++ python-updater
+@@ -488,8 +488,15 @@
+ 	shift
+ done
+ 
++# On a prefix portage we need to use sed from ebuild-helpers/ instead
++# of $PATH. On non-prefix portages ebuild-helpers/sed does not exist.
++# Prepending ebuild-helpers/ to $PATH uses too many tools from there.
++# So alias sed to ebuild-helpers/sed if it exists:
+ if [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "emerge" ]]; then
+-	alias sed="$(/usr/bin/python -c "import os; print(os.path.dirname(os.path.realpath('$(type -p emerge)')))")/ebuild-helpers/sed"
++	sed="$(/usr/bin/python -c "import os; print(os.path.dirname(os.path.realpath('$(type -p emerge)')))")/ebuild-helpers/sed"
++	if [[ -x "${sed}" ]]; then
++		alias sed="${sed}"
++	fi
+ fi
+ 
+ if has_version "=dev-lang/python-2*"; then
diff --git a/app-admin/python-updater/python-updater-0.10-r2.ebuild b/app-admin/python-updater/python-updater-0.10-r2.ebuild
new file mode 100644
index 000000000000..399327d91b4a
--- /dev/null
+++ b/app-admin/python-updater/python-updater-0.10-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 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.10-r2.ebuild,v 1.1 2012/03/03 18:05:31 marienz Exp $
+
+inherit eutils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit subversion
+fi
+
+DESCRIPTION="Script used to reinstall Python packages after changing of active Python versions"
+HOMEPAGE="http://www.gentoo.org/proj/en/Python/"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+	ESVN_REPO_URI="https://gentoo-progress.googlecode.com/svn/projects/python-updater/trunk"
+else
+	SRC_URI="http://people.apache.org/~Arfrever/gentoo/${P}.tar.bz2"
+fi
+
+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="$([[ "${PV}" == "9999" ]] && echo "sys-apps/help2man")"
+RDEPEND="dev-lang/python
+	|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-expand-aliases.patch
+	epatch "${FILESDIR}"/${P}-only-alias-sed-if-exists.patch
+}
+
+src_compile() {
+	if [[ "${PV}" == "9999" ]]; then
+		emake ${PN}.1 || die "Generation of man page failed"
+	fi
+}
+
+src_install() {
+	dosbin ${PN} || die "dosbin failed"
+	doman ${PN}.1 || die "doman failed"
+	dodoc AUTHORS || die "dodoc failed"
+}