Delete call to deprecated python_version() (bug #316937).

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

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 7809733bc5ac0b8ea861af24e7d71874ef9524d4..948c56116ee0d294ead7ce6ac57a743532590051 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.51 2010/03/14 18:09:44 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.52 2010/06/14 21:44:05 arfrever Exp $
+
+  14 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  mpich2-1.0.8.ebuild:
+  Delete call to deprecated python_version() (bug #316937).
 
   14 Mar 2010; Justin Bronder <jsbronder@gentoo.org> mpich2-1.2.1_p1.ebuild:
   Add hydra pm, #309353

diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index d8a0c35c88c2943a5240fa3b4e8cbc62d1672e30..2a0845db8a5303bbed635f0ca5dc7fa843c1108d 100644 (file)
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0001-MPD_CONF_FILE-should-be-readable.patch 1496 RMD160 33b8db14ab69293a53ecb0192ea7a2a568ee422e SHA1 88cb1d7cc60a1eb7a2a7ea07c8058ebb3318c734 SHA256 747462d1d2272291fd956631cee4170112523027e2b89d4f2abf6d618cc004aa
 AUX 0002-mpd_conf_file-search-order.patch 3882 RMD160 90bf46695398bea605002826c7d9b85c7f07e5e9 SHA1 9f20b59f853e13d81f6227ddb16535d76ec4bab3 SHA256 a56c943e68e0bcf69900ae76cb4df73ef19d60f0e9e16e6d75d48b2651324b33
 AUX 0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch 1510 RMD160 8bcd0ec310bcbc13bfd3d0200c1b9f5a88fc4677 SHA1 949da42c2fa90c4a298dc37e0994e97317ae75e9 SHA256 84896b8c127a872fac3a99e9acdb41a2a051275399b186b54349a72d478acb00
@@ -17,17 +14,10 @@ DIST mpich2-1.1.1p1.tar.gz 18343542 RMD160 efa469c42306f3c4ce1d38d09da7c793c55ae
 DIST mpich2-1.2.1.tar.gz 18284454 RMD160 6ffbfbd11d9a51a79228713705df7be6d7f67be7 SHA1 0f7e104143cb4449afcec542e44098423e1627cb SHA256 394736543f021ac0ea73f3f40a58ca0320b7223487eb13991f0312aa9e8721c1
 DIST mpich2-1.2.1p1.tar.gz 18014859 RMD160 810cc486b65e4bcf977ac8d96ccbbcea87e0cbaa SHA1 26bd5620b45bc654aa3945755d11450be63d650c SHA256 a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964
 DIST mpich2-1.2.tar.gz 17245392 RMD160 fdf9f578817750be52e0d46c9dbc47fd8cbd925f SHA1 48502bf0acd6f877503b7f7756d51b63989e4fdd SHA256 b9d6d830864a940eead0e48965e5258f07190446eb511c14f5d567b2acfcdf44
-EBUILD mpich2-1.0.8.ebuild 6096 RMD160 0c5cb47f18ce49a14827d70ea6de7718d8ed68c6 SHA1 17fec10dd2875a0ea1396710494be6778d208039 SHA256 8d835125efd2ad8270780d077759c20dfdc9e60dda7629f17afe7544e9981597
+EBUILD mpich2-1.0.8.ebuild 6043 RMD160 1b3bab7d26b9dbb4bec6c8768384eebbbdd9b1a0 SHA1 6b362515fd2afeff899d3bf42bd639fe2bdddf81 SHA256 0d82f061af8a8247af27107e7dc9e20fa296699c18021ac2a4b182c946ab5cd6
 EBUILD mpich2-1.1.1_p1.ebuild 5040 RMD160 46a25250c3133ab8a51112de5c7ccd7afda30a0a SHA1 a083fea58b81b552aa60606575dccccaed0ce20e SHA256 8406932a61481e97bd6161e9e82ff05d3d0d75e19715d525cc7bb78c1494a5ed
 EBUILD mpich2-1.2.1.ebuild 4722 RMD160 99cb618123f76218c66dbe4238d46ac5394b5607 SHA1 9eb51c74accd3a80396a8515396e0237e50f7f52 SHA256 72c309be40b4519cabeeb6c622ab7c7f8ee9c707d31450e1f72c4310762fceaf
 EBUILD mpich2-1.2.1_p1.ebuild 4950 RMD160 4127ae553f6053a06ae0e4b44d04d7e8270b0a93 SHA1 83e6ef75c223edbf2915b8194d9616e0ed279279 SHA256 37c1b8f56ef3057b5f48be6b4849612b65c1a2eafdc344d1536ea4d8b278009d
 EBUILD mpich2-1.2.ebuild 5035 RMD160 3ee0dfb68e305e0bdd92b6a261951abfcb15e4b0 SHA1 800b80b6737fd3f1fe256f4b5358ee595e4c123a SHA256 04c02ef2495f774404b65571fc965c4a0915aa49eae8b34566296091fcf8b2d4
-MISC ChangeLog 10770 RMD160 502f13dd661ace78d8801d7af70002a7ebdb332d SHA1 eb6d104be1fea75a8475b1903021cfe164c7f074 SHA256 9a6f0b4cf90c4e7e82bfb1fd2ad954a90db89c8885f1277546ced1594fdc4e7f
+MISC ChangeLog 10926 RMD160 9fed40a293ebcb5f9c1989fdb15fa711e041b7e7 SHA1 e382cb1acdb6e68f77db7bdac82c11394192219c SHA256 97d883a2bc0ac4117891e0192004ed11bdb4e35a176a8faf84227c8e540d6f84
 MISC metadata.xml 468 RMD160 6fec5dd4e4a66c5feebc8030da722b7c4d94175c SHA1 145b3c5ef34a6f3acdb732e967c53add6bbfe676 SHA256 41ca5abf4645fc4853ca86b63dc92d301c90c93329b5ffdcb255503d389dfe32
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkudJm4ACgkQ4MrvBE1wQ8nTbgCeNTgnFIjnPZL6LjBTD0+Xwr5h
-rQ0Anjsln4vzmdDY72z1Efu1x6023zJJ
-=Ml0P
------END PGP SIGNATURE-----

diff --git a/sys-cluster/mpich2/mpich2-1.0.8.ebuild b/sys-cluster/mpich2/mpich2-1.0.8.ebuild
index 8940161599313f5ef06462f65b052b865b21a17e..e28116a1d0a400f1e42374f8ac5f0f559eacd5b0 100644 (file)
--- a/sys-cluster/mpich2/mpich2-1.0.8.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.0.8.ebuild,v 1.13 2009/12/31 17:12:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.8.ebuild,v 1.14 2010/06/14 21:44:05 arfrever Exp $
 
 EAPI=1
 inherit python eutils fortran autotools
@@ -49,7 +49,6 @@ pkg_setup() {
        fi
 
        MPD_CONF_FILE_DIR=/etc/${PN}
-       python_version
 }
 
 src_unpack() {
@@ -201,7 +200,7 @@ src_install() {
        sed -i "s,@MPD_CONF_FILE_DIR@,${MPD_CONF_FILE_DIR}," \
                "${T}"/${PN}.envd
 
-       ln -s ../$(get_libdir)/python${PYVER}/site-packages/mpich2/mpdgdbdrv.py \
+       ln -s ../$(get_libdir)/python$(python_get_version)/site-packages/mpich2/mpdgdbdrv.py \
                "${D}"/usr/bin/mpdgdbdrv.py
        newenvd "${FILESDIR}"/${PN}.envd 25mpich2
 }
@@ -211,7 +210,7 @@ pkg_postinst() {
        chown root:root "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf
        chmod 600 "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf
 
-       python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+       python_mod_optimize $(python_get_sitedir)/${PN}
        elog ""
        elog "MPE2 has been removed from this ebuild and now stands alone"
        elog "as sys-cluster/mpe2."
@@ -219,5 +218,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-       python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+       python_mod_cleanup $(python_get_sitedir)/${PN}
 }