Reverting changes by nerdboy.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

2 files changed, 0 insertions, 273 deletions

diff --git a/sys-cluster/mpich2/files/mpich2-1.0.8-no-pvfs2.patch b/sys-cluster/mpich2/files/mpich2-1.0.8-no-pvfs2.patch
deleted file mode 100644
index 6e8b4403288f..000000000000
--- a/sys-cluster/mpich2/files/mpich2-1.0.8-no-pvfs2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/mpi/romio/configure.orig	2009-09-14 17:30:33.267403501 -0700
-+++ src/mpi/romio/configure	2009-09-14 17:39:40.079654437 -0700
-@@ -2033,6 +2033,12 @@
- # Check whether --with-pvfs2 was given.
- if test "${with_pvfs2+set}" = set; then
-   withval=$with_pvfs2;
-+  if test "x$withval" = "xno" ; then
-+    without_pvfs2=yes
-+    with_pvfs2=""
-+  fi
-+else
-+  without_pvfs2=yes
- fi
- 
- 
-@@ -7577,11 +7583,16 @@
- 	if test -n "${with_pvfs2}" -o -n "${file_system_pvfs2}" ; then
- 		# the user either told us where pvfs is or asked for it in
- 		# --with-file-system (or both)
--		CFLAGS="$CFLAGS $( $PVFS2_CONFIG --cflags)"
--		LIBS="$LIBS $( $PVFS2_CONFIG --libs)"
--		ROMIO_LIBLIST="$ROMIO_LIBLIST $LIBS"
--		FILE_SYSTEM="pvfs2 $FILE_SYSTEM"
--		file_system_pvfs2=1
-+		if test "x$without_pvfs2" = "xyes" ; then
-+			ROMIO_LIBLIST="$ROMIO_LIBLIST $LIBS"
-+			file_system_pvfs2=0
-+		else
-+			CFLAGS="$CFLAGS $( $PVFS2_CONFIG --cflags)"
-+			LIBS="$LIBS $( $PVFS2_CONFIG --libs)"
-+			ROMIO_LIBLIST="$ROMIO_LIBLIST $LIBS"
-+			FILE_SYSTEM="pvfs2 $FILE_SYSTEM"
-+			file_system_pvfs2=1
-+		fi
- 	fi
- fi
- 
diff --git a/sys-cluster/mpich2/mpich2-1.0.8-r1.ebuild b/sys-cluster/mpich2/mpich2-1.0.8-r1.ebuild
deleted file mode 100644
index 79d994e832f9..000000000000
--- a/sys-cluster/mpich2/mpich2-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2009 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-r1.ebuild,v 1.1 2009/09/15 03:30:45 nerdboy Exp $
-
-EAPI=1
-inherit python eutils fortran autotools
-
-DESCRIPTION="MPICH2 - A portable MPI implementation"
-HOMEPAGE="http://www-unix.mcs.anl.gov/mpi/mpich2"
-SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${PV}/${P}.tar.gz"
-
-LICENSE="as-is"
-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
-	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"
-
-DEPEND="${COMMON_DEPEND}
-	sys-devel/libtool"
-
-RDEPEND="${COMMON_DEPEND}
-	net-misc/openssh"
-
-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
-
-	if use fortran ; then
-		FORTRAN="g77 gfortran ifort ifc"
-		fortran_pkg_setup
-	fi
-
-	if use mpi-threads && ! use threads; then
-		die "USE=mpi-threads requires USE=threads"
-	fi
-
-	MPD_CONF_FILE_DIR=/etc/${PN}
-	python_version
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# A lot of these patches touch Makefile.in and configure files.
-	# While it would be nice to regenerate everything, mpich2 uses
-	# simplemake instead of automake, so we're doing this for now
-	# and hoping for a receptive upstream.
-
-	# #220877
-	sed -i 's/-fpic/-fPIC/g' \
-		$(grep -lr -e '-fpic' "${S}/") || die "failed to change -fpic to -fPIC"
-
-	# Put python files in site-packages where they belong.
-	# This isn't the prettiest little patch, but it does
-	# move python files out of /usr/bin/
-	epatch "${FILESDIR}"/${P}-site-packages-py.patch
-
-	# Respect the env var MPD_CONF_FILE
-	# TODO:  Send upstream
-	epatch "${FILESDIR}"/${P}-mpdconf-env.patch
-
-	# Fix gforker instal-alt
-	# TODO:  Send upstream
-	epatch "${FILESDIR}"/${P}-gforker-install-alt-fix.patch
-
-	# We need f90 to include the directory with mods, and to
-	# fix hardcoded paths for src_test()
-	sed -i \
-		-e "s,F90FLAGS\( *\)=,F90FLAGS\1?=," \
-		-e "s,\$(bindir)/,${S}/bin/,g" \
-		-e "s,@MPIEXEC@,${S}/bin/mpiexec,g" \
-		$(find ./test/ -name 'Makefile.in') || die
-
-	# 254167, I'm pretty sure they meant srcdir in the path to remove files.
-	# TODO:  Send upstream
-	sed -i 's:scrdir:srcdir:g' "${S}"/src/pm/mpd/Makefile.in || die
-
-	# #257821, fix the pkgconfig file.
-	# TODO:  Send upstream
-	epatch "${FILESDIR}"/${P}-pkgconfig.patch
-
-	if ! use romio; then
-		# These tests in errhan/ rely on MPI::File ...which is in romio
-		echo "" > test/mpi/errors/cxx/errhan/testlist
-	fi
-
-	# #269856, detect python 2.6
-	# TODO:  Send upstream
-	epatch "${FILESDIR}"/${P}-py26.patch
-	pushd "${S}"/src/pm/mpd >/dev/null || die "Missing src/pm/mpd"
-	cat aclocal_mpd.m4 "${S}"/confdb/aclocal_subcfg.m4 > aclocal.m4
-	AT_M4DIR=${S}/confdb eautoreconf
-	popd >/dev/null
-
-	# Yes, we still need this to avoid unresolved symbols
-	# and related build errors (eg, with hdf5).
-	# TODO:  Should probably send these upstream too...
-	epatch "${FILESDIR}"/${PN}-1.0.6-shlib.patch
-	epatch "${FILESDIR}"/${PN}-1.0.6-makefile.patch
-	sed -i -e "s:-Lnerdboy::g" Makefile.in || die "sed failed"
-	if use pvfs2; then
-		sed -i -e "s:-laio:-laio -lpvfs2:g" Makefile.in \
-		    || die "sed pvfs2 failed"
-	else
-		epatch "${FILESDIR}"/${P}-no-pvfs2.patch
-	fi
-}
-
-src_compile() {
-	local c="${MPICH_CONFIGURE_OPTS} --enable-sharedlibs=gcc"
-	local romio_conf
-
-	# The configure statements can be somewhat confusing, as they
-	# don't all show up in the top level configure, however, they
-	# are picked up in the children directories.
-
-	use debug && c="${c} --enable-g=all --enable-debuginfo"
-
-	if use threads ; then
-	    c="${c} --with-thread-package=pthreads"
-	else
-	    c="${c} --with-thread-package=none"
-	fi
-
-	# enable f90 support for appropriate compilers
-	case "${FORTRANC}" in
-	    gfortran|if*)
-			c="${c} --enable-f77 --enable-f90";;
-	    g77)
-			c="${c} --enable-f77 --disable-f90";;
-	esac
-
-	if use mpi-threads; then
-		c="${c} --enable-threads=multiple"
-	else
-		c="${c} --enable-threads=single"
-	fi
-
-	if use pvfs2; then
-		# nfs and ufs are defaults in 1.0.8 at least.
-	    romio_conf="--with-file-system=pvfs2+nfs+ufs --with-pvfs2=/usr"
-	fi
-
-	c="${c} --sysconfdir=/etc/${PN}"
-	econf ${c} ${romio_conf} \
-		--docdir=/usr/share/doc/${PF} \
-		--with-pm=mpd:gforker \
-		--disable-mpe \
-		$(use_enable romio) \
-		$(use_enable cxx) \
-		|| die
-	# Oh, the irony.
-	# http://www.mcs.anl.gov/research/projects/mpich2/support/index.php?s=faqs#parmake
-	# https://trac.mcs.anl.gov/projects/mpich2/ticket/297
-	emake -j1 || die
-}
-
-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 \
-		FC="${S}"/bin/mpif77 \
-		F90="${S}"/bin/mpif90 \
-		F90FLAGS="${F90FLAGS} -I${S}/src/binding/f90/" \
-		testing
-	rc=$?
-
-	"${S}"/bin/mpdallexit || kill $(<"${T}"/mpd.pid)
-	return ${rc}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodir ${MPD_CONF_FILE_DIR}
-	insinto ${MPD_CONF_FILE_DIR}
-	doins "${FILESDIR}"/mpd.conf || die
-
-	dodir /usr/share/doc/${PF}
-	dodoc COPYRIGHT README README.romio README.testing \
-		CHANGES README.developer RELEASE_NOTES || die
-	newdoc src/pm/mpd/README README.mpd || die
-
-	if ! use doc; then
-		rm -rf "${D}"/usr/share/doc/www*
-	else
-		dodir /usr/share/doc/${PF}/www
-		mv "${D}"/usr/share/doc/www*/* "${D}"/usr/share/doc/${PF}/www/
-	fi
-
-	cp "${FILESDIR}"/${PN}.envd "${T}"/
-	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 \
-		"${D}"/usr/bin/mpdgdbdrv.py
-	newenvd "${FILESDIR}"/${PN}.envd 25mpich2
-}
-
-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
-
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
-	elog ""
-	elog "MPE2 has been removed from this ebuild and now stands alone"
-	elog "as sys-cluster/mpe2."
-	elog ""
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
-}