ppc64 stable wrt #337129, drop old.

Package-Manager: portage-2.1.9.25/cvs/Linux ppc64

4 files changed, 8 insertions, 110 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 07a91c837e08..8e1521e4025f 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.78 2011/01/10 18:46:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.79 2011/01/14 08:06:47 xarthisius Exp $
+
+  14 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> openmpi-1.4.2.ebuild:
+  ppc64 stable wrt #337129, drop old.
 
   10 Jan 2011; Brent Baude <ranger@gentoo.org> openmpi-1.4.2.ebuild:
   stable ppc, bug 337129
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 7166b73422ca..1e7a7cbe3606 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,9 +1,7 @@
 AUX openmpi-1.4.1-r22513.patch 2460 RMD160 94c6ca7c7d869039e73f1dbd5402ccd0d5949f11 SHA1 a924c63a94546f25a25beb15328ff2ee18c388e8 SHA256 083528f3ccdda8e1654accd5a6d3c79231d7d727cbd1f05293d7850a32503379
-DIST openmpi-1.4.1.tar.bz2 6571835 RMD160 c6fd5f0871eb5f963fe58270f5340a2629f5fd68 SHA1 c5107c03a9fc738dfb4f309b470d052becfdde19 SHA256 d4d71d7c670d710d2d283ea60af50d6c315318a4c35ec576bedfd0f3b7b8c218
 DIST openmpi-1.4.2.tar.bz2 6630550 RMD160 2c9fbcc8f77e7fa28e2bd062875d484548cc0b79 SHA1 3e85092433d0e399cc7a51c018f9d13562f78b80 SHA256 19129e3d51860ad0a7497ede11563908ba99c76b3a51a4d0b8801f7e2db6cd80
 DIST openmpi-1.4.3.tar.bz2 6626909 RMD160 087532de57244c03941421162caa9e5537b4eba1 SHA1 9d24b6969d73605904855eb32d40d6b07e231932 SHA256 220b72b1c7ee35469ff74b4cfdbec457158ac6894635143a33e9178aa3981015
-EBUILD openmpi-1.4.1.ebuild 2768 RMD160 5b869bce60a28b07d0450c7a6eedb1035314fff0 SHA1 0319c6d8bcf99490470849fae89c5222ed9d80d1 SHA256 5fe3e09881685fbea8a53a5c8b61a6e04c929906eecd606210ba93328578f6d1
-EBUILD openmpi-1.4.2.ebuild 2680 RMD160 47a5ad3afb7ded91c57a0b8e299aa0104855d386 SHA1 95c0d679e4d437daea80812735e14ba3b111e516 SHA256 c1b80aaeef5999956fc93e55898a1a7694eefe3ef0b94f80a78f89dcd96edbf0
+EBUILD openmpi-1.4.2.ebuild 2683 RMD160 1fa28fcc29d206863e53afbeb94361fb83bae838 SHA1 09667c585460b3c24e8c7ad3528974a4d9570d55 SHA256 ee2cbd0f9a06a4b2a8cca69688bdb0ed2227db37338298c5503e19afc338c501
 EBUILD openmpi-1.4.3.ebuild 2665 RMD160 76459948b7b66a5eba9ac01525c14f5ce17e1fa2 SHA1 6c88fb292784d793af1203102542bb306cd1521b SHA256 507ee632b0dd5d7274d41912a55dd070daccb1c1d78012abf5daa366b2461361
-MISC ChangeLog 11885 RMD160 98889678a4f62fc651c89bcf8c0f9fded64e02b2 SHA1 f02454f7495279fe292aa8242d173ee21cb2ae68 SHA256 c71f84587a78b9b5155509f73cec8266bf4a0d5fd4652919bd7df573d07456a4
+MISC ChangeLog 12004 RMD160 58820d5b0df9cc1dd9c06b3bfbc5b3817edb36d2 SHA1 772bda64c97c9c7b299af40645bd60165ad4c6e3 SHA256 412c4514a0ecd2f2cde0bd4008aa597e825331558ecc2999283170b07c59822b
 MISC metadata.xml 597 RMD160 460d07513dd43e74dcb1b8654d7952e8ce02f9ca SHA1 49f72060bb7b3e35020affbe574c09251c896b7f SHA256 a366b9394dfb038cf8913c7710395ea5d38609b268361320cb64346ca413e18a
