python_mod_optimize is ROOT aware.

(Portage version: 2.1.5.2)

19 files changed, 76 insertions, 67 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index ec7903e64ae9..d604c851a6cf 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.321 2008/05/28 19:18:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.322 2008/05/29 16:06:26 hawking Exp $
+
+  29 May 2008; Ali Polatel <hawking@gentoo.org> python-2.3.5-r2.ebuild,
+  python-2.3.5-r3.ebuild, python-2.3.6.ebuild, python-2.3.6-r3.ebuild,
+  python-2.3.6-r4.ebuild, python-2.3.6-r5.ebuild, python-2.3.6-r6.ebuild,
+  python-2.4.4-r5.ebuild, python-2.4.4-r6.ebuild, python-2.4.4-r9.ebuild,
+  python-2.4.4-r10.ebuild, python-2.4.4-r11.ebuild, python-2.4.4-r12.ebuild,
+  python-2.4.4-r13.ebuild, python-2.5.2-r1.ebuild, python-2.5.2-r2.ebuild,
+  python-2.5.2-r3.ebuild, python-2.5.2-r4.ebuild:
+  python_mod_optimize is ROOT aware.
 
   28 May 2008; Markus Meier <maekke@gentoo.org> python-2.3.6-r6.ebuild,
   python-2.4.4-r13.ebuild:
