Fix -x option passed to python_mod_optimize, thanks to Remy Blank, #224137.

Package-Manager: portage-2.1.5.2

20 files changed, 96 insertions, 86 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index d604c851a6cf..ed7d0ff63fbe 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,16 @@
 # 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.322 2008/05/29 16:06:26 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.323 2008/05/29 21:29:02 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:
+  Fix -x option passed to python_mod_optimize, thanks to Remy Blank,
+  #224137.
 
   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,
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 91652f30c66d..33988cf1fb6a 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -37,30 +37,30 @@ DIST python-gentoo-patches-2.5.2-r1.tar.bz2 18757 RMD160 b60ba39f9cf4105f8463b7c
 DIST python-gentoo-patches-2.5.2-r2.tar.bz2 18750 RMD160 54ffb30d4abb89e56cbb3fff909ce854aa44acef SHA1 7405a3d0ab53718a54f0be73ebe15b3ecd99fc70 SHA256 ef369062e5d912b46011dc2cdb8bbed28f83de93fd7caa9627f29e8c70c12e35
 DIST python-gentoo-patches-2.5.2-r3.tar.bz2 19590 RMD160 ccf550823d46dd693b885ac024c149a14ad1e0fa SHA1 3ece5d3868b01fc9081fb11159c5d1a5df22a6ae SHA256 65324ae114dba2bf1f5b2431991941066f2261178d16bb0e38147596a908e4f2
 DIST python-gentoo-patches-2.5.2-r4.tar.bz2 18882 RMD160 d00642fbbe79e240691ae4cd890cfe3125ed0a83 SHA1 02ef298a66441970ff3ed1d404cb209b9d7eda51 SHA256 1ec58c22240f2a2e591f00b852520d4b8e8a5821a5c8eac982a84189da0b65c2
