Clean up.

(Portage version: 2.1.2_rc2-r5)
 (Unsigned Manifest commit)

6 files changed, 4 insertions, 303 deletions

diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index 870a39038a14..07993bf2f679 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -1,7 +1,3 @@
-AUX 1.2.6-fix-romio-sandbox-breakage.patch 690 RMD160 72f4b6bdf21493c31d2ec1c56c914e848f483760 SHA1 ab0f6a2348b299c704feb9957cc1ad267efbe54e SHA256 a9f3e790f365a8e2d02d1cf7a0e5a4bc662abf5c1780d6b5ad93d57a48a78112
-MD5 e878381a3b6165630ef1a8b3989076c8 files/1.2.6-fix-romio-sandbox-breakage.patch 690
-RMD160 72f4b6bdf21493c31d2ec1c56c914e848f483760 files/1.2.6-fix-romio-sandbox-breakage.patch 690
-SHA256 a9f3e790f365a8e2d02d1cf7a0e5a4bc662abf5c1780d6b5ad93d57a48a78112 files/1.2.6-fix-romio-sandbox-breakage.patch 690
 AUX 1.2.7_p1-allow-fhs-afs.patch 1180 RMD160 b11d1acb71c6b419155396e17791824ffea69123 SHA1 dfb74d9b5c697e714874aef131d0ff4e06e175f2 SHA256 fac4371a555b3b1c94ae5f7196fcc13294772abd8456c1c146a01e65df982d9c
 MD5 875f85e42a88271f2cb95be9589637cf files/1.2.7_p1-allow-fhs-afs.patch 1180
 RMD160 b11d1acb71c6b419155396e17791824ffea69123 files/1.2.7_p1-allow-fhs-afs.patch 1180
@@ -10,35 +6,19 @@ AUX 1.2.7_p1-fix-romio-sandbox-breakage.patch 698 RMD160 1340bb61b3778f2309b49de
 MD5 e2c40d21fee1af27db5ad0f7b6d158d5 files/1.2.7_p1-fix-romio-sandbox-breakage.patch 698
 RMD160 1340bb61b3778f2309b49de85c2814fcd67a639e files/1.2.7_p1-fix-romio-sandbox-breakage.patch 698
 SHA256 6ac74ea6bd141657fde78c93be79618d9c34f84e55b068a98f348ee52e308927 files/1.2.7_p1-fix-romio-sandbox-breakage.patch 698
-DIST mpich-1.2.5.2.tar.gz 12383519
-DIST mpich-1.2.6.tar.gz 15248688
 DIST mpich-1.2.7p1.tar.gz 15978525 RMD160 1f42f10c0942f3a20fc2a3853ce825ba0885bb87 SHA1 7668b71c604f00aadc2db7d10f8fc031b3def9e1 SHA256 6deb6b3b0815d4874a39878f136cbcddbdb57fd57ff7ef3df6e3414a397f6171
-EBUILD mpich-1.2.5.2.ebuild 3157 RMD160 10f832590c5f61180703594594cddef2ef49ae2d SHA1 ac6272d3a87f82f81599ee037e6661e298c13009 SHA256 41e6e573bb9fa8479b49b903356238a34ae2721887343cb28ef94f0b98cdf42b
-MD5 90131acb83e5b6194dd12b6ee456c2e5 mpich-1.2.5.2.ebuild 3157
-RMD160 10f832590c5f61180703594594cddef2ef49ae2d mpich-1.2.5.2.ebuild 3157
-SHA256 41e6e573bb9fa8479b49b903356238a34ae2721887343cb28ef94f0b98cdf42b mpich-1.2.5.2.ebuild 3157
-EBUILD mpich-1.2.6-r4.ebuild 4047 RMD160 34352149a4d218ecd48df8adb63ed00d32fb6654 SHA1 a675df0ed9af37f5011159703ea2d68fed82a93c SHA256 768d73e2fc849238c5c843febb493237e791c1fdc251f6042a6ffa4b18ab0cda
-MD5 b5ee11c1c54dc5f309210def20249348 mpich-1.2.6-r4.ebuild 4047
-RMD160 34352149a4d218ecd48df8adb63ed00d32fb6654 mpich-1.2.6-r4.ebuild 4047
-SHA256 768d73e2fc849238c5c843febb493237e791c1fdc251f6042a6ffa4b18ab0cda mpich-1.2.6-r4.ebuild 4047
 EBUILD mpich-1.2.7_p1.ebuild 4137 RMD160 48908b9be6745520abacb56912c7b8bb04f72ddd SHA1 69253d7502868e60e0b79b71a83c1721f8321574 SHA256 521b7ac2e307ce82a068e7c5eadfe6844a44b0e4b2be9e61f6fd90d8f1c4f171
 MD5 23c4084d05d72bf423779f8d0f6ec9ac mpich-1.2.7_p1.ebuild 4137
 RMD160 48908b9be6745520abacb56912c7b8bb04f72ddd mpich-1.2.7_p1.ebuild 4137
 SHA256 521b7ac2e307ce82a068e7c5eadfe6844a44b0e4b2be9e61f6fd90d8f1c4f171 mpich-1.2.7_p1.ebuild 4137
