Fix usage of python_set_active_version() and python_mod_optimize(), use python_mod_cleanup() instead of python_mod_optimize() in pkg_postrm() (bug #316247).

Package-Manager: portage-HEAD/cvs/Linux x86_64

3 files changed, 13 insertions, 17 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 3784818b92fb..d8a90134e280 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.70 2010/06/25 20:38:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.71 2010/06/25 22:13:38 arfrever Exp $
+
+  25 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  root-5.26.00-r4.ebuild:
+  Fix usage of python_set_active_version() and python_mod_optimize(), use
+  python_mod_cleanup() instead of python_mod_optimize() in pkg_postrm() (bug
+  #316247).
 
   25 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org>
   -root-5.22.00-r3.ebuild, -root-5.24.00-r1.ebuild, -root-5.26.00-r3.ebuild,
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index c6e518d212ae..faa376ad8af5 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX olbd.confd 197 RMD160 798de1808502f3e4ecfc5f024b56a419d9824057 SHA1 f2a4385fdf9849eafb1d5457727f6fbe80af1da3 SHA256 5a34da76bbe56cd3b8128f05c0d9900f9d7f7ffdcffc5deeb816c78ea46679ba
 AUX olbd.initd 714 RMD160 e2cc28474a280345f6962f890f5ddb3884d7f69f SHA1 4dcdf7ba35a834db2ac5a5bdfe4d2c31938f0552 SHA256 5d6c1b6e7b40d6842df6a6f7314fa2f49329b820ff86592d2f8d2662a414ec39
 AUX proofd.confd 415 RMD160 3814aacb63d82b9d060086f9bef304d431a15b4e SHA1 31eb7af239a0042f887b5089a7c6c7ec5d6662e9 SHA256 261738817b4ba50fb07007741305d0a88e9067a45e3cbfd1d3fc8bebe70ece38
@@ -20,13 +17,6 @@ DIST root_v5.22.00.source.tar.gz 26320334 RMD160 0fba2518802ce1f737b8cededbf518f
 DIST root_v5.26.00.source.tar.gz 29209345 RMD160 bf7f91abd76ec86f69eb80506291cb8d4f87614e SHA1 318c5adf7f54f8206d9173d2fb0dc196a0e87192 SHA256 5ec86599bf7ef0fe3db11e5dd2d01183484cb199ab3a1c28d68f10b804e93e76
 EBUILD root-5.22.00-r2.ebuild 9198 RMD160 cc250272c572503dfc4679281b42ecd555b36eda SHA1 235d81242c672098543276f66f2ed1ddbe443892 SHA256 9ae90ba1a8526f417dd661a04988b99edfcef5af18515b94c9899d6297032398
 EBUILD root-5.26.00-r2.ebuild 8948 RMD160 2503834aee34a248c8d7110002d846b9b2782dd0 SHA1 042e84f5b2fa1d663282185167d8ecd1eab3f80e SHA256 61eeb55a31a23b6311772c35e205bcd2cc1b0d908e6e20741ff88df59abd333d
-EBUILD root-5.26.00-r4.ebuild 9208 RMD160 bb2337c019cc2371cf071080a72dfacf133eb111 SHA1 5c499580e4aba687f95e44286a087838c9b8eb16 SHA256 c68b5b6602c3b4d3a7cd594d8410102f038d782969a219a698bdac610b36c59b
-MISC ChangeLog 20145 RMD160 e2e955b15504b9e346e666110b1cfcd55521a37e SHA1 8ecc27aea22b61bd72b2f7a0c39fccd3f1f58be8 SHA256 514d49600a3ad88e56b340dffc9088228610e19ce62003f78742014ae552da8d
+EBUILD root-5.26.00-r4.ebuild 9197 RMD160 8463114cf072595bc519cc3194a5a6414ec2dca4 SHA1 249ddffd0fe9ad8568f6e2035d4fad09b16539a3 SHA256 88903a3cef53f94cf59de8cafb76c3f68876be4b26574b7b1e1a764e39840a7b
+MISC ChangeLog 20408 RMD160 a5e4e2d82b1d577f0328bf2fa27936c6747b5fd5 SHA1 4541ba07daf73a22c097402693a21c20f50e58e4 SHA256 978853c13d06b413ef2d28b0d0b4cc1f270ed11c440d2238c05476a8429afea7
 MISC metadata.xml 1570 RMD160 00e3660230a42e727d95f3533eccea61f2d88aff SHA1 dcefe31ff920ec459f68f77ffdea04264dbe4c0c SHA256 09ff2a9ee5791c9bfe4fc3c7242f8d635d0b41019e3b767cfefc41a5399855ac
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwlE9kACgkQ1ycZbhPLE2ASyQCgrCxDwv6YSIcXupLXQGUbR6kZ
-tC4An0b19BBNIVNccsGl4xqqh7n5LJvx
-=Debd
------END PGP SIGNATURE-----
diff --git a/sci-physics/root/root-5.26.00-r4.ebuild b/sci-physics/root/root-5.26.00-r4.ebuild
index acab83ca6814..5d485caa4adc 100644
--- a/sci-physics/root/root-5.26.00-r4.ebuild
+++ b/sci-physics/root/root-5.26.00-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/sci-physics/root/root-5.26.00-r4.ebuild,v 1.2 2010/06/25 20:38:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.26.00-r4.ebuild,v 1.3 2010/06/25 22:13:38 arfrever Exp $
 
 EAPI=3
 
@@ -100,7 +100,7 @@ pkg_setup() {
 		export USE_OPENMP=1
 		use math && export USE_PARALLEL_MINUIT2=1
 	fi
-	python_set_active_version 2
+	use python && python_set_active_version 2
 }
 
 src_prepare() {
@@ -298,10 +298,10 @@ src_install() {
 pkg_postinst() {
 	use ruby && elog "ROOT Ruby module is available as libRubyROOT"
 	fdo-mime_desktop_database_update
-	use python && python_mod_optimize "${EPREFIX}"/usr/$(get_libdir)/root
+	use python && python_mod_optimize /usr/$(get_libdir)/root
 }
 
 pkg_postrm() {
 	fdo-mime_desktop_database_update
-	use python && python_mod_optimize "${EPREFIX}"/usr/$(get_libdir)/root
+	use python && python_mod_cleanup /usr/$(get_libdir)/root
 }