Isolate mpich2 specific python files in /usr/bin, simplify python deps. Thanks to...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 25035a4f0617c683ea8437eb3fd55de1c260c249..f13fae383dc04bf870a47b82b63e61345a8ccbc6 100644 (file)
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/mpich2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.54 2010/07/03 01:38:53 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.55 2010/07/03 04:41:26 jsbronder Exp $
+
+  03 Jul 2010; Justin Bronder <jsbronder@gentoo.org> mpich2-1.2.1_p1.ebuild:
+  Isolate mpich2 specific python files in /usr/bin, simplify python deps.
+  Thanks to Arfrever, #316937.
 
   03 Jul 2010; Justin Bronder <jsbronder@gentoo.org>
   -mpich2-1.1.1_p1.ebuild, -mpich2-1.2.ebuild, -mpich2-1.2.1.ebuild:

diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index b3307064993fb5364f5243b1044682d917b61e6b..ae06666e4cb8b2a8bd74ccb53dd2f2ce107c1270 100644 (file)
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -15,13 +15,13 @@ AUX mpich2.envd 45 RMD160 e29a0d617bbc15cc42d3088f8a79c1c715b353fa SHA1 765b885d
 DIST mpich2-1.0.8.tar.gz 17237476 RMD160 646cf50fbdc60a49809f4d0a6bcaf2835844db1f SHA1 41d6f6ce1034ecec5c14fb03592730ae2dd071e5 SHA256 7551ce20f3ef366567c566d08782323360b5dbd2d15d816e41c10b5f96eaf369
 DIST mpich2-1.2.1p1.tar.gz 18014859 RMD160 810cc486b65e4bcf977ac8d96ccbbcea87e0cbaa SHA1 26bd5620b45bc654aa3945755d11450be63d650c SHA256 a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964
 EBUILD mpich2-1.0.8.ebuild 6043 RMD160 1b3bab7d26b9dbb4bec6c8768384eebbbdd9b1a0 SHA1 6b362515fd2afeff899d3bf42bd639fe2bdddf81 SHA256 0d82f061af8a8247af27107e7dc9e20fa296699c18021ac2a4b182c946ab5cd6
-EBUILD mpich2-1.2.1_p1.ebuild 4866 RMD160 e027010599d5b9c781f9b0c75e07f06beda3b9ec SHA1 00bc981f74696f556827401b2e3b4ab8abff13d8 SHA256 0159f9db621cc931cb25f4ad7c932478eca431eb7ed7d014aef4ff40a194c505
-MISC ChangeLog 11269 RMD160 c89be8212448a2df01e3976e688d523c45b3f4a5 SHA1 2b98f820c29f083ee731a2d7e71bde58404ba7fc SHA256 d7a7a4f2d04e3da8ff1bc0ce9802369eefd8741d0855bf51a2d439358b141f3c
+EBUILD mpich2-1.2.1_p1.ebuild 5055 RMD160 f3a1732b0c7b45ddaca97b048dc4c172045d57dc SHA1 d87ff5f1dd322392b27f796f592dbb6b4c1fa70f SHA256 564f748996de82cbfde00474b700c51479be56a273064c56fa17b59270528faf
+MISC ChangeLog 11452 RMD160 86b2fe8fbe140246ba21ec182289e01f695fc0fb SHA1 701893811fb80643df15ac53a266947a2a24c9b4 SHA256 8f0d1318594925974ed4816bb88ac8581edeee30fc8895203ca34db9842f1b8e
 MISC metadata.xml 468 RMD160 6fec5dd4e4a66c5feebc8030da722b7c4d94175c SHA1 145b3c5ef34a6f3acdb732e967c53add6bbfe676 SHA256 41ca5abf4645fc4853ca86b63dc92d301c90c93329b5ffdcb255503d389dfe32
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkwulLIACgkQ4MrvBE1wQ8lRGwCgsVPl0PRs8EfoxBvGHGnfvPp8
-bHoAnAvQSCBqpOwch+QssYd9MV1k+0b/
-=8c4E
+iEYEARECAAYFAkwuv3wACgkQ4MrvBE1wQ8m5bwCdFYlG/qPDwlQqR0f911nNxPt+
+dbgAoKCX9NxMQKl7y9Av1AR9nbmBW8iw
+=z7m6
 -----END PGP SIGNATURE-----

diff --git a/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild b/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild
index 871f4a1f7b22d4e6ca07267639079af8fb2375a7..6d60ed43324d4be50dc3580e3d7b2e1af8130333 100644 (file)
--- a/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild,v 1.3 2010/07/03 01:35:41 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild,v 1.4 2010/07/03 04:41:26 jsbronder Exp $
 
 EAPI=2
-PYTHON_DEPEND="*:2.4"
-RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_DEPEND="2"
 
 inherit eutils fortran python
 
@@ -152,6 +151,7 @@ src_test() {
 }
 
 src_install() {
+       local f
        emake DESTDIR="${D}" install || die
 
        dodir ${MPD_CONF_FILE_DIR}
@@ -171,6 +171,12 @@ src_install() {
                dodir /usr/share/doc/${PF}/www
                mv "${D}"/usr/share/doc/www*/* "${D}"/usr/share/doc/${PF}/www/
        fi
+
+       # See #316937
+       MPD_PYTHON_MODULES=""
+       for f in "${D}"/usr/bin/*.py; do
+               MPD_PYTHON_MODULES="${MPD_PYTHON_MODULES} ${f##${D}}"
+       done
 }
 
 pkg_postinst() {
@@ -183,9 +189,13 @@ pkg_postinst() {
        elog "as sys-cluster/mpe2."
        elog ""
 
-       python_mod_optimize /usr/bin/
+       for f in ${MPD_PYTHON_MODULES}; do
+               python_mod_optimize ${f}
+       done
 }
 
 pkg_postrm() {
-       python_mod_cleanup /usr/bin/
+       for f in ${MPD_PYTHON_MODULES}; do
+               python_mod_cleanup ${f}
+       done
 }