-MISC ChangeLog 4772 RMD160 78c1b53be81670c2da47480c48228285f91f4a0a SHA1 6b9ac5c8ceadb456f72a23060c0f3ad494fd8606 SHA256 f7e37ced02515fc0dcab5bf205c5f9712f7ec72bbe8946f533dc9a1db39a4b76
-MD5 21a7194908da12a43960166dd2002cf0 ChangeLog 4772
-RMD160 78c1b53be81670c2da47480c48228285f91f4a0a ChangeLog 4772
-SHA256 f7e37ced02515fc0dcab5bf205c5f9712f7ec72bbe8946f533dc9a1db39a4b76 ChangeLog 4772
+MISC ChangeLog 4938 RMD160 e28d835952aedcd99a3e4d19024ff944e9933d8e SHA1 9fa0529efb516f7d64006b45535797caacee8745 SHA256 ee6aae296f93982e35de4875ab86aa27794762e7dfcbd9e7b2573abf8aafca0d
+MD5 56c5f230e33991133c24d8057bac03fb ChangeLog 4938
+RMD160 e28d835952aedcd99a3e4d19024ff944e9933d8e ChangeLog 4938
+SHA256 ee6aae296f93982e35de4875ab86aa27794762e7dfcbd9e7b2573abf8aafca0d ChangeLog 4938
 MISC metadata.xml 312 RMD160 6cfe7222819f902eed7dfdb6fa48a19b7c37172e SHA1 d9e2361eabc2098c0fa0b2fe45ba7cf317ad00a2 SHA256 7cd6722fa6245eccb8afde378bb57d0ac955b778512b3bef8789f2c463884e52
 MD5 41664043c4624dedcfeeb07950f08d13 metadata.xml 312
 RMD160 6cfe7222819f902eed7dfdb6fa48a19b7c37172e metadata.xml 312
 SHA256 7cd6722fa6245eccb8afde378bb57d0ac955b778512b3bef8789f2c463884e52 metadata.xml 312
-MD5 11a56e15994b5f4fe1ae37ebde20fa50 files/digest-mpich-1.2.5.2 67
-RMD160 4098f55bbed4fe2fb9c1be9b1670bbc9d6a60826 files/digest-mpich-1.2.5.2 67
-SHA256 a7ab882f80249294519f111e9472601f58efca7fa48b7ef5c56743268d257a43 files/digest-mpich-1.2.5.2 67
-MD5 049b041ef984698a3827b0f24e11669e files/digest-mpich-1.2.6-r4 65
-RMD160 762aed64c637f0e4f1363b29660a2122fb39b9bb files/digest-mpich-1.2.6-r4 65
-SHA256 376d47428bc061bb609189d1a6cc70415b7f1ab7cd3030c8be54b93ec932c076 files/digest-mpich-1.2.6-r4 65
 MD5 c1a3f274191f11f137d9094737034c8e files/digest-mpich-1.2.7_p1 247
 RMD160 0ddbea56a013988ebfeb46fa09c8b42fd865a320 files/digest-mpich-1.2.7_p1 247
 SHA256 4618da3a5753df970e71955795330bd787e71f198c86e404c80e70a5ab7190b2 files/digest-mpich-1.2.7_p1 247