diff --git a/sys-cluster/openmpi/openmpi-1.4.1.ebuild b/sys-cluster/openmpi/openmpi-1.4.1.ebuild
deleted file mode 100644
index b8e995df074d..000000000000
--- a/sys-cluster/openmpi/openmpi-1.4.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.1.ebuild,v 1.14 2010/12/19 18:20:46 jlec Exp $
-
-EAPI=2
-inherit eutils multilib flag-o-matic toolchain-funcs
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="http://www.open-mpi.org"
-SRC_URI="http://www.open-mpi.org/software/ompi/v1.4/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-RESTRICT="mpi-threads? ( test )"
-KEYWORDS="alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="+cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads pbs romio threads vt"
-RDEPEND="pbs? ( sys-cluster/torque )
-	vt? (
-		!dev-libs/libotf
-		!app-text/lcdf-typetools
-	)
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
-	!sys-cluster/mpich
-	!sys-cluster/lam-mpi
-	!sys-cluster/mpich2
-	!sys-cluster/mpiexec"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if use mpi-threads; then
-		echo
-		ewarn "WARNING: use of MPI_THREAD_MULTIPLE is still disabled by"
-		ewarn "default and officially unsupported by upstream."
-		ewarn "You may stop now and set USE=-mpi-threads"
-		echo
-		epause 5
-	fi
-
-	echo
-	elog "OpenMPI has an overwhelming count of configuration options."
-	elog "Don't forget the EXTRA_ECONF environment variable can let you"
-	elog "specify configure options if you find them necessary."
-	echo
-}
-
-src_prepare() {
-	# Necessary for scalibility, see
-	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
-	if use threads; then
-		echo 'oob_tcp_listen_mode = listen_thread' \
-			>> opal/etc/openmpi-mca-params.conf
-	fi
-
-	# https://svn.open-mpi.org/trac/ompi/ticket/2201
-	epatch "${FILESDIR}"/${P}-r22513.patch
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir=/etc/${PN}
-		--without-xgrid
-		--enable-pretty-print-stacktrace
-		--enable-orterun-prefix-by-default
-		--without-slurm)
-
-	if use mpi-threads; then
-		myconf+=(--enable-mpi-threads
-			--enable-progress-threads)
-	fi
-
-	if use fortran; then
-		if [[ $(tc-getFC) =~ g77 ]]; then
-			myconf+=(--disable-mpi-f90)
-		elif [[ $(tc-getFC) =~ if ]]; then
-			# Enabled here as gfortran compile times are huge with this enabled.
-			myconf+=(--with-mpi-f90-size=medium)
-		fi
-	else
-		myconf+=(--disable-mpi-f90 --disable-mpi-f77)
-	fi
-
-	! use vt && myconf+=(--enable-contrib-no-build=vt)
-
-	econf "${myconf[@]}" \
-		$(use_enable cxx mpi-cxx) \
-		$(use_enable romio io-romio) \
-		$(use_enable heterogeneous) \
-		$(use_with pbs tm) \
-		$(use_enable ipv6)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README AUTHORS NEWS VERSION || die
-}
-
-src_test() {
-	# Doesn't work with the default src_test as the dry run (-n) fails.
-	cd "${S}"
-	emake -j1 check || die "emake check failed"
-}
diff --git a/sys-cluster/openmpi/openmpi-1.4.2.ebuild b/sys-cluster/openmpi/openmpi-1.4.2.ebuild
index 42a0ffc1bd08..e89705098d42 100644
--- a/sys-cluster/openmpi/openmpi-1.4.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.2.ebuild,v 1.13 2011/01/10 18:46:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.2.ebuild,v 1.14 2011/01/14 08:06:47 xarthisius Exp $
 
 EAPI=3
 inherit eutils multilib flag-o-matic toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="http://www.open-mpi.org/software/ompi/v1.4/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 RESTRICT="mpi-threads? ( test )"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads pbs romio threads vt"
 RDEPEND="pbs? ( sys-cluster/torque )
 	vt? (