Fix paths passed to python_mod_optimize() and python_mod_cleanup() (bug #288354).

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

5 files changed, 20 insertions, 21 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index c275bbec8f38..9c1a9f589343 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.426 2009/10/14 09:27:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.427 2009/10/17 05:09:30 arfrever Exp $
+
+  17 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  python-2.5.4-r3.ebuild, python-2.6.3.ebuild, python-3.1.1-r1.ebuild:
+  Fix paths passed to python_mod_optimize() and python_mod_cleanup() (bug
+  #288354).
 
   14 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
   python-3.1.1-r1.ebuild:
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index a7b712317ee0..b1fd7248cad1 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -16,11 +16,11 @@ DIST python-gentoo-patches-2.6.2-r4.tar.bz2 11802 RMD160 d04d80d3ed2ead001dbdbe2
 DIST python-gentoo-patches-2.6.2-r5.tar.bz2 12206 RMD160 43f321ac4df2b4c6ccb5777d3627c089d46b9024 SHA1 2e35f77a7216b61a9aac9508eac2ddce882c993a SHA256 f3e1593911130ed4bb5879c13e5afa4edd0a873682e1e8609184ec24cae244e1
 DIST python-gentoo-patches-2.6.3.tar.bz2 10996 RMD160 6247c60c54dc80f4a243e5fd2cb56e91989b1703 SHA1 066d76528e892b588d4b643ab4e7e310f2e0079e SHA256 d116be09c88ecd8b93b1f1cfa5a18100e1aeb21ca515a8425e3e14ce6b3e5554
 DIST python-gentoo-patches-3.1.1-r2.tar.bz2 8929 RMD160 26afbdbbec3bf0e394cb3082d77abd75d4c75a6b SHA1 e7e775954777a336eff8e9c6c2600d053338fdb2 SHA256 d72acfbf1adeb0ab19da4833bf4663acc9ba4518c614ca92e990dde088d9a07c
-EBUILD python-2.4.6.ebuild 9299 RMD160 500fa2ed8a7a476fa52205baeb93d65d25fbeac5 SHA1 32f40293bf2cc1329dfab632bc55be9bce0be62b SHA256 ed84abd7de9038fb61b6c04e45b9dec0e0d814340017df671faaea125021c2ed
-EBUILD python-2.5.4-r3.ebuild 9776 RMD160 eb7674ab37524674e76372aeae57f68a921b25ab SHA1 af887cb5a601166e4172887e00e539cf665db5ee SHA256 9d69de2e8a1cb7716d77bc6f67a8bd1485be5d7c4c6ba34ed42d1abc4ace2e14
+EBUILD python-2.4.6.ebuild 9466 RMD160 4fd8fbee9a79b8df4110da02312fe0f3bcc414a5 SHA1 c1355759f9df2e28bf2e1cd6558b13a3d2305234 SHA256 e3ed3012465d17842462f1c0c3f50fb2f801ad1292f95f7bdb752d99fc951883
+EBUILD python-2.5.4-r3.ebuild 9597 RMD160 3dbcb0cea295ccc0b370a24360ebf6e4ff6fab61 SHA1 63d1e7bfbb1dc9e73925a95ce5d17849d4f7ea1c SHA256 353032be723dbcfbebf33aebcbf90316850d1b338c93f8a753a344e5c831d857
 EBUILD python-2.6.2-r1.ebuild 9993 RMD160 2643d6d116e2f05e3d28f55293d8314f0a72d875 SHA1 4d778dbf57131881df1b82f2d9117b84661273ba SHA256 0268cbeec142b0579314898ed74f2a2fe7eea5e7a3d67561b3c90f47aa658955
 EBUILD python-2.6.2-r2.ebuild 10027 RMD160 22c959d84a0fb293ca68570bfefb262e49ba1968 SHA1 c2defcc702e24b4cca2012e7e28363cc3941cb02 SHA256 cbcaec2c35ad3e02ac2d7bc57b035eaf45199db426da2d939623ef48ca58dfae
-EBUILD python-2.6.3.ebuild 10104 RMD160 724c1c2b2146fcf38b7a484fb69f0f0e0fad33c1 SHA1 99e00e7902ef740e72e1423ece7b13802d58e728 SHA256 c37447e629d94a90d433a157e0dbbc2ca39f7896c3ad6bad0245fdeb732bcef8
-EBUILD python-3.1.1-r1.ebuild 9569 RMD160 16a609b9fea15dd15528e89aca0308ed0fb7eec9 SHA1 bd5433e2948c62e948d50038a3ef47072d7a4f01 SHA256 55b17b14191bddbd51228667710502bb391950fe4a07339e8e9ff4ea9682f2b3
-MISC ChangeLog 74630 RMD160 927c376c486e008d5b2d2f451c3299cdf2b6764b SHA1 112b991e42d1e4a7a25a4843346823312c1e0725 SHA256 63c29b55b725803042e733a7e4e617c6039db07d2f6b811c300d83fbf6c28f7f
+EBUILD python-2.6.3.ebuild 9960 RMD160 2c48f94e98b9d78d83cd47cd7f7b58bd29a110b4 SHA1 3abd219cee1e3c997be240fb864cfe5486e1388e SHA256 7197ee703496d7f2d67d2844cfc4f5a1b40f9b374ab7e48a343b1b9f3229a8c3
+EBUILD python-3.1.1-r1.ebuild 9424 RMD160 22f3e6e718580b6392934ad40f5ec5f4be525788 SHA1 f93494bd38c7237e66acafeb1db7c095142f7092 SHA256 48ea2a1d529125ae209f5b7907bb55b7c9ea26fd3adf3c0f3d63457558200060
+MISC ChangeLog 74860 RMD160 27a04de7989cc77b963d968b64338aa30614b07d SHA1 a77edaa2540302beca867554f8d618b015169b4f SHA256 1e1bc21f0a8ae064e5646601093c9308d87bec4ea300ad43499ed1b24eae404a
 MISC metadata.xml 501 RMD160 0cc2c851a7c59ed77809c1f3ac2130710f0700e9 SHA1 59bfd447cf15419f68077913de7228f3556ce6e3 SHA256 51c09ee221463f34722a6c655db605a7d6d683069453d173947e4416a43a071c
diff --git a/dev-lang/python/python-2.5.4-r3.ebuild b/dev-lang/python/python-2.5.4-r3.ebuild
index bc709e341e0b..02e70fdd13ab 100644
--- a/dev-lang/python/python-2.5.4-r3.ebuild
+++ b/dev-lang/python/python-2.5.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r3.ebuild,v 1.24 2009/10/17 05:03:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r3.ebuild,v 1.25 2009/10/17 05:09:30 arfrever Exp $
 
 EAPI="1"
 
@@ -285,8 +285,7 @@ eselect_python_update() {
 pkg_postinst() {
 	eselect_python_update
 
-	python_mod_optimize -x "(site-packages|test)" /usr/lib/python${PYVER}
-	[[ "$(get_libdir)" != "lib" ]] && python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
 
 	if [[ "${python_updater_warning}" == "1" ]]; then
 		ewarn
@@ -304,6 +303,5 @@ pkg_postinst() {
 pkg_postrm() {
 	eselect_python_update
 
-	python_mod_cleanup /usr/lib/python${PYVER}
-	[[ "$(get_libdir)" != "lib" ]] && python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
+	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
 }
diff --git a/dev-lang/python/python-2.6.3.ebuild b/dev-lang/python/python-2.6.3.ebuild
index 9f1569193fd9..f21d43eb5268 100644
--- a/dev-lang/python/python-2.6.3.ebuild
+++ b/dev-lang/python/python-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.3.ebuild,v 1.5 2009/10/17 05:03:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.3.ebuild,v 1.6 2009/10/17 05:09:30 arfrever Exp $
 
 EAPI="2"
 
@@ -290,8 +290,7 @@ eselect_python_update() {
 pkg_postinst() {
 	eselect_python_update
 
-	python_mod_optimize -x "(site-packages|test)" /usr/lib/python${PYVER}
-	[[ "$(get_libdir)" != "lib" ]] && python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
 
 	if [[ "${python_updater_warning}" == "1" ]]; then
 		ewarn
@@ -309,6 +308,5 @@ pkg_postinst() {
 pkg_postrm() {
 	eselect_python_update
 
-	python_mod_cleanup /usr/lib/python${PYVER}
-	[[ "$(get_libdir)" != "lib" ]] && python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
+	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
 }
diff --git a/dev-lang/python/python-3.1.1-r1.ebuild b/dev-lang/python/python-3.1.1-r1.ebuild
index cda8869d4c2d..c81020b5f071 100644
--- a/dev-lang/python/python-3.1.1-r1.ebuild
+++ b/dev-lang/python/python-3.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.13 2009/10/17 05:03:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.14 2009/10/17 05:09:30 arfrever Exp $
 
 EAPI="2"
 
@@ -270,8 +270,7 @@ eselect_python_update() {
 pkg_postinst() {
 	eselect_python_update
 
-	python_mod_optimize -x "(site-packages|test)" /usr/lib/python${PYVER}
-	[[ "$(get_libdir)" != "lib" ]] && python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
 
 	if [[ "$(eselect python show)" == "python2."* ]]; then
 		ewarn
@@ -301,6 +300,5 @@ pkg_postinst() {
 pkg_postrm() {
 	eselect_python_update
 
-	python_mod_cleanup /usr/lib/python${PYVER}
-	[[ "$(get_libdir)" != "lib" ]] && python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
+	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
 }