diff --git a/sys-cluster/mpich/files/1.2.6-fix-romio-sandbox-breakage.patch b/sys-cluster/mpich/files/1.2.6-fix-romio-sandbox-breakage.patch
deleted file mode 100644
index 0b46f0feb4cb..000000000000
--- a/sys-cluster/mpich/files/1.2.6-fix-romio-sandbox-breakage.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN mpich-1.2.6.orig/romio/configure.in mpich-1.2.6/romio/configure.in
---- mpich-1.2.6.orig/romio/configure.in	2004-08-02 06:37:31.000000000 -0700
-+++ mpich-1.2.6/romio/configure.in	2005-02-20 23:35:18.163959288 -0800
-@@ -1621,7 +1621,7 @@
- # 
- # Make sure we remove any configuration file incase there is out-of-date data.
- # We remove the version in include in case this is a vpath build
--rm -f adio/include/romioconf.h ${use_top_srcdir}/src/mpi/romio/adio/include/romioconf.h ${use_top_srcdir}/adio/include/romioconf.h
-+rm -f adio/include/romioconf.h
- #
- # Create makefiles for all of the adio devices.  Only the ones that 
- # are active will be called by the top level ROMIO make
diff --git a/sys-cluster/mpich/files/digest-mpich-1.2.5.2 b/sys-cluster/mpich/files/digest-mpich-1.2.5.2
deleted file mode 100644
index 9a7caffa87bf..000000000000
--- a/sys-cluster/mpich/files/digest-mpich-1.2.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a7524c220eeb3f080069308bab9f487 mpich-1.2.5.2.tar.gz 12383519
diff --git a/sys-cluster/mpich/files/digest-mpich-1.2.6-r4 b/sys-cluster/mpich/files/digest-mpich-1.2.6-r4
deleted file mode 100644
index 537b23d89d79..000000000000
--- a/sys-cluster/mpich/files/digest-mpich-1.2.6-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dbf6ea0b5717bbf88851e5bd36aed644 mpich-1.2.6.tar.gz 15248688
diff --git a/sys-cluster/mpich/mpich-1.2.5.2.ebuild b/sys-cluster/mpich/mpich-1.2.5.2.ebuild
deleted file mode 100644
index 7c5d9de46fb8..000000000000
--- a/sys-cluster/mpich/mpich-1.2.5.2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/mpich-1.2.5.2.ebuild,v 1.12 2006/09/25 03:33:44 dberkholz Exp $
-
-# Set the MPICH_CONFIGURE_OPTS environment variable to change the signal
-# mpich listens on or any other custom options (#38207).
-# The default USR1 conflicts with pthreads. Options include SIGUSR2 and SIGBUS.
-# For example: MPICH_CONFIGURE_OPTS="--with-device=ch_p4:-listener_sig=SIGBUS"
-
-DESCRIPTION="MPICH - A portable MPI implementation"
-HOMEPAGE="http://www-unix.mcs.anl.gov/mpi/mpich1"
-SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
-IUSE="doc crypt"
-
-DEPEND="virtual/libc"
-RDEPEND="${DEPEND}
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )
-	!sys-cluster/lam-mpi"
-
-pkg_setup() {
-	if [ -n "${MPICH_CONFIGURE_OPTS}" ]; then
-		einfo "Custom configure options are ${MPICH_CONFIGURE_OPTS}."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	grep -FrlZ '$(P) ' . | xargs -0 sed -i -e 's/\$(P)//'
-}
-
-src_compile() {
-	local RSHCOMMAND
-
-	if use crypt; then
-		RSHCOMMAND="ssh -x"
-	else
-		RSHCOMMAND="rsh"
-	fi
-
-	export RSHCOMMAND
-
-	local myconf="${myconf} ${MPICH_CONFIGURE_OPTS}"
-
-	./configure \
-		${myconf} \
-		--mandir=/usr/share/man \
-		--prefix=/usr || die
-	make || die
-}
-
-src_install() {
-	dodir /usr/sbin
-
-	# mpich install process is really weird, need to do some hand work perhaps
-
-	# to skip installation of man pages, uncomment following line
-	# export MPIINSTALL_OPTS=-noman
-
-	./bin/mpiinstall -echo -prefix=${D}/usr || die
-
-	if use doc; then
-		dodir /usr/share/doc/${PF}
-		mv ${D}/usr/doc/* ${D}/usr/share/doc/${PF}
-	fi
-	rm -rf ${D}/usr/doc/
-
-	dodir /etc/mpich
-	mv ${D}/usr/etc/* ${D}/etc/mpich/
-	rmdir ${D}/usr/etc/
-
-	dodir /usr/share/${PN}
-	mv ${D}/usr/examples ${D}/usr/share/${PN}/examples1
-	mv ${D}/usr/share/examples ${D}/usr/share/${PN}/examples2
-
-	# rm -rf ${D}/usr/local
-	rm -f ${D}/usr/man/mandesc
-
-	mv ${D}/usr/share/{machines*,jumpshot-3,Makefile.sample,upshot} ${D}/usr/share/${PN}
-
-	dodoc COPYRIGHT README
-	use doc && \
-		mv ${D}/usr/www ${D}/usr/share/doc/${PF}/html || \
-			rm -rf ${D}/usr/www
-
-	# Dont let users deinstall without portage
-	rm ${D}/usr/sbin/mpiuninstall
-
-	# We dont have a real DESTDIR, so we have to fix all the files
-	dosed /usr/bin/mpirun /usr/bin/mpiman /usr/sbin/tstmachines
-	dosed /usr/sbin/chkserv /usr/sbin/chp4_servs
-	dosed /usr/bin/mpicc /usr/bin/mpiCC /usr/bin/logviewer
-	dosed /usr/bin/mpireconfig /usr/bin/mpireconfig.dat
-	dosed /usr/bin/mpereconfig /usr/bin/mpereconfig.dat
-
-	dosed /usr/share/mpich/examples1/Makefile
-	dosed /usr/share/mpich/examples2/Makefile
-	dosed /usr/share/mpich/jumpshot-3/bin/jumpshot
-	dosed /usr/share/mpich/jumpshot-3/bin/slog_print
-	dosed /usr/share/mpich/Makefile.sample
-	dosed /usr/share/mpich/upshot/bin/upshot
-
-	# those are dangling symlinks
-	rm -f \
-		${D}/usr/share/mpich/examples1/mpirun \
-		${D}/usr/share/mpich/examples2/mpirun
-
-	mv ${D}/usr/man ${D}/usr/share/man
-
-	#FIXME: Here, we should either clean the empty directories
-	# or use keepdir to make sure they stick around.
-}
diff --git a/sys-cluster/mpich/mpich-1.2.6-r4.ebuild b/sys-cluster/mpich/mpich-1.2.6-r4.ebuild
deleted file mode 100644
index 637d2c2ee585..000000000000
--- a/sys-cluster/mpich/mpich-1.2.6-r4.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/mpich-1.2.6-r4.ebuild,v 1.3 2006/09/25 03:33:44 dberkholz Exp $
-
-inherit eutils
-
-# Set the MPICH_CONFIGURE_OPTS environment variable to change the signal
-# mpich listens on or any other custom options (#38207).
-# The default USR1 conflicts with pthreads. Options include SIGUSR2 and SIGBUS.
-# For example: MPICH_CONFIGURE_OPTS="--with-device=ch_p4:-listener_sig=SIGBUS"
-
-DESCRIPTION="MPICH - A portable MPI implementation"
-HOMEPAGE="http://www-unix.mcs.anl.gov/mpi/mpich1"
-SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~ppc64"
-IUSE="doc crypt"
-
-PROVIDE="virtual/mpi"
-DEPEND="virtual/libc
-	sys-devel/autoconf
-	sys-devel/automake
-	sys-devel/libtool"
-RDEPEND="${DEPEND}
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )
-	!virtual/mpi
-	|| ( x11-libs/libX11
-		virtual/x11 )"
-
-pkg_setup() {
-	if [ -n "${MPICH_CONFIGURE_OPTS}" ]; then
-		einfo "Custom configure options are ${MPICH_CONFIGURE_OPTS}."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	grep -FrlZ '$(P) ' . | xargs -0 sed -i -e 's/\$(P)//'
-
-	# Fix broken romio
-	epatch ${FILESDIR}/${PV}-fix-romio-sandbox-breakage.patch
-	cd ${S}/romio
-	rm configure
-	autoreconf --install --verbose
-}
-
-src_compile() {
-	local RSHCOMMAND
-
-	if use crypt; then
-		RSHCOMMAND="ssh -x"
-	else
-		RSHCOMMAND="rsh"
-	fi
-
-	export RSHCOMMAND
-
-	local myconf="${myconf} ${MPICH_CONFIGURE_OPTS}"
-
-	./configure \
-		${myconf} \
-		--mandir=/usr/share/man \
-		--prefix=/usr \
-		--datadir=/usr/share/mpich || die
-	emake || die
-}
-
-src_install() {
-	dodir /usr/sbin
-
-	# mpich install process is really weird, need to do some hand work perhaps
-
-	# to skip installation of man pages, uncomment following line
-	# export MPIINSTALL_OPTS=-noman
-
-	./bin/mpiinstall -echo -prefix=${D}/usr || die
-
-	if use doc; then
-		dodir /usr/share/doc/${PF}
-		mv ${D}/usr/doc/* ${D}/usr/share/doc/${PF}
-	fi
-	rm -rf ${D}/usr/doc/
-
-	dodir /etc/mpich
-	mv ${D}/usr/etc/* ${D}/etc/mpich/
-	rmdir ${D}/usr/etc/
-
-	dodir /usr/share/${PN}
-	mv ${D}/usr/examples ${D}/usr/share/${PN}/examples1
-	mv ${D}/usr/share/examples ${D}/usr/share/${PN}/examples2
-
-	# rm -rf ${D}/usr/local
-	rm -f ${D}/usr/man/mandesc
-
-	mv ${D}/usr/share/{machines*,jumpshot-3,Makefile.sample,upshot} ${D}/usr/share/${PN}
-
-	dodoc COPYRIGHT README
-	use doc && \
-		mv ${D}/usr/www ${D}/usr/share/doc/${PF}/html || \
-			rm -rf ${D}/usr/www
-
-	# Dont let users deinstall without portage
-	rm ${D}/usr/sbin/mpiuninstall
-
-	# We dont have a real DESTDIR, so we have to fix all the files
-	dosed /usr/bin/mpirun /usr/bin/mpiman /usr/sbin/tstmachines
-	dosed /usr/sbin/chkserv /usr/sbin/chp4_servs
-	dosed /usr/bin/clog2TOslog2 /usr/bin/clog2print
-	dosed /usr/bin/clogTOslog2 /usr/bin/clogprint
-	dosed /usr/bin/jumpshot /usr/bin/logconvertor
-	dosed /usr/bin/mpicc /usr/bin/mpiCC /usr/bin/logviewer
-	dosed /usr/bin/mpicxx
-	dosed /usr/bin/mpireconfig /usr/bin/mpireconfig.dat
-	dosed /usr/bin/mpereconfig /usr/bin/mpereconfig.dat
-	dosed /usr/bin/rlogTOslog2 /usr/bin/rlogprint
-	dosed /usr/bin/slog2navigator /usr/bin/slog2print
-
-	dosed /usr/share/mpich/examples1/Makefile
-	dosed /usr/share/mpich/examples2/Makefile
-	dosed /usr/share/mpich/jumpshot-3/bin/jumpshot
-	dosed /usr/share/mpich/jumpshot-3/bin/slog_print
-	dosed /usr/share/mpich/Makefile.sample
-	dosed /usr/share/mpich/upshot/bin/upshot
-
-	# Fix datadir; mpich's build system screws it up even though we pass it
-	grep -rl 'datadir=.*' ${D} \
-		| xargs sed -i -e "s:datadir=.*:datadir=/usr/share/mpich:g"
-
-	# those are dangling symlinks
-	rm -f \
-		${D}/usr/share/mpich/examples1/mpirun \
-		${D}/usr/share/mpich/examples2/mpirun
-
-	mv ${D}/usr/man ${D}/usr/share/man
-
-	#FIXME: Here, we should either clean the empty directories
-	# or use keepdir to make sure they stick around.
-}
-
-pkg_postinst() {
-	einfo "The data directory has moved from /usr/share"
-	einfo "to /usr/share/mpich."
-	einfo "Remeber to move your machines.* files."
-}