Fixed paths. Closes #98038. Cleaned out old ebuilds.

(Portage version: 2.0.51.22-r2)

8 files changed, 23 insertions, 276 deletions

diff --git a/sys-cluster/mpich/ChangeLog b/sys-cluster/mpich/ChangeLog
index fde058034ecf..6f96004f55bd 100644
--- a/sys-cluster/mpich/ChangeLog
+++ b/sys-cluster/mpich/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/mpich
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/ChangeLog,v 1.20 2005/07/05 23:02:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/ChangeLog,v 1.21 2005/09/05 13:48:40 tantive Exp $
+
+*mpich-1.2.6-r3 (05 Sep 2005)
+
+  05 Sep 2005; Michael Imhof <tantive@gentoo.org> -mpich-1.2.6.ebuild,
+  -mpich-1.2.6-r1.ebuild, -mpich-1.2.6-r2.ebuild, +mpich-1.2.6-r3.ebuild:
+  Fixed paths. Closes #98038. Cleaned out old ebuilds.
 
 *mpich-1.2.6-r2 (05 Jul 2005)
 
diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index 95676f0b1f2d..555dd796636e 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -1,11 +1,13 @@
-MD5 98a487c171803a3afbb88e803d5fb8ff mpich-1.2.5.2.ebuild 3168
-MD5 94630f033bba2c536fca46bce7367ae7 mpich-1.2.6-r2.ebuild 3587
+MD5 f81d7bbbcc06a9e81d3c0c075cb09d6f mpich-1.2.6-r3.ebuild 3851
 MD5 46459e79277b4b34741b29ec919f2c24 mpich-1.2.6-r1.ebuild 3575
-MD5 17b0d0810cd7241bbb236ae64bf69598 mpich-1.2.6.ebuild 3386
-MD5 a83690e4697dfd072a8ea7e131532a94 ChangeLog 2646
 MD5 41664043c4624dedcfeeb07950f08d13 metadata.xml 312
-MD5 049b041ef984698a3827b0f24e11669e files/digest-mpich-1.2.6 65
-MD5 11a56e15994b5f4fe1ae37ebde20fa50 files/digest-mpich-1.2.5.2 67
-MD5 e878381a3b6165630ef1a8b3989076c8 files/1.2.6-fix-romio-sandbox-breakage.patch 690
+MD5 94630f033bba2c536fca46bce7367ae7 mpich-1.2.6-r2.ebuild 3587
+MD5 a83690e4697dfd072a8ea7e131532a94 ChangeLog 2646
+MD5 17b0d0810cd7241bbb236ae64bf69598 mpich-1.2.6.ebuild 3386
+MD5 98a487c171803a3afbb88e803d5fb8ff mpich-1.2.5.2.ebuild 3168
 MD5 049b041ef984698a3827b0f24e11669e files/digest-mpich-1.2.6-r1 65
+MD5 e878381a3b6165630ef1a8b3989076c8 files/1.2.6-fix-romio-sandbox-breakage.patch 690
+MD5 11a56e15994b5f4fe1ae37ebde20fa50 files/digest-mpich-1.2.5.2 67
+MD5 049b041ef984698a3827b0f24e11669e files/digest-mpich-1.2.6 65
 MD5 049b041ef984698a3827b0f24e11669e files/digest-mpich-1.2.6-r2 65
+MD5 049b041ef984698a3827b0f24e11669e files/digest-mpich-1.2.6-r3 65
diff --git a/sys-cluster/mpich/files/digest-mpich-1.2.6-r1 b/sys-cluster/mpich/files/digest-mpich-1.2.6-r1
deleted file mode 100644
index 537b23d89d79..000000000000
--- a/sys-cluster/mpich/files/digest-mpich-1.2.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dbf6ea0b5717bbf88851e5bd36aed644 mpich-1.2.6.tar.gz 15248688
diff --git a/sys-cluster/mpich/files/digest-mpich-1.2.6-r2 b/sys-cluster/mpich/files/digest-mpich-1.2.6-r2
deleted file mode 100644
index 537b23d89d79..000000000000
--- a/sys-cluster/mpich/files/digest-mpich-1.2.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dbf6ea0b5717bbf88851e5bd36aed644 mpich-1.2.6.tar.gz 15248688
diff --git a/sys-cluster/mpich/files/digest-mpich-1.2.6 b/sys-cluster/mpich/files/digest-mpich-1.2.6-r3
index 537b23d89d79..537b23d89d79 100644
--- a/sys-cluster/mpich/files/digest-mpich-1.2.6
+++ b/sys-cluster/mpich/files/digest-mpich-1.2.6-r3
diff --git a/sys-cluster/mpich/mpich-1.2.6-r1.ebuild b/sys-cluster/mpich/mpich-1.2.6-r1.ebuild
deleted file mode 100644
index 031f7ce5f7dc..000000000000
--- a/sys-cluster/mpich/mpich-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2005 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-r1.ebuild,v 1.1 2005/05/24 23:29:04 spyderous 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/mpich"
-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"
-
-DEPEND="virtual/libc
-	sys-devel/autoconf
-	sys-devel/automake
-	sys-devel/libtool"
-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)//'
-
-	# 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
-	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
-	prepallman
-
-	#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."
-}
diff --git a/sys-cluster/mpich/mpich-1.2.6-r2.ebuild b/sys-cluster/mpich/mpich-1.2.6-r3.ebuild
index 7ec3503a474a..033d980a1d07 100644
--- a/sys-cluster/mpich/mpich-1.2.6-r2.ebuild
+++ b/sys-cluster/mpich/mpich-1.2.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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-r2.ebuild,v 1.1 2005/07/05 23:02:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/mpich-1.2.6-r3.ebuild,v 1.1 2005/09/05 13:48:40 tantive Exp $
 
 inherit eutils
 
@@ -107,9 +107,15 @@ src_install() {
 	# 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
diff --git a/sys-cluster/mpich/mpich-1.2.6.ebuild b/sys-cluster/mpich/mpich-1.2.6.ebuild
deleted file mode 100644
index 440fac82cfd8..000000000000
--- a/sys-cluster/mpich/mpich-1.2.6.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2005 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.ebuild,v 1.2 2005/05/03 18:40:07 omkhar 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/mpich"
-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"
-
-DEPEND="virtual/libc
-	sys-devel/autoconf
-	sys-devel/automake
-	sys-devel/libtool"
-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)//'
-
-	# 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 || 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
-	prepallman
-
-	#FIXME: Here, we should either clean the empty directories
-	# or use keepdir to make sure they stick around.
-}