EPYTHON is required for python_mod_optimize().

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

6 files changed, 15 insertions, 15 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 164173584dad..31244e8e46b2 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -14,10 +14,10 @@ DIST python-gentoo-patches-2.5.4-r2.tar.bz2 20722 RMD160 86c25ad3647b7a3ca44c8e7
 DIST python-gentoo-patches-2.5.4-r3.tar.bz2 19473 RMD160 c3a807693103f9e26c3cce4add5a1f3d975ef216 SHA1 c6170894865ee8aac8c813916c21a0d0458691bc SHA256 03f5bdb0a4ac8eb498a90c5cd444a5c76ed7e79bff5e8dca00efe77cf80c6391
 DIST python-gentoo-patches-2.6.4.tar.bz2 11032 RMD160 83903892ef18880f876e7a140c803c1e8a67e24b SHA1 51d4174b2a4136a11c64ae0007b59e4c2f0e13f2 SHA256 19a66a0855df270c030438f21c29260e7ff69b299830409f6aa9140611b721e2
 DIST python-gentoo-patches-3.1.1-r4.tar.bz2 10200 RMD160 418852c54bf7169eb7bab078e78997e22799139e SHA1 0c063cd446a22833e267710f59351cb157098b21 SHA256 c065659242df3e921290ff044aee6f543c8b5cd2290db5bf668065cf97fcbbbe
-EBUILD python-2.4.6.ebuild 9054 RMD160 992a1a46f2fbfb55780373cd6d604ee97dc7f3f3 SHA1 f5b0bf9b40806399bd466b7560911bbcedff4f08 SHA256 e21b504079d60d070689337b2fc98fd551cba46fcebfcc393434990081dcef77
-EBUILD python-2.5.4-r3.ebuild 9478 RMD160 e70aece4a3f4ee06f76bb7ca0c0dc2d6d9748423 SHA1 14fc52c0a20f35727bc84869366d2e8de8e7a990 SHA256 5a43df39cfaefeeb64eab172445775f244e0fa0651d4005647be5102bef9f778
-EBUILD python-2.5.4-r4.ebuild 9426 RMD160 72600ee33168ce919ca5da247b2af65dd2504bef SHA1 58cbe321020e423beae18ba316a74e994f3b1410 SHA256 54f7c8c19d9cd8f17c8ca8bf61a8a9bff4799e0d71e01c3cfd0a24276c9e732e
-EBUILD python-2.6.4.ebuild 9666 RMD160 3c6140659eaee28025eaad86186e7d26c139cfc3 SHA1 ad23ad6cc6d9417c1b25352561a81a3ab50ffe18 SHA256 c621c01aeaf5fa54209cd024b21f801fcba4eb604270d06224eb7d58311f8268
-EBUILD python-3.1.1-r1.ebuild 9023 RMD160 dfa081cdae06c6b41462eab590ce0b696d31c01b SHA1 53c2a6f3d8314e47e8023197111d21eaaefa530b SHA256 6e425c7f6596ab0746f5f744a6c249a07e076c35e53d16b07b19c39146caf5c7
+EBUILD python-2.4.6.ebuild 9074 RMD160 392454809b097e2b1147e215b8362025372e6646 SHA1 6bd2a25c884b0b89a3712f4677384962188565c2 SHA256 ef212480e0680d062dc4d8831b9f31c3eab38af1b12dcdc550622817f926ad82
+EBUILD python-2.5.4-r3.ebuild 9498 RMD160 e9084a24ed2581bc874bb15c7385e113ad341417 SHA1 77f0801dfd423b799c8b2b90366675518befe3f1 SHA256 5eb13f16e03efb339b06f89e6f87fa07b42dc2673779fe231f65838285ab25c4
+EBUILD python-2.5.4-r4.ebuild 9446 RMD160 0135d54431c8702c06a0fc02dde40efb43004bd7 SHA1 52a4dd3d212c10e8bc7aee3037bad8fb74644d3c SHA256 fc0840cdb47b732401718226c3f9559a581ca3f913f09b7fbd59aa342dea911e
+EBUILD python-2.6.4.ebuild 9686 RMD160 fcd8849472e77828e014e8f6219f1895336a0ac2 SHA1 6c66b074aee887233da885f6e40c05fd7b832ed8 SHA256 32420ce8b0caa346a61c47cd118533a053a8628478daa7a187ab0a30f151d6a2
+EBUILD python-3.1.1-r1.ebuild 9043 RMD160 5b610938fe85f4481fad2a43d550fdb0d9535aea SHA1 6061a841d391a79f6c79c72bd91d1d03379026e6 SHA256 8ec6fe21e8ad2bec5ca57f71d9358cedc3b90d0a52002a49f361bb40d8a479bd
 MISC ChangeLog 77987 RMD160 254ed8f6fad8d2dc5c81f7f7528a4a83ed86eb71 SHA1 dbe91a8cf5a9cb6fc52ad39ad88789655dca6406 SHA256 2e984a747704c9560d927ebab46c8967e5c68dd228df1704e0e6f4ccbaaad0ee
 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908
