From: Justin Bronder Date: Sat, 3 Jul 2010 01:35:41 +0000 (+0000) Subject: Update python handling (#316937). Cleanup deps. Automatically turn on threads if... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=bc8f5a48abb61317c5b504757d13abe415ca3ffe;p=gentoo.git Update python handling (#316937). Cleanup deps. Automatically turn on threads if mpi-threads are requested. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog index 948c56116ee0..547d9cad0cb6 100644 --- 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.52 2010/06/14 21:44:05 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.53 2010/07/03 01:35:41 jsbronder Exp $ + + 03 Jul 2010; Justin Bronder mpich2-1.2.1_p1.ebuild: + Update python handling (#316937). Cleanup deps. Automatically turn on + threads if mpi-threads are requested. 14 Jun 2010; Arfrever Frehtes Taifersar Arahesis mpich2-1.0.8.ebuild: diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest index 2a0845db8a53..12c05feb4fc2 100644 --- a/sys-cluster/mpich2/Manifest +++ b/sys-cluster/mpich2/Manifest @@ -1,3 +1,6 @@ +-----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,7 +20,14 @@ DIST mpich2-1.2.tar.gz 17245392 RMD160 fdf9f578817750be52e0d46c9dbc47fd8cbd925f 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.1_p1.ebuild 4866 RMD160 e027010599d5b9c781f9b0c75e07f06beda3b9ec SHA1 00bc981f74696f556827401b2e3b4ab8abff13d8 SHA256 0159f9db621cc931cb25f4ad7c932478eca431eb7ed7d014aef4ff40a194c505 EBUILD mpich2-1.2.ebuild 5035 RMD160 3ee0dfb68e305e0bdd92b6a261951abfcb15e4b0 SHA1 800b80b6737fd3f1fe256f4b5358ee595e4c123a SHA256 04c02ef2495f774404b65571fc965c4a0915aa49eae8b34566296091fcf8b2d4 -MISC ChangeLog 10926 RMD160 9fed40a293ebcb5f9c1989fdb15fa711e041b7e7 SHA1 e382cb1acdb6e68f77db7bdac82c11394192219c SHA256 97d883a2bc0ac4117891e0192004ed11bdb4e35a176a8faf84227c8e540d6f84 +MISC ChangeLog 11117 RMD160 bcf0175152d6a8b8c2df60a53185444df2f58b83 SHA1 6bff1e4b6451ac561eafda1f94b3f58b4507b9a4 SHA256 d840b3d8ea0a179911a3c2f9d1d3f718eaf9eec25ef479b20800c70fe1c5be4e MISC metadata.xml 468 RMD160 6fec5dd4e4a66c5feebc8030da722b7c4d94175c SHA1 145b3c5ef34a6f3acdb732e967c53add6bbfe676 SHA256 41ca5abf4645fc4853ca86b63dc92d301c90c93329b5ffdcb255503d389dfe32 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkwuk/IACgkQ4MrvBE1wQ8laFwCeIl+k8ctl+bSYqQ9plrsAW/zI +VKkAn0VxLPraUC02IH+Nck826OwIgTYp +=6HtE +-----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 1ee39f1d56fd..871f4a1f7b22 100644 --- a/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild +++ b/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild @@ -1,9 +1,13 @@ # 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.2 2010/03/14 18:09:44 jsbronder Exp $ +# $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 $ EAPI=2 -inherit eutils fortran +PYTHON_DEPEND="*:2.4" +RESTRICT_PYTHON_ABIS="3.*" + +inherit eutils fortran python + MY_PV=${PV/_/} DESCRIPTION="MPICH2 - A portable MPI implementation" HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php" @@ -14,32 +18,24 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="+cxx debug doc fortran pvfs2 threads romio mpi-threads" -COMMON_DEPEND="dev-lang/perl - >=dev-lang/python-2.3 +COMMON_DEPEND="dev-libs/libaio romio? ( net-fs/nfs-utils ) - pvfs2? ( >=sys-cluster/pvfs2-2.7.0 ) - dev-libs/libaio - !media-sound/mpd - !sys-cluster/mpiexec - !sys-cluster/openmpi - !sys-cluster/lam-mpi - !sys-cluster/mpich" + pvfs2? ( >=sys-cluster/pvfs2-2.7.0 )" DEPEND="${COMMON_DEPEND} + dev-lang/perl sys-devel/libtool" RDEPEND="${COMMON_DEPEND} - net-misc/openssh" + !media-sound/mpd + !sys-cluster/openmpi + !sys-cluster/lam-mpi" S="${WORKDIR}"/${PN}-${MY_PV} pkg_setup() { - if [ -n "${MPICH_CONFIGURE_OPTS}" ]; then - elog "User-specified configure options are ${MPICH_CONFIGURE_OPTS}." - else - elog "User-specified configure options are not set." - elog "If needed, see the docs and set MPICH_CONFIGURE_OPTS." - fi + python_set_active_version 2 + python_pkg_setup if use fortran ; then FORTRAN="g77 gfortran ifort ifc" @@ -47,9 +43,8 @@ pkg_setup() { fi if use mpi-threads && ! use threads; then - die "USE=mpi-threads requires USE=threads" + ewarn "mpi-threads requires threads, assuming that's what you want" fi - MPD_CONF_FILE_DIR=/etc/${PN} } @@ -83,7 +78,7 @@ src_prepare() { } src_configure() { - local c="${MPICH_CONFIGURE_OPTS} --enable-sharedlibs=gcc" + local c="--enable-sharedlibs=gcc" local romio_conf # The configure statements can be somewhat confusing, as they @@ -92,10 +87,17 @@ src_configure() { use debug && c="${c} --enable-g=all --enable-debuginfo" - if use threads ; then + if use mpi-threads; then + # MPI-THREAD requries threading. c="${c} --with-thread-package=pthreads" + c="${c} --enable-threads=default" else - c="${c} --with-thread-package=none" + if use threads ; then + c="${c} --with-thread-package=pthreads" + else + c="${c} --with-thread-package=none" + fi + c="${c} --enable-threads=single" fi # enable f90 support for appropriate compilers @@ -106,14 +108,8 @@ src_configure() { c="${c} --enable-f77 --disable-f90";; esac - if use mpi-threads; then - c="${c} --enable-threads=default" - else - c="${c} --enable-threads=single" - fi - if use pvfs2; then - # nfs and ufs are defaults in 1.0.8 at least. + # nfs and ufs are default. romio_conf="--with-file-system=pvfs2+nfs+ufs --with-pvfs2=/usr" fi @@ -186,4 +182,10 @@ pkg_postinst() { elog "MPE2 has been removed from this ebuild and now stands alone" elog "as sys-cluster/mpe2." elog "" + + python_mod_optimize /usr/bin/ +} + +pkg_postrm() { + python_mod_cleanup /usr/bin/ }