Bump and cleanup. Drop keywords until #345231 is fixed.

(Portage version: 2.1.9.24/git/Linux x86_64, signed Manifest commit with key 4D7043C9)

3 files changed, 18 insertions, 52 deletions

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 370b7f9f7..6e1f3968e 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mpich2-1.3 (12 Nov 2010)
+
+  12 Nov 2010; Justin Bronder <jsbronder@gentoo.org> -mpich2-1.3_rc1.ebuild,
+  +mpich2-1.3.ebuild:
+  Bump and cleanup.  Drop keywords until #345231 is fixed.
+
   14 Sep 2010; Justin Bronder <jsbronder@gentoo.org>
   mpich2-1.2.1_p1-r2.ebuild:
   Disable support for gforker as it breaks debug builds and is being
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index 7a2f2618b..894d5740d 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -13,15 +13,15 @@ AUX mpich2-1.0.8-pkgconfig.patch 928 RMD160 5ce7a800423f250dba0dd69560abebf845e7
 AUX mpich2-1.2.1-fix-missing-libs.patch 1825 RMD160 aec1251aa66f0d63c5848920c63339d5558a0f61 SHA1 d70695c63d891a32a98324ffd236f8751465fe98 SHA256 f645d00fc6adeef553517078dcc3313cbabfbf8069ad5a76e2570d183b2d824b
 AUX mpich2-1.3-libtvmpich2.so-respect-user-LDFLAGS.patch 1053 RMD160 e38a0c503bde8b66cd1d7efbeb674f14e0008a8d SHA1 f5691827c39a9bbf01c4c7e13d5fdf4aa1774558 SHA256 a0e79be986c29cc5aa1b0abb1bba27dc368a530d632a332e8701e9c02967224e
 DIST mpich2-1.2.1p1.tar.gz 18014859 RMD160 810cc486b65e4bcf977ac8d96ccbbcea87e0cbaa SHA1 26bd5620b45bc654aa3945755d11450be63d650c SHA256 a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964
-DIST mpich2-1.3rc1.tar.gz 19120827 RMD160 f6db0e250f244d05c6db8a2507e98d4303112cd9 SHA1 49fa1f4ea93ed51a27f41c7ea3543dad452cfbce SHA256 e0dccb468f20ad53735a778a5ee4a23bc139445ad13ea0b7e8f009c618d9bd23
+DIST mpich2-1.3.tar.gz 19394388 RMD160 e48e9116ad42cc9922497c12f9e926d6d3490976 SHA1 a6c5518ddf94c60397e0508898f770c693948619 SHA256 c76e869045ce274ee0494b0c72d884f9e2d3176a4689d362e684754ae0430e63
 EBUILD mpich2-1.2.1_p1-r2.ebuild 5074 RMD160 c11e2f01153805312f382f8d46112920df59575b SHA1 fb45a52e123bd6a5970c9cd1df1c5a52f99539b1 SHA256 6380fbee9e21e241a7736a0b75374036bb5295a7392b052354de4f28ccd440c1
-EBUILD mpich2-1.3_rc1.ebuild 4706 RMD160 887a4db390a68ae4f7c895b8dace5ceaff3adbe1 SHA1 4ad3cb86625f179ab2778a7240aba07bf1309119 SHA256 be5836619a28fb8c515cf9d1389a331482f9dd6d489e2e5b4b5cbe085b2131de
-MISC ChangeLog 3855 RMD160 c3e62ab18d5b5dce4abcdc54bf72437efbd91375 SHA1 c78bd88ac0bc5fa79ef6693c308742a384d01bad SHA256 e8fe61d3b944df2f9bf2ff61bba4258c7cc622e82fc17141720dc86d1898802a
+EBUILD mpich2-1.3.ebuild 3698 RMD160 0d5febf170f409701c82e83d880dc98cba198359 SHA1 19841e5c605284b3bd78975e317050fce7b33713 SHA256 0a5a0b53dbc2ab57558520e968c8a514f137e52c153de37b4fef016c138ca0f9
+MISC ChangeLog 4041 RMD160 d489e9369e87716748a43e4c37f900f92de7f904 SHA1 31f3ccba3de55a6652de5fc4e39bcd02320e4e76 SHA256 23bfe4ec0b805de22e402ba4e3d68d3416ad6029643823e2ebf297b390e38076
 MISC metadata.xml 534 RMD160 8d4fa7f5f4860a520e58b3866b2a2fdc04ab6d83 SHA1 60bc1b41a847e2f9fbf527b204fcafc054d04d33 SHA256 763dc9199c817bb987335dcdddcc65de5f419410aac2f027fc9a2208e91f5c0a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkye9sUACgkQ4MrvBE1wQ8mf8gCfbyynH3oHsrk1J564r56R5MyP