diff --git a/dev-lang/python/python-2.3.5-r2.ebuild b/dev-lang/python/python-2.3.5-r2.ebuild
index bf4b09f015e0..b95a0ee53680 100644
--- a/dev-lang/python/python-2.3.5-r2.ebuild
+++ b/dev-lang/python/python-2.3.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5-r2.ebuild,v 1.20 2008/04/18 22:23:25 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5-r2.ebuild,v 1.21 2008/05/29 16:06:26 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -189,7 +189,7 @@ pkg_postinst() {
 
 	python_makesym
 	python_mod_optimize
-	python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/python${PYVER}
+	python_mod_optimize -x site-packages -x test /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
@@ -197,7 +197,7 @@ pkg_postinst() {
 			einfo "Working around possible python-portage upgrade breakage"
 			mkdir -p ${myroot}/usr/lib/portage/pym
 			cp ${myroot}/usr/lib/python2.2/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
+			python_mod_optimize /usr/lib/portage/pym
 		fi
 	fi
 
diff --git a/dev-lang/python/python-2.3.5-r3.ebuild b/dev-lang/python/python-2.3.5-r3.ebuild
index 312e8bd21c43..1910dc4b21e5 100644
--- a/dev-lang/python/python-2.3.5-r3.ebuild
+++ b/dev-lang/python/python-2.3.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5-r3.ebuild,v 1.16 2008/04/18 22:23:25 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5-r3.ebuild,v 1.17 2008/05/29 16:06:26 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -191,7 +191,7 @@ pkg_postinst() {
 
 	python_makesym
 	python_mod_optimize
-	python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/python${PYVER}
+	python_mod_optimize -x site-packages -x test /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
@@ -199,7 +199,7 @@ pkg_postinst() {
 			einfo "Working around possible python-portage upgrade breakage"
 			mkdir -p ${myroot}/usr/lib/portage/pym
 			cp ${myroot}/usr/lib/python2.2/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
+			python_mod_optimize /usr/lib/portage/pym
 		fi
 	fi
 
diff --git a/dev-lang/python/python-2.3.6-r3.ebuild b/dev-lang/python/python-2.3.6-r3.ebuild
index 8ca011246e5a..02ad5094643b 100644
--- a/dev-lang/python/python-2.3.6-r3.ebuild
+++ b/dev-lang/python/python-2.3.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.6-r3.ebuild,v 1.10 2008/04/18 22:23:25 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.6-r3.ebuild,v 1.11 2008/05/29 16:06:26 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -187,7 +187,7 @@ pkg_postinst() {
 
 	python_makesym
 	python_mod_optimize
-	python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/python${PYVER}
+	python_mod_optimize -x site-packages -x test /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
@@ -195,7 +195,7 @@ pkg_postinst() {
 			einfo "Working around possible python-portage upgrade breakage"
 			mkdir -p ${myroot}/usr/lib/portage/pym
 			cp ${myroot}/usr/lib/python2.2/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
+			python_mod_optimize /usr/lib/portage/pym
 		fi
 	fi
 
diff --git a/dev-lang/python/python-2.3.6-r4.ebuild b/dev-lang/python/python-2.3.6-r4.ebuild
index 7614f1aef8b4..83aa16d7d728 100644
--- a/dev-lang/python/python-2.3.6-r4.ebuild
+++ b/dev-lang/python/python-2.3.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.6-r4.ebuild,v 1.7 2008/01/25 20:05:09 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.6-r4.ebuild,v 1.8 2008/05/29 16:06:26 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -191,7 +191,7 @@ pkg_postinst() {
 
 	python_makesym
 	python_mod_optimize
-	python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/python${PYVER}
+	python_mod_optimize -x site-packages -x test /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
@@ -199,7 +199,7 @@ pkg_postinst() {
 			einfo "Working around possible python-portage upgrade breakage"
 			mkdir -p ${myroot}/usr/lib/portage/pym
 			cp ${myroot}/usr/lib/python2.2/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
+			python_mod_optimize /usr/lib/portage/pym
 		fi
 	fi
 
diff --git a/dev-lang/python/python-2.3.6-r5.ebuild b/dev-lang/python/python-2.3.6-r5.ebuild
index 0ace3b89891e..400ab496aaab 100644
--- a/dev-lang/python/python-2.3.6-r5.ebuild
+++ b/dev-lang/python/python-2.3.6-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.6-r5.ebuild,v 1.1 2008/04/18 14:26:25 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.6-r5.ebuild,v 1.2 2008/05/29 16:06:26 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -193,7 +193,7 @@ pkg_postinst() {
 
 	python_makesym
 	python_mod_optimize
-	python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/python${PYVER}
+	python_mod_optimize -x site-packages -x test /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
@@ -201,7 +201,7 @@ pkg_postinst() {
 			einfo "Working around possible python-portage upgrade breakage"
 			mkdir -p ${myroot}/usr/lib/portage/pym
 			cp ${myroot}/usr/lib/python2.2/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
+			python_mod_optimize /usr/lib/portage/pym
 		fi
 	fi
 
diff --git a/dev-lang/python/python-2.3.6-r6.ebuild b/dev-lang/python/python-2.3.6-r6.ebuild
index b4de3b382df2..9811b01f29f6 100644
--- a/dev-lang/python/python-2.3.6-r6.ebuild
+++ b/dev-lang/python/python-2.3.6-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.6-r6.ebuild,v 1.10 2008/05/28 19:18:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.6-r6.ebuild,v 1.11 2008/05/29 16:06:26 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -194,7 +194,7 @@ pkg_postinst() {
 
 	python_makesym
 	python_mod_optimize
-	python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/python${PYVER}
+	python_mod_optimize -x site-packages -x test /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
@@ -202,7 +202,7 @@ pkg_postinst() {
 			einfo "Working around possible python-portage upgrade breakage"
 			mkdir -p ${myroot}/usr/lib/portage/pym
 			cp ${myroot}/usr/lib/python2.2/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
+			python_mod_optimize /usr/lib/portage/pym
 		fi
 	fi
 
diff --git a/dev-lang/python/python-2.3.6.ebuild b/dev-lang/python/python-2.3.6.ebuild
index 553a3515b376..f6a85236aba6 100644
--- a/dev-lang/python/python-2.3.6.ebuild
+++ b/dev-lang/python/python-2.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.6.ebuild,v 1.8 2008/04/18 22:23:25 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.6.ebuild,v 1.9 2008/05/29 16:06:26 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -191,7 +191,7 @@ pkg_postinst() {
 
 	python_makesym
 	python_mod_optimize
-	python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/python${PYVER}
+	python_mod_optimize -x site-packages -x test /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
@@ -199,7 +199,7 @@ pkg_postinst() {
 			einfo "Working around possible python-portage upgrade breakage"
 			mkdir -p ${myroot}/usr/lib/portage/pym
 			cp ${myroot}/usr/lib/python2.2/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
+			python_mod_optimize /usr/lib/portage/pym
 		fi
 	fi
 
diff --git a/dev-lang/python/python-2.4.4-r10.ebuild b/dev-lang/python/python-2.4.4-r10.ebuild
index 322011d462fb..8eda1703f45c 100644
--- a/dev-lang/python/python-2.4.4-r10.ebuild
+++ b/dev-lang/python/python-2.4.4-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r10.ebuild,v 1.1 2008/04/18 14:26:25 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r10.ebuild,v 1.2 2008/05/29 16:06:26 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -262,10 +262,10 @@ pkg_postinst() {
 
 	python_mod_optimize
 	python_mod_optimize -x site-packages \
-						-x test ${myroot}/usr/lib/python${PYVER}
+						-x test /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
 		python_mod_optimize -x site-packages \
-							-x test ${myroot}/usr/$(get_libdir)/python${PYVER}
+							-x test /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
@@ -273,7 +273,7 @@ pkg_postinst() {
 			einfo "Working around possible python-portage upgrade breakage"
 			mkdir -p ${myroot}/usr/lib/portage/pym
 			cp ${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
+			python_mod_optimize /usr/lib/portage/pym
 		fi
 	fi
 
diff --git a/dev-lang/python/python-2.4.4-r11.ebuild b/dev-lang/python/python-2.4.4-r11.ebuild
index 366cdcb42a67..9037576c192c 100644
--- a/dev-lang/python/python-2.4.4-r11.ebuild
+++ b/dev-lang/python/python-2.4.4-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r11.ebuild,v 1.1 2008/04/19 14:43:44 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r11.ebuild,v 1.2 2008/05/29 16:06:26 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -262,10 +262,10 @@ pkg_postinst() {
 
 	python_mod_optimize
 	python_mod_optimize -x site-packages \
-						-x test ${myroot}/usr/lib/python${PYVER}
+						-x test /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
 		python_mod_optimize -x site-packages \
-							-x test ${myroot}/usr/$(get_libdir)/python${PYVER}
+							-x test /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
@@ -273,7 +273,7 @@ pkg_postinst() {
 			einfo "Working around possible python-portage upgrade breakage"
 			mkdir -p ${myroot}/usr/lib/portage/pym
 			cp ${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
+			python_mod_optimize /usr/lib/portage/pym
 		fi
 	fi
 
diff --git a/dev-lang/python/python-2.4.4-r12.ebuild b/dev-lang/python/python-2.4.4-r12.ebuild
index 7e59c505b863..03657c5b02c8 100644
--- a/dev-lang/python/python-2.4.4-r12.ebuild
+++ b/dev-lang/python/python-2.4.4-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r12.ebuild,v 1.2 2008/05/13 17:01:24 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r12.ebuild,v 1.3 2008/05/29 16:06:26 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -255,10 +255,10 @@ pkg_postinst() {
 
 	python_mod_optimize
 	python_mod_optimize -x site-packages \
-						-x test ${myroot}/usr/lib/python${PYVER}
+						-x test /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
 		python_mod_optimize -x site-packages \
-							-x test ${myroot}/usr/$(get_libdir)/python${PYVER}
+							-x test /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
@@ -266,7 +266,7 @@ pkg_postinst() {
 			einfo "Working around possible python-portage upgrade breakage"
 			mkdir -p ${myroot}/usr/lib/portage/pym
 			cp ${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
+			python_mod_optimize /usr/lib/portage/pym
 		fi
 	fi
 
diff --git a/dev-lang/python/python-2.4.4-r13.ebuild b/dev-lang/python/python-2.4.4-r13.ebuild
index 85e96c0b11a5..878bddaa8b54 100644
--- a/dev-lang/python/python-2.4.4-r13.ebuild
+++ b/dev-lang/python/python-2.4.4-r13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r13.ebuild,v 1.8 2008/05/28 19:18:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r13.ebuild,v 1.9 2008/05/29 16:06:26 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -255,10 +255,10 @@ pkg_postinst() {
 
 	python_mod_optimize
 	python_mod_optimize -x site-packages \
-						-x test ${myroot}/usr/lib/python${PYVER}
+						-x test /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
 		python_mod_optimize -x site-packages \
-							-x test ${myroot}/usr/$(get_libdir)/python${PYVER}
+							-x test /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
@@ -266,7 +266,7 @@ pkg_postinst() {
 			einfo "Working around possible python-portage upgrade breakage"
 			mkdir -p ${myroot}/usr/lib/portage/pym
 			cp ${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
+			python_mod_optimize /usr/lib/portage/pym
 		fi
 	fi
 
diff --git a/dev-lang/python/python-2.4.4-r5.ebuild b/dev-lang/python/python-2.4.4-r5.ebuild
index 3279e96f6429..25da26292b85 100644
--- a/dev-lang/python/python-2.4.4-r5.ebuild
+++ b/dev-lang/python/python-2.4.4-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r5.ebuild,v 1.18 2008/04/18 22:23:25 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r5.ebuild,v 1.19 2008/05/29 16:06:26 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -247,10 +247,10 @@ pkg_postinst() {
 
 	python_mod_optimize
 	python_mod_optimize -x site-packages \
-						-x test ${myroot}/usr/lib/python${PYVER}
+						-x test /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
 		python_mod_optimize -x site-packages \
-							-x test ${myroot}/usr/$(get_libdir)/python${PYVER}
+							-x test /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
@@ -258,7 +258,7 @@ pkg_postinst() {
 			einfo "Working around possible python-portage upgrade breakage"
 			mkdir -p ${myroot}/usr/lib/portage/pym
 			cp ${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
+			python_mod_optimize /usr/lib/portage/pym
 		fi
 	fi
 
diff --git a/dev-lang/python/python-2.4.4-r6.ebuild b/dev-lang/python/python-2.4.4-r6.ebuild
index 8b931fb92d5f..fadf90c70f89 100644
--- a/dev-lang/python/python-2.4.4-r6.ebuild
+++ b/dev-lang/python/python-2.4.4-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r6.ebuild,v 1.10 2007/11/03 16:57:26 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r6.ebuild,v 1.11 2008/05/29 16:06:26 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -247,10 +247,10 @@ pkg_postinst() {
 
 	python_mod_optimize
 	python_mod_optimize -x site-packages \
-						-x test ${myroot}/usr/lib/python${PYVER}
+						-x test /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
 		python_mod_optimize -x site-packages \
-							-x test ${myroot}/usr/$(get_libdir)/python${PYVER}
+							-x test /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
@@ -258,7 +258,7 @@ pkg_postinst() {
 			einfo "Working around possible python-portage upgrade breakage"
 			mkdir -p ${myroot}/usr/lib/portage/pym
 			cp ${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
+			python_mod_optimize /usr/lib/portage/pym
 		fi
 	fi
 
diff --git a/dev-lang/python/python-2.4.4-r9.ebuild b/dev-lang/python/python-2.4.4-r9.ebuild
index bf06d6ffb244..1e4bc5b2aa4b 100644
--- a/dev-lang/python/python-2.4.4-r9.ebuild
+++ b/dev-lang/python/python-2.4.4-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r9.ebuild,v 1.8 2008/03/11 16:01:07 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r9.ebuild,v 1.9 2008/05/29 16:06:26 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -260,10 +260,10 @@ pkg_postinst() {
 
 	python_mod_optimize
 	python_mod_optimize -x site-packages \
-						-x test ${myroot}/usr/lib/python${PYVER}
+						-x test /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
 		python_mod_optimize -x site-packages \
-							-x test ${myroot}/usr/$(get_libdir)/python${PYVER}
+							-x test /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
@@ -271,7 +271,7 @@ pkg_postinst() {
 			einfo "Working around possible python-portage upgrade breakage"
 			mkdir -p ${myroot}/usr/lib/portage/pym
 			cp ${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
+			python_mod_optimize /usr/lib/portage/pym
 		fi
 	fi
 
diff --git a/dev-lang/python/python-2.5.2-r1.ebuild b/dev-lang/python/python-2.5.2-r1.ebuild
index 8a4bc318a5d0..66213a1f3655 100644
--- a/dev-lang/python/python-2.5.2-r1.ebuild
+++ b/dev-lang/python/python-2.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r1.ebuild,v 1.1 2008/04/18 22:23:25 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r1.ebuild,v 1.2 2008/05/29 16:06:26 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -263,10 +263,10 @@ pkg_postinst() {
 
 	python_mod_optimize
 	python_mod_optimize -x site-packages \
-						-x test ${myroot}/usr/lib/python${PYVER}
+						-x test /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
 		python_mod_optimize -x site-packages \
-							-x test ${myroot}/usr/$(get_libdir)/python${PYVER}
+							-x test /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
@@ -274,7 +274,7 @@ pkg_postinst() {
 			einfo "Working around possible python-portage upgrade breakage"
 			mkdir -p ${myroot}/usr/lib/portage/pym
 			cp ${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
+			python_mod_optimize /usr/lib/portage/pym
 		fi
 	fi
 
diff --git a/dev-lang/python/python-2.5.2-r2.ebuild b/dev-lang/python/python-2.5.2-r2.ebuild
index eb600436efe3..df07f8c53453 100644
--- a/dev-lang/python/python-2.5.2-r2.ebuild
+++ b/dev-lang/python/python-2.5.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r2.ebuild,v 1.1 2008/04/19 14:43:44 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r2.ebuild,v 1.2 2008/05/29 16:06:26 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -263,10 +263,10 @@ pkg_postinst() {
 
 	python_mod_optimize
 	python_mod_optimize -x site-packages \
-						-x test ${myroot}/usr/lib/python${PYVER}
+						-x test /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
 		python_mod_optimize -x site-packages \
-							-x test ${myroot}/usr/$(get_libdir)/python${PYVER}
+							-x test /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
@@ -274,7 +274,7 @@ pkg_postinst() {
 			einfo "Working around possible python-portage upgrade breakage"
 			mkdir -p ${myroot}/usr/lib/portage/pym
 			cp ${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
+			python_mod_optimize /usr/lib/portage/pym
 		fi
 	fi
 
diff --git a/dev-lang/python/python-2.5.2-r3.ebuild b/dev-lang/python/python-2.5.2-r3.ebuild
index 6665b242f8cb..735ea81747eb 100644
--- a/dev-lang/python/python-2.5.2-r3.ebuild
+++ b/dev-lang/python/python-2.5.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r3.ebuild,v 1.2 2008/05/13 17:01:24 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r3.ebuild,v 1.3 2008/05/29 16:06:26 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -255,10 +255,10 @@ pkg_postinst() {
 
 	python_mod_optimize
 	python_mod_optimize -x site-packages \
-						-x test ${myroot}/usr/lib/python${PYVER}
+						-x test /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
 		python_mod_optimize -x site-packages \
-							-x test ${myroot}/usr/$(get_libdir)/python${PYVER}
+							-x test /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
@@ -266,7 +266,7 @@ pkg_postinst() {
 			einfo "Working around possible python-portage upgrade breakage"
 			mkdir -p ${myroot}/usr/lib/portage/pym
 			cp ${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
+			python_mod_optimize /usr/lib/portage/pym
 		fi
 	fi
 
diff --git a/dev-lang/python/python-2.5.2-r4.ebuild b/dev-lang/python/python-2.5.2-r4.ebuild
index b0398b8a713a..3f7c53dc61ac 100644
--- a/dev-lang/python/python-2.5.2-r4.ebuild
+++ b/dev-lang/python/python-2.5.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r4.ebuild,v 1.2 2008/05/25 13:06:30 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r4.ebuild,v 1.3 2008/05/29 16:06:26 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -255,10 +255,10 @@ pkg_postinst() {
 
 	python_mod_optimize
 	python_mod_optimize -x site-packages \
-						-x test ${myroot}/usr/lib/python${PYVER}
+						-x test /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
 		python_mod_optimize -x site-packages \
-							-x test ${myroot}/usr/$(get_libdir)/python${PYVER}
+							-x test /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
@@ -266,7 +266,7 @@ pkg_postinst() {
 			einfo "Working around possible python-portage upgrade breakage"
 			mkdir -p ${myroot}/usr/lib/portage/pym
 			cp ${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
-			python_mod_optimize ${myroot}/usr/lib/portage/pym
+			python_mod_optimize /usr/lib/portage/pym
 		fi
 	fi