diff --git a/dev-lang/python/python-2.4.6.ebuild b/dev-lang/python/python-2.4.6.ebuild
index f5c4fca909cf..3bfceebe40f1 100644
--- a/dev-lang/python/python-2.4.6.ebuild
+++ b/dev-lang/python/python-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.27 2010/01/12 13:58:31 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.28 2010/01/12 16:08:42 arfrever Exp $
 
 EAPI="1"
 
@@ -270,7 +270,7 @@ pkg_postinst() {
 	eselect_python_update
 
 	# Python 2.4 partially doesn't respect $(get_libdir).
-	python_mod_optimize -x "(site-packages|test)" /usr/lib/python${SLOT}
+	EPYTHON="$(PYTHON)" python_mod_optimize -x "(site-packages|test)" /usr/lib/python${SLOT}
 
 	if [[ "${python_updater_warning}" == "1" ]]; then
 		ewarn
diff --git a/dev-lang/python/python-2.5.4-r3.ebuild b/dev-lang/python/python-2.5.4-r3.ebuild
index 5d8ec8bea2ef..3f95c10c2b65 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-2010 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.29 2010/01/12 13:52:52 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r3.ebuild,v 1.30 2010/01/12 16:08:42 arfrever Exp $
 
 EAPI="1"
 
@@ -277,7 +277,7 @@ eselect_python_update() {
 pkg_postinst() {
 	eselect_python_update
 
-	python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
+	EPYTHON="$(PYTHON)" python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
 
 	if [[ "${python_updater_warning}" == "1" ]]; then
 		ewarn
diff --git a/dev-lang/python/python-2.5.4-r4.ebuild b/dev-lang/python/python-2.5.4-r4.ebuild
index d22d8147355a..aae54a03fd64 100644
--- a/dev-lang/python/python-2.5.4-r4.ebuild
+++ b/dev-lang/python/python-2.5.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-r4.ebuild,v 1.4 2010/01/12 13:58:31 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.5 2010/01/12 16:08:42 arfrever Exp $
 
 EAPI="1"
 
@@ -284,7 +284,7 @@ eselect_python_update() {
 pkg_postinst() {
 	eselect_python_update
 
-	python_mod_optimize -x "(site-packages|test)" $(python_get_libdir)
+	EPYTHON="$(PYTHON)" python_mod_optimize -x "(site-packages|test)" $(python_get_libdir)
 
 	if [[ "${python_updater_warning}" == "1" ]]; then
 		ewarn
diff --git a/dev-lang/python/python-2.6.4.ebuild b/dev-lang/python/python-2.6.4.ebuild
index ced5eedf33a8..ca2917d373f3 100644
--- a/dev-lang/python/python-2.6.4.ebuild
+++ b/dev-lang/python/python-2.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.4.ebuild,v 1.13 2010/01/12 13:58:31 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.4.ebuild,v 1.14 2010/01/12 16:08:42 arfrever Exp $
 
 EAPI="2"
 
@@ -286,7 +286,7 @@ eselect_python_update() {
 pkg_postinst() {
 	eselect_python_update
 
-	python_mod_optimize -x "(site-packages|test)" $(python_get_libdir)
+	EPYTHON="$(PYTHON)" python_mod_optimize -x "(site-packages|test)" $(python_get_libdir)
 
 	if [[ "${python_updater_warning}" == "1" ]]; then
 		ewarn
diff --git a/dev-lang/python/python-3.1.1-r1.ebuild b/dev-lang/python/python-3.1.1-r1.ebuild
index 9c7d04b2e015..19e623947c11 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-2010 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.25 2010/01/12 13:58:31 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.26 2010/01/12 16:08:42 arfrever Exp $
 
 EAPI="2"
 
@@ -263,7 +263,7 @@ eselect_python_update() {
 pkg_postinst() {
 	eselect_python_update
 
-	python_mod_optimize -x "(site-packages|test)" $(python_get_libdir)
+	EPYTHON="$(PYTHON)" python_mod_optimize -x "(site-packages|test)" $(python_get_libdir)
 
 	if [[ "$(eselect python show)" == "python2."* ]]; then
 		ewarn