-NQwAnA3YeOQKdol3s+8TN89TkzGmM8y1
-=g2Dr
+iEYEARECAAYFAkzdla8ACgkQ4MrvBE1wQ8mUMgCePOof2yEywgvQM5SCGh8OkePp
+/UQAn3BvcQSek7DH9P63zYivT+L1WNY/
+=Fk/G
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/mpich2/mpich2-1.3_rc1.ebuild b/sys-cluster/mpich2/mpich2-1.3.ebuild
index 09c548aae..887ef3100 100644
--- a/sys-cluster/mpich2/mpich2-1.3_rc1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.3.ebuild
@@ -3,9 +3,7 @@
 # $Header: $
 
 EAPI=2
-PYTHON_DEPEND="2"
-
-inherit eutils fortran python mpi
+inherit eutils fortran mpi
 
 MY_PV=${PV/_/}
 DESCRIPTION="MPICH2 - A portable MPI implementation"
@@ -14,12 +12,11 @@ SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+cxx debug doc fortran threads romio mpi-threads"
 
-MPI_UNCLASSED_BLOCKERS="media-sound/mpd"
-
 COMMON_DEPEND="dev-libs/libaio
+	sys-apps/hwloc
 	romio? ( net-fs/nfs-utils )
 	$(mpi_imp_deplist)"
 
@@ -32,9 +29,6 @@ RDEPEND="${COMMON_DEPEND}"
 S="${WORKDIR}"/${PN}-${MY_PV}
 
 pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
 	MPI_ESELECT_FILE="eselect.mpi.mpich2"
 
 	if use fortran ; then
@@ -55,8 +49,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/mpich2-1.3-libtvmpich2.so-respect-user-LDFLAGS.patch
-
 	# We need f90 to include the directory with mods, and to
 	# fix hardcoded paths for src_test()
 	# Submitted upstream.
@@ -112,8 +104,9 @@ src_configure() {
 	! mpi_classed && c="${c} --sysconfdir=/etc/${PN}"
 	econf $(mpi_econf_args) ${c} ${romio_conf} \
 		--docdir=$(mpi_root)/usr/share/doc/${PF} \
-		--with-pm=mpd:hydra \
+		--with-pm=hydra \
 		--disable-mpe \
+		--with-hwloc-prefix=/usr \
 		$(use_enable romio) \
 		$(use_enable cxx) \
 		|| die
@@ -129,11 +122,6 @@ src_compile() {
 src_test() {
 	local rc
 
-	cp "${FILESDIR}"/mpd.conf "${T}"/mpd.conf || die
-	chmod 600 "${T}"/mpd.conf
-	export MPD_CONF_FILE="${T}/mpd.conf"
-	"${S}"/bin/mpd --daemon --pid="${T}"/mpd.pid
-
 	make \
 		CC="${S}"/bin/mpicc \
 		CXX="${S}"/bin/mpicxx \
@@ -143,7 +131,6 @@ src_test() {
 		testing
 	rc=$?
 
-	"${S}"/bin/mpdallexit || kill $(<"${T}"/mpd.pid)
 	return ${rc}
 }
 
@@ -153,13 +140,9 @@ src_install() {
 
 	emake DESTDIR="${D}" install || die
 
-	dodir ${MPD_CONF_FILE_DIR}
-	insinto ${MPD_CONF_FILE_DIR}
-	doins "${FILESDIR}"/mpd.conf || die
-
 	mpi_dodir /usr/share/doc/${PF}
 	mpi_dodoc COPYRIGHT README CHANGES RELEASE_NOTES || die
-	mpi_newdoc src/pm/mpd/README README.mpd || die
+	mpi_newdoc src/pm/hydra/README README.hydra || die
 	if use romio; then
 		mpi_newdoc src/mpi/romio/README README.romio || die
 	fi
@@ -169,27 +152,4 @@ src_install() {
 	fi
 
 	mpi_imp_add_eselect
-
-	# See #316937
-	MPD_PYTHON_MODULES=""
-	for f in "${d}"usr/bin/*.py; do
-		MPD_PYTHON_MODULES="${MPD_PYTHON_MODULES} ${f##${D}}"
-	done
-}
-
-pkg_postinst() {
-	# Here so we can play with ebuild commands as a normal user
-	chown root:root "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf
-	chmod 600 "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf
-
-	elog ""
-	elog "MPE2 has been removed from this ebuild and now stands alone"
-	elog "as sys-cluster/mpe2."
-	elog ""
-
-	python_mod_optimize ${MPD_PYTHON_MODULES}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${MPD_PYTHON_MODULES}
 }