Minor fixes to sys-cluster/openmpi-1.2.4, thanks to dberkholz for pointing them out.

Package-Manager: portage-2.1.3.19

3 files changed, 32 insertions, 13 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 0a02142f04d5..6bb79bd76713 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.10 2007/12/13 02:10:15 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.11 2007/12/13 22:39:53 jsbronder Exp $
+
+  13 Dec 2007; Justin Bronder <jsbronder@gentoo.org> openmpi-1.2.4.ebuild:
+  Minor fixes to sys-cluster/openmpi-1.2.4, thanks to dberkholz for pointing
+  them out.
 
 *openmpi-1.2.4 (13 Dec 2007)
 
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 479624c3609a..bf3376827ef3 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -9,14 +9,14 @@ EBUILD openmpi-1.1.2.ebuild 1895 RMD160 3cc617c1ebc26bf6075e5324de4749a64730587b
 MD5 edd67161c0e800ba443382fdce1ed06e openmpi-1.1.2.ebuild 1895
 RMD160 3cc617c1ebc26bf6075e5324de4749a64730587b openmpi-1.1.2.ebuild 1895
 SHA256 efc6d17a52e7e2e2636b2fef22d72795c0bc13ef3073814f5c2993b6419ea49b openmpi-1.1.2.ebuild 1895
-EBUILD openmpi-1.2.4.ebuild 1867 RMD160 38e19f1e9aea2a025cfef61990538636db069778 SHA1 322a5d88d3d5353c83088bf42fe1e52c33f0dd2d SHA256 11235f847a6237d8367e5441af489b688a379b0cff4751aca56b71c51071b60d
-MD5 08bb7b1e86244b0494f63dab84df24f5 openmpi-1.2.4.ebuild 1867
-RMD160 38e19f1e9aea2a025cfef61990538636db069778 openmpi-1.2.4.ebuild 1867
-SHA256 11235f847a6237d8367e5441af489b688a379b0cff4751aca56b71c51071b60d openmpi-1.2.4.ebuild 1867
-MISC ChangeLog 2730 RMD160 8070fef8e8f66fab96446b44af7b34fa86751d76 SHA1 f27e10d02c88f2933144a42c823488e97ad48e90 SHA256 b9dbd73062ab465d600284466545786ab8ee0ce8f65608dc41df7a911f78700a
-MD5 ff9e5005cab2ee631e072d0f7623fd2b ChangeLog 2730
-RMD160 8070fef8e8f66fab96446b44af7b34fa86751d76 ChangeLog 2730
-SHA256 b9dbd73062ab465d600284466545786ab8ee0ce8f65608dc41df7a911f78700a ChangeLog 2730
+EBUILD openmpi-1.2.4.ebuild 2251 RMD160 389f6d3beb864514e7525cd0fdaa8e40bebe50fe SHA1 b4abcc25fba2cf461780f7c066a648b9b09ab353 SHA256 c7458ac4ef1fed4371152f427b76f2fb07e2945bc08b2afa0e5f1035caf78fe4
+MD5 7fca270b6ad34098e61db3b32477f8d1 openmpi-1.2.4.ebuild 2251
+RMD160 389f6d3beb864514e7525cd0fdaa8e40bebe50fe openmpi-1.2.4.ebuild 2251
+SHA256 c7458ac4ef1fed4371152f427b76f2fb07e2945bc08b2afa0e5f1035caf78fe4 openmpi-1.2.4.ebuild 2251
+MISC ChangeLog 2895 RMD160 590b8d0046a0393a3f8a8d8de7c0635bcf66e0c6 SHA1 44f0638aaeb6abe973b4fb280e5043d4aa8a0ae6 SHA256 b1adf10f324ba88a670106bb53a5da85f31a976fb9107f50230943ff557aad68
+MD5 e2773e3e127b097d3f60cd8c81e407a8 ChangeLog 2895
+RMD160 590b8d0046a0393a3f8a8d8de7c0635bcf66e0c6 ChangeLog 2895
+SHA256 b1adf10f324ba88a670106bb53a5da85f31a976fb9107f50230943ff557aad68 ChangeLog 2895
 MISC metadata.xml 163 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 SHA1 443b7a3d8fb76c8d20647b165032ad358bfa3b6a SHA256 5a03bf3074b07158dffe793af69f7b0cd1e5c785537574713f9a7978032363a3
 MD5 6be723a646638c71a36096e65e6ef8f0 metadata.xml 163
 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 metadata.xml 163
diff --git a/sys-cluster/openmpi/openmpi-1.2.4.ebuild b/sys-cluster/openmpi/openmpi-1.2.4.ebuild
index a0c8e49f3c5c..941ee0c71e7d 100644
--- a/sys-cluster/openmpi/openmpi-1.2.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.2.4.ebuild,v 1.1 2007/12/13 02:10:15 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.2.4.ebuild,v 1.2 2007/12/13 22:39:53 jsbronder Exp $
 
 inherit eutils multilib flag-o-matic toolchain-funcs fortran
 
@@ -21,6 +21,21 @@ RDEPEND="pbs? ( sys-cluster/torque )
 DEPEND="${RDEPEND}"
 
 pkg_setup() {
+	if use threads; then
+		ewarn
+		ewarn "WARNING: use of threads is still disabled by default in"
+		ewarn "upstream builds."
+		ewarn "You may stop now and set USE=-threads"
+		ewarn
+		epause 5
+	fi
+
+	elog
+	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."
+	elog
+
 	if use fortran; then
 		FORTRAN="g77 gfortran ifc"
 		fortran_pkg_setup
@@ -41,7 +56,7 @@ src_compile() {
 			--with-threads=posix"
 	fi
 
-	if [[ -n "${FORTRANC}" ]]; then
+	if use fortran; then
 		if [[ "${FORTRANC}" = "g77" ]]; then
 			myconf="${myconf} --disable-mpi-f90"
 		elif [[ "${FORTRANC}" = "gfortran" ]]; then
@@ -58,7 +73,7 @@ src_compile() {
 		$(use_enable !nocxx mpi-cxx) \
 		$(use_enable romio romio-io) \
 		$(use_enable smp smp-locks) \
-		$(use_enable heterogeneous heterogeneous) \
+		$(use_enable heterogeneous) \
 		$(use_with pbs tm /usr/$(get_libdir)/pbs) \
 		$(use_with slurm) \
 		$(use_enable ipv6) \
@@ -68,6 +83,6 @@ src_compile() {
 }
 
 src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc README AUTHORS NEWS VERSION
 }