-EBUILD python-2.3.5-r2.ebuild 8060 RMD160 32e5cf8d2c59c2cd4c5b1669c4bf05b52a40d08a SHA1 ec7271d29e35c96d478602bf950510de305f5493 SHA256 e90bdeffe3ab5dac67c235756a4456a0656023f20c5951e06484eed8230d97cd
-EBUILD python-2.3.5-r3.ebuild 8118 RMD160 3633d7a0f4a4b8f9d6233486b7eeb470100b3c2c SHA1 2d55ebdb0acf6c6827eed817351eb85460debc81 SHA256 5fc6495559fec7833f5caf3d496e27bdcb630d6cdf8ca1d1cfb127229eafaa3f
-EBUILD python-2.3.6-r3.ebuild 7602 RMD160 30083fdde0f57035124057e1e1241e03f800f9c1 SHA1 80d078a9b41aac6e7f55e79a0ffb0e53d3287b20 SHA256 190b5d8a3a78c9aa00cf3fdc6a569d6962056d956a5fc009974d19a66dfe350a
-EBUILD python-2.3.6-r4.ebuild 7788 RMD160 b2a6aa0bad758a607dab34f13c833c9c301ebc42 SHA1 1488499fc5dd37613991966fcfc0e8d49e73da08 SHA256 f90c8cd40c3bee3c5388c6fcff6b02c4f9f68142c436a6828ea68ab60838afdf
-EBUILD python-2.3.6-r5.ebuild 7794 RMD160 63a09c6ceb6379299881445b840d61098eaa5567 SHA1 97d3a5edb68a09f3c2d4dbe3d418b43b80ce55a3 SHA256 94f2023fd6d73cccb64181ea475f3cf8a70dc2efff17cbce241cb882d6991612
-EBUILD python-2.3.6-r6.ebuild 7954 RMD160 5c3291633a24570140f92abe26cfdfd7ee848c92 SHA1 baf1207e580c98740ba3ab426ef02b9cce5611ec SHA256 032304a6ebea00582b04cfeb101fc5993cecc02a41896909f7560770323bf1d4
-EBUILD python-2.3.6.ebuild 8162 RMD160 7f50474f8e9a0ab25bc67f525db2f64303acc343 SHA1 47a41af04e8065c9a6d41cc2850718dbcbf4a83a SHA256 af024dc4185f511da2ab8c7b8ff8c819b11cd1f8d87a572cad929a8ff11d743b
-EBUILD python-2.4.4-r10.ebuild 10836 RMD160 985e4c4faf46a01ab45d2ab1a09233e8f361ee59 SHA1 aace92830a85921a5b985f74ce68671de9b3dbe5 SHA256 e213e3c504a080a9625b074dc98de19d554573724f43c342eb0da500c05a9232
-EBUILD python-2.4.4-r11.ebuild 10836 RMD160 67be8de036e58a8e7b19f4d2c7e308184a451be6 SHA1 341e20781be2a04297ba7227797710db11bb3921 SHA256 da80ddd4339dcec798d083e28aea38ed272599153dcafcd60adf27d8d2ae4362
-EBUILD python-2.4.4-r12.ebuild 10412 RMD160 5178a1bfb0359c1fc916f806671de2bc0d002896 SHA1 4661b3c14a90a958dfb6f6d0d6e8f5fab67bd53b SHA256 41ec9183e415abb56ca40dcfaba1073b6e03d288074378dffc182e688c389337
-EBUILD python-2.4.4-r13.ebuild 10532 RMD160 dc0245f62a3c6320be407e43f6ec16c78cd4a191 SHA1 a55ebe2522630cedd8b8c462697689ba35d9955b SHA256 d07699974fd2f53b5f52f0aa9668eeff30f7742522caadf52de16ef35f0d8706
-EBUILD python-2.4.4-r5.ebuild 10351 RMD160 db93b83746e19a6e25ab607677d64b32de988918 SHA1 88259255eab7bbab15359b7af8d37060d376d2fb SHA256 4e4e660f24e44f174a42d7a273f5a0af8528443d5faad18197c826e8d47a019b
-EBUILD python-2.4.4-r6.ebuild 10352 RMD160 efbd5b57daf76211cecb96e7547929be83780471 SHA1 8be7313c0060bc94cc24508925d10b3e04439344 SHA256 54ab2e90cff794fadfa3ce1d55083de34fcff42090afde5efc39ad9fcbcefd07
-EBUILD python-2.4.4-r9.ebuild 10797 RMD160 d9c46dbe9a889f08412407188311a5f4a48c3f3c SHA1 f5f0ed60a627310a668edcbbdbd8fc30198c5e14 SHA256 a0c07fad789da61f2f72e728e7d6adc01c4e32b7313016bdfba976cd612845da
-EBUILD python-2.5.2-r1.ebuild 10772 RMD160 6ab96f50d3a7deff66c6c2115c9d0d077a14b8f5 SHA1 266629e9dbcae4bf8873cd04ee6f3f7972832dc2 SHA256 fffa6a30a8f956e7aab6c7f76654bc0231904b8e3299fe1173bdbc179addcf92
-EBUILD python-2.5.2-r2.ebuild 10772 RMD160 edd61fd1e63c6e57a67e7a79512e316741a8f9e2 SHA1 efd75ea7f5cdd70b5b8f9ec44b431e80ba42068b SHA256 c92a1e857deafdadc86e5c16d4edf8841c2b88d6f9d98a6fccd5147262761fe4
-EBUILD python-2.5.2-r3.ebuild 10317 RMD160 a7bb9deabaf6ff57335932fe6bd135499abd62f2 SHA1 8aaaeb403e4833651a771e0aa2d6b73c7987be3b SHA256 08f2edb82d2dda0263b63ac6443c956a8b9b1e26b6807deae78ced4a42a3d036
-EBUILD python-2.5.2-r4.ebuild 10444 RMD160 10d6f5eabf460acf4e8941d9ff812c3400e2da7c SHA1 14ce3849b4191bdcf34a3a3e5157354808319a6a SHA256 61a37d8ef8c0163290f911718ec7ddd7c76fc5c4016ff54a659588d2c2350290
-MISC ChangeLog 56715 RMD160 f5da5fb1fc2471d3c60d554080853d1cf0d0f8b5 SHA1 1ee7dbdfa1905753a8c103fe8864c3463116a4f2 SHA256 4538577f6799b49e3a8780072e339908aa3f649d2543b568c2e1b590388b8ed3
+EBUILD python-2.3.5-r2.ebuild 8061 RMD160 acf517bdbf123794b14deb3ee3b31aad3a8087e5 SHA1 3828e01a5a133005ea0952bca6a0a8b56a91f07d SHA256 cb8d3bb7cb2ddeea916e945d3dca985ceaab66d654523dab0a96a93396ddc67a
+EBUILD python-2.3.5-r3.ebuild 8119 RMD160 9e85d5759d06f33810d3c9f044b787742381be28 SHA1 719f6316d24a8ff41a01664ab772bc2ab53b17c2 SHA256 5d76928f6db17de76535e98deb9edf0354601ac4e0ae2fcd64cdf2a2e0a42188
+EBUILD python-2.3.6-r3.ebuild 7603 RMD160 fed52d6d5c4500173717e09be17bb010c90c6f7a SHA1 d5c4fa22ccfe9b41dca0c254134cd5fb1b000c56 SHA256 4a1170ec4b62eadb182824ddd78316991394d6fd0619e48141bcf3bf68685cc2
+EBUILD python-2.3.6-r4.ebuild 7789 RMD160 d354d206a7461eb30f14ff8a002dd035ac5f7284 SHA1 b7c65d6c0e6c119ed4af58fb81f833175e2e54f4 SHA256 56807a17202c60b37809f63c3b59c8f71fae32b499e9599c15880f5bd5fee1f9
+EBUILD python-2.3.6-r5.ebuild 7795 RMD160 7d217db95c6980a1909074cbb8342a56c6b74d48 SHA1 1eb87ad38c6de8c3b415fe5658ac541b58f1e5ad SHA256 b2ba44665b1351ec1a3f8d3a3565642d109450452db60988817520b0550f0408
+EBUILD python-2.3.6-r6.ebuild 7955 RMD160 bc401bc43838c44e51f6ceb70a3112be2fe9f7bd SHA1 a019cbd9d53d8c4941c4a641301dc04083d956a8 SHA256 d5409cd2d89c6e14ca5d2de7e5eb8590b17c7a77241967ba51d8824ed728a03e
+EBUILD python-2.3.6.ebuild 8164 RMD160 acda677d82daf3458567c315bc0e9681d65fb271 SHA1 c9043a343addae774686791cbdca401d35ddab62 SHA256 d3cad7bac5d3ac4797489483c0914a49c1b022e5e4af9133eee80cf1df4e0736
+EBUILD python-2.4.4-r10.ebuild 10837 RMD160 d95ce7d6cbb3510f89cb1c854c6d56d3b13f0857 SHA1 fdb542700c6b0cf49ae6de05577cb6a10f98b630 SHA256 556aa7f7b726f620f64e7c7f1cfe385e357af58e6780a847fa9bea6f4e32874f
+EBUILD python-2.4.4-r11.ebuild 10838 RMD160 d34b45ea31f428b352d6f303fa33fa0ca5207072 SHA1 09d0ebcfcb9e969e0c4efb17eb5efa043b44dc47 SHA256 350ce9d4e39ecd0589a7b877acedf48a5e4971b4da089714f6ae5cbdcf18fd3d
+EBUILD python-2.4.4-r12.ebuild 10413 RMD160 c7bc342673b48ccdb48d22ee482f45c2487df939 SHA1 31115d721f8b643f15f648ad5770b9d194f352f9 SHA256 9208c99988b0e5196fb579cf90d3aa42ebe10d3bbb0f673ac0ea83964aac1a60
+EBUILD python-2.4.4-r13.ebuild 10535 RMD160 9e20a3b3209dd4a5be03690524b1d6364a9cd65d SHA1 b516fdf878bd8ba3bde7d9aaaee382add4b83cd7 SHA256 fb5baf2769c426142c342b8b0c1c558db855cbc22914e58e01207d884e1bd781
+EBUILD python-2.4.4-r5.ebuild 10353 RMD160 2e84fa53221be1417bcbfac063fadb8177f7997f SHA1 457badd502adf3e2e82454dde04902e9f930829e SHA256 c2fd3fb136d0855ebf4e92fec8487770b4d1ee1c1f9a93c7a59e012487d45ea4
+EBUILD python-2.4.4-r6.ebuild 10354 RMD160 4237041263cf6516bb1d62b070d92d47dc53fd87 SHA1 392f2af04382fe8db2ea674d54f40a3e5703c48d SHA256 dfae0111133299b0ad1665aeeb9d1b59ef72ad0ba38c1242b600cf709cbea9b6
+EBUILD python-2.4.4-r9.ebuild 10800 RMD160 a4e5b74f5210230c4f59466b8f26f80ae379faab SHA1 e7303a529eb44d1c7728e556a5b62a0346091271 SHA256 8037a8f216ebc1e748733fbae69fb35967c1614f57a2e59b66108c196717fe56
+EBUILD python-2.5.2-r1.ebuild 10773 RMD160 230a44f1618ab6b7555953a97cec21099e1af4a3 SHA1 290c6a5ea542ab007672f7f1adc39238b8c13889 SHA256 b9d1bdf3c7f3125167ac6b84de5ba3700d655b1a0707867800dd0451c5e49b34
+EBUILD python-2.5.2-r2.ebuild 10774 RMD160 e2126e08e9b040827e89454b085fa3009927f5bd SHA1 20c981141be5de2b986f8a4581a4496002fa0ffb SHA256 ccd18da3bbe633491045cc5e8380da2286d3e6c2274a7934baff3b3a6c6ae58b
+EBUILD python-2.5.2-r3.ebuild 10319 RMD160 174afea7ff01f160d21f246b962665a54ca5934f SHA1 cafafef2b0d0a44918b09de94dd5828edc37e8fb SHA256 05822cf27d83fd6966c2a76c71491fbecb8979de32192553c9d2e450d266e0e8
+EBUILD python-2.5.2-r4.ebuild 10446 RMD160 4e110248b8f6062f27edfdcc7db0e3cd2cab7ffd SHA1 588b9c410b3912cefad0f96f9383c5eca746a02b SHA256 d7852dd4bf47bbb5149c0b74f215bd6d19e0e5e9c777c9ffdfa05fd9bb226f9a
+MISC ChangeLog 57289 RMD160 cee004dd4f2e6ba5862d9742fc85dd8fd269cfb7 SHA1 65e5ad9ecc505c78d887ad41d7731a41884f3924 SHA256 a27f8cbe9916213fd8dbeff1491c4dc38fd5ffa626692211605c4a108b839f71
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg+1IsACgkQQU4yORhF8iDLHACgm1KbBjavN1CuFi2jNMqRd5X8
-FpgAmwWdHOJ1g/5qni9NjUxESYTmFsKF
-=jl6q
+iEYEARECAAYFAkg/ICUACgkQQU4yORhF8iBbEgCgoeLCzSxC19fPY5DNXSqWnsCB
+sGUAoLGVxG0OTerXYm873Rh7ied5XKHr
+=BViL
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.3.5-r2.ebuild b/dev-lang/python/python-2.3.5-r2.ebuild
index b95a0ee53680..03151bec9052 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.21 2008/05/29 16:06:26 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5-r2.ebuild,v 1.22 2008/05/29 21:29:02 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 /usr/$(get_libdir)/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
diff --git a/dev-lang/python/python-2.3.5-r3.ebuild b/dev-lang/python/python-2.3.5-r3.ebuild
index 1910dc4b21e5..ecb5e972467d 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.17 2008/05/29 16:06:26 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5-r3.ebuild,v 1.18 2008/05/29 21:29:02 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 /usr/$(get_libdir)/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
diff --git a/dev-lang/python/python-2.3.6-r3.ebuild b/dev-lang/python/python-2.3.6-r3.ebuild
index 02ad5094643b..22c92930769c 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.11 2008/05/29 16:06:26 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.6-r3.ebuild,v 1.12 2008/05/29 21:29:02 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 /usr/$(get_libdir)/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
diff --git a/dev-lang/python/python-2.3.6-r4.ebuild b/dev-lang/python/python-2.3.6-r4.ebuild
index 83aa16d7d728..878a1ea35e52 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.8 2008/05/29 16:06:26 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.6-r4.ebuild,v 1.9 2008/05/29 21:29:02 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 /usr/$(get_libdir)/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
diff --git a/dev-lang/python/python-2.3.6-r5.ebuild b/dev-lang/python/python-2.3.6-r5.ebuild
index 400ab496aaab..ba0aa44e19ec 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.2 2008/05/29 16:06:26 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.6-r5.ebuild,v 1.3 2008/05/29 21:29:02 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 /usr/$(get_libdir)/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
diff --git a/dev-lang/python/python-2.3.6-r6.ebuild b/dev-lang/python/python-2.3.6-r6.ebuild
index 9811b01f29f6..3551415e653f 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.11 2008/05/29 16:06:26 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.6-r6.ebuild,v 1.12 2008/05/29 21:29:02 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 /usr/$(get_libdir)/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
diff --git a/dev-lang/python/python-2.3.6.ebuild b/dev-lang/python/python-2.3.6.ebuild
index f6a85236aba6..d8058d31dadd 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.9 2008/05/29 16:06:26 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.6.ebuild,v 1.10 2008/05/29 21:29:02 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 /usr/$(get_libdir)/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
diff --git a/dev-lang/python/python-2.4.4-r10.ebuild b/dev-lang/python/python-2.4.4-r10.ebuild
index 8eda1703f45c..11f12ace33e9 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.2 2008/05/29 16:06:26 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r10.ebuild,v 1.3 2008/05/29 21:29:02 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -264,8 +264,8 @@ pkg_postinst() {
 	python_mod_optimize -x site-packages \
 						-x test /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
-		python_mod_optimize -x site-packages \
-							-x test /usr/$(get_libdir)/python${PYVER}
+		python_mod_optimize -x "(site-packages|test)" \
+							/usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
diff --git a/dev-lang/python/python-2.4.4-r11.ebuild b/dev-lang/python/python-2.4.4-r11.ebuild
index 9037576c192c..497a1ca87f55 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.2 2008/05/29 16:06:26 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r11.ebuild,v 1.3 2008/05/29 21:29:02 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -261,11 +261,11 @@ pkg_postinst() {
 								"python[0-9].[0-9].1${mansuffix}"
 
 	python_mod_optimize
-	python_mod_optimize -x site-packages \
-						-x test /usr/lib/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" \
+						/usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
-		python_mod_optimize -x site-packages \
-							-x test /usr/$(get_libdir)/python${PYVER}
+		python_mod_optimize -x "(site-packages|test)" \
+							/usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
diff --git a/dev-lang/python/python-2.4.4-r12.ebuild b/dev-lang/python/python-2.4.4-r12.ebuild
index 03657c5b02c8..4ef88dcdc977 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.3 2008/05/29 16:06:26 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r12.ebuild,v 1.4 2008/05/29 21:29:02 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -254,8 +254,8 @@ pkg_postinst() {
 								"python[0-9].[0-9].1${mansuffix}"
 
 	python_mod_optimize
-	python_mod_optimize -x site-packages \
-						-x test /usr/lib/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" \
+						/usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
 		python_mod_optimize -x site-packages \
 							-x test /usr/$(get_libdir)/python${PYVER}
diff --git a/dev-lang/python/python-2.4.4-r13.ebuild b/dev-lang/python/python-2.4.4-r13.ebuild
index 878bddaa8b54..f166f4245b56 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.9 2008/05/29 16:06:26 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r13.ebuild,v 1.10 2008/05/29 21:29:02 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -254,11 +254,11 @@ pkg_postinst() {
 								"python[0-9].[0-9].1${mansuffix}"
 
 	python_mod_optimize
-	python_mod_optimize -x site-packages \
-						-x test /usr/lib/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" \
+						/usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
-		python_mod_optimize -x site-packages \
-							-x test /usr/$(get_libdir)/python${PYVER}
+		python_mod_optimize -x "(site-packages|test)" \
+							/usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
diff --git a/dev-lang/python/python-2.4.4-r5.ebuild b/dev-lang/python/python-2.4.4-r5.ebuild
index 25da26292b85..c0fd85084d1b 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.19 2008/05/29 16:06:26 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r5.ebuild,v 1.20 2008/05/29 21:29:02 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -246,11 +246,11 @@ pkg_postinst() {
 								"python[0-9].[0-9].1${mansuffix}"
 
 	python_mod_optimize
-	python_mod_optimize -x site-packages \
-						-x test /usr/lib/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" \
+						/usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
-		python_mod_optimize -x site-packages \
-							-x test /usr/$(get_libdir)/python${PYVER}
+		python_mod_optimize -x "(site-packages|test)" \
+							/usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
diff --git a/dev-lang/python/python-2.4.4-r6.ebuild b/dev-lang/python/python-2.4.4-r6.ebuild
index fadf90c70f89..5802f4116107 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-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.11 2008/05/29 16:06:26 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r6.ebuild,v 1.12 2008/05/29 21:29:02 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -246,11 +246,11 @@ pkg_postinst() {
 								"python[0-9].[0-9].1${mansuffix}"
 
 	python_mod_optimize
-	python_mod_optimize -x site-packages \
-						-x test /usr/lib/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" \
+						/usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
-		python_mod_optimize -x site-packages \
-							-x test /usr/$(get_libdir)/python${PYVER}
+		python_mod_optimize -x "(site-packages|test)" \
+							/usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
diff --git a/dev-lang/python/python-2.4.4-r9.ebuild b/dev-lang/python/python-2.4.4-r9.ebuild
index 1e4bc5b2aa4b..0ad3727f60b1 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.9 2008/05/29 16:06:26 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r9.ebuild,v 1.10 2008/05/29 21:29:02 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -259,11 +259,11 @@ pkg_postinst() {
 								"python[0-9].[0-9].1${mansuffix}"
 
 	python_mod_optimize
-	python_mod_optimize -x site-packages \
-						-x test /usr/lib/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" \
+						/usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
-		python_mod_optimize -x site-packages \
-							-x test /usr/$(get_libdir)/python${PYVER}
+		python_mod_optimize -x "(site-packages|test)" \
+							/usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
diff --git a/dev-lang/python/python-2.5.2-r1.ebuild b/dev-lang/python/python-2.5.2-r1.ebuild
index 66213a1f3655..b0450091db26 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.2 2008/05/29 16:06:26 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r1.ebuild,v 1.3 2008/05/29 21:29:02 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -262,8 +262,8 @@ pkg_postinst() {
 								"python[0-9].[0-9].1${mansuffix}"
 
 	python_mod_optimize
-	python_mod_optimize -x site-packages \
-						-x test /usr/lib/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" \
+						/usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
 		python_mod_optimize -x site-packages \
 							-x test /usr/$(get_libdir)/python${PYVER}
diff --git a/dev-lang/python/python-2.5.2-r2.ebuild b/dev-lang/python/python-2.5.2-r2.ebuild
index df07f8c53453..1c6d8cadafb3 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.2 2008/05/29 16:06:26 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r2.ebuild,v 1.3 2008/05/29 21:29:02 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -262,11 +262,11 @@ pkg_postinst() {
 								"python[0-9].[0-9].1${mansuffix}"
 
 	python_mod_optimize
-	python_mod_optimize -x site-packages \
-						-x test /usr/lib/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" \
+						/usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
-		python_mod_optimize -x site-packages \
-							-x test /usr/$(get_libdir)/python${PYVER}
+		python_mod_optimize -x "(site-packages|test)" \
+							/usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
diff --git a/dev-lang/python/python-2.5.2-r3.ebuild b/dev-lang/python/python-2.5.2-r3.ebuild
index 735ea81747eb..5eba5ca71556 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.3 2008/05/29 16:06:26 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r3.ebuild,v 1.4 2008/05/29 21:29:02 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -254,11 +254,11 @@ pkg_postinst() {
 								"python[0-9].[0-9].1${mansuffix}"
 
 	python_mod_optimize
-	python_mod_optimize -x site-packages \
-						-x test /usr/lib/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" \
+						/usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
-		python_mod_optimize -x site-packages \
-							-x test /usr/$(get_libdir)/python${PYVER}
+		python_mod_optimize -x "(site-packages|test)" \
+							/usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
diff --git a/dev-lang/python/python-2.5.2-r4.ebuild b/dev-lang/python/python-2.5.2-r4.ebuild
index 3f7c53dc61ac..2c4bfb854d49 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.3 2008/05/29 16:06:26 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r4.ebuild,v 1.4 2008/05/29 21:29:02 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -254,11 +254,11 @@ pkg_postinst() {
 								"python[0-9].[0-9].1${mansuffix}"
 
 	python_mod_optimize
-	python_mod_optimize -x site-packages \
-						-x test /usr/lib/python${PYVER}
+	python_mod_optimize -x "(site-packages|test)" \
+						/usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
-		python_mod_optimize -x site-packages \
-							-x test /usr/$(get_libdir)/python${PYVER}
+		python_mod_optimize -x "(site-packages|test)" \
+							/usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then