Revert multilib addition. This is not to be done until multilib and empi from the science overlay can coexist. See #541738

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x4D7043C9

3 files changed, 40 insertions, 58 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index eb9230e387f0..88b56da00525 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.132 2015/05/10 22:33:19 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.133 2015/05/12 15:05:50 jsbronder Exp $
+
+*openmpi-1.8.4-r4 (12 May 2015)
+
+  12 May 2015; Justin Bronder <jsbronder@gentoo.org> -openmpi-1.8.4-r3.ebuild,
+  +openmpi-1.8.4-r4.ebuild:
+  Revert multilib addition. This is not to be done until multilib and empi from
+  the science overlay can coexist. See #541738
 
 *openmpi-1.8.4-r3 (10 May 2015)
 
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 3103254c492a..6977825babb4 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -22,18 +22,14 @@ EBUILD openmpi-1.8.3-r1.ebuild 5157 SHA256 1d09a5c89644a96c9881802cceb8cdcb44190
 EBUILD openmpi-1.8.3.ebuild 4979 SHA256 5b616cb2a56206b96f670d1b2b64b70f25f2bc378c4907bb62327e3944ab13b1 SHA512 6936ecbdaf0fd935f378e1031edff175ec74a71c860a84f85327ee66d6b733de647232db24b9d7355dfda53c50665f3a833a4a424df6301ae49687ce72ed8e7b WHIRLPOOL 3b44fc882eb26d79163e1eaef07ab9fd1fa8a06206a9e6625a4f4bac6c28c9aec795e22f7e34f5c72b48a9c4d800389f41d4997d9fe13f3b97e35106c2119fb1
 EBUILD openmpi-1.8.4-r1.ebuild 5157 SHA256 22160e7f2b82fca297dfc564739bf7d70e37c47973868bdcbef86a0c309b85a2 SHA512 5a26bf7afb33aaa1be1920723f94ab89291bd507857dc9fa6a2bf8b9305621af4f63e40b19019a097315bd4fdf8505ae473dcea7940a19b18c77ab22ced4c39e WHIRLPOOL 1179eabc0445a5b7b1135d2c47a71c061bcc143f2a4dec16606ba3e4266a65730877dbae14b56f22702eb8f6bba0cb6cdcd674d3845494d607385a2a56b9ee77
 EBUILD openmpi-1.8.4-r2.ebuild 5149 SHA256 9707078b5e1b97af59fe4c2729e1dfa648b93571733a8a21d45a94a105c39163 SHA512 097c8eca8da7e5c83d35d2ca9bb375875dd94b8df30c6569e6dcfcbea1f952ce6c630fa9e04c27051e81a42721a9565f948007233a84d9a22e0744d3a81cce5c WHIRLPOOL 5a5f5e74e5b1cb5a6d97ae1a4182a1115ad9448635c9dc50af6d3b6818afdf9aa66e958ebff77d42a3df40e74b3a211fad88ed558ee2664fd27e15d2d38e945f
-EBUILD openmpi-1.8.4-r3.ebuild 6144 SHA256 d7b0ebd0d0fa17f2ed0be1b28ff01fac4be4e9acdbb9ab72dd6d22d087008b48 SHA512 5ff4b8f1b3e63cfd56062da07c1c4467aa1088662e090cbea629a6936f63029ef65c5de95c72540817a1cf5c4bb01cc6b71cf2a6fc5e2792b5d98ffa9c65e72e WHIRLPOOL c66b9e49ce54d3601180c9a47fd35bb5d2243cfb0fbcbbbd16b6489d21d8141272ed5e349852800c03b8d437575d0ff4242464d03d251a1e5ec19be944f29ab9
+EBUILD openmpi-1.8.4-r4.ebuild 5149 SHA256 3997ee7b53835bfdf1a4a6ad0a854b86c6d2d7e1057919be4c6b575b971ae19a SHA512 ab5dc80ecc43bd7bfc30671a015703c0686158fe706658d921fa86f8fb560ec3f34c7871d9f67d3aff5faab551935a0f628ef5c8462f4b6c14d935aea33fdae5 WHIRLPOOL b8888e033431a9e228507e7761d836f2a3c96d3a461936f04b214ca627c33c1af2cc119e2c5f8ff9d6c01c4fa7bd57d78ec37fe736ca071ffc5e085cbfccf29c
 EBUILD openmpi-1.8.4.ebuild 4979 SHA256 b9e45c3090560081a913f42420919df29647b00215571b364296a97667c502cb SHA512 409f2a6419fc2000c8575d17893a4bc6b18c1b1c7c8984e222c3c1c602ac8c06a712b4f54892d468307cf7aa801696f66d4b558c9a1ab490b1726045792eb676 WHIRLPOOL c935ce298c4f5c84bc5391dbdf8811c579ed3db198f9bdb400ef5ec3c2c6339dfac463b86b92b1824e962296b6fc18090a7123be48f00de0ba30a2439ad410a7
-MISC ChangeLog 20846 SHA256 bca2dbe881acb27b70e020ea58bbc21fc4be7e1cca8e15e826f5883178110d18 SHA512 72b0fad9fda5635494575c855f6dd9897fa7f7477c93ebf5df3ece1b25eea576b491b0af7bfb1bcd9bbad9e8fbb78ba2c0bd5cfb64f8d493cae3cc0a6b888a1e WHIRLPOOL c0c6a6ec3dbc220790c5cb8b620199fe3bb72d9a17858f6a12e23540390faaa98d2f584febff289a8749452945787f96f5ae19dccec35645f19fa105cc93b891
+MISC ChangeLog 21117 SHA256 0e8ba8e35dbb4ac0175bd4ad3a7def2a803904c042e0a979710fe2d5b8c0a2df SHA512 13b7414f21b4c19e57f956257d8bf4bc3b9f946ca95c5d630876be4b06fea8986061907f4a18ba8bf38a575ff093decc6f491a3b67828dba12337750a1386646 WHIRLPOOL d639deaa384ece9b5209880bdddfce239fce6da25645f50271d0bd683743c30d27921b792f2113117e1e34d51844d4e6426a00f8191f2f76427de0556228edd2
 MISC metadata.xml 791 SHA256 9edc79c0dc5999563fa3840cbba64de2b7061b7aa15fb62b7525944578f0b270 SHA512 0ec140f99b9ece69950b5d9cd283a097b3e4d6962b4c7941343b0eea1a914edf53b9ddfeb8bc2a8cc920219cf8e674b07370a0446136b1f9b416614acbcb97f6 WHIRLPOOL 761b3e76edadd1b7066937c3c9b93ae09c3c224dbf4b1da3771a218d54b92354e86adfa8dc945da049206f1e9b885653a12fd19342a7966ed3458a89df7f54ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVT9ywAAoJEOeBhlrCAAWGbpUIAKIEdZrT4WqL+bGyGP9YbtvD
-TsiZ1pCGcYu+8teWzLdju/6d3Z1OAASwzrhh10IeYyBmV5rcjCf5vO99VpJ5CJui
-guoPtAnOD7ed8T7C6hfXSx3Uv6ijcG9Bk6pPrfluYWX1VtGRNdPsI0HskIchhfET
-6LlHB6Oat5vy+LXclN5NZl713Esva/A/8JpohBB1siH1TyjI2I0E7pDxkRkesZmC
-rWznGZMsrqViRYFH9qYFkgMvEpSsuv36cQO92Yk8QNXHNoRmP1J19mTy3GzNZ34R
-VKrn+nHxYSQfodl0qTD17nVJ5a0DZO/pQPmXTkPwOsvc2lzh905dqPQd4qivkqs=
-=D+hu
+iEYEAREIAAYFAlVSFukACgkQ4MrvBE1wQ8mEpQCdHsi0WylBByPR84apY09qP/Sj
+L2EAnR1UroO+Ow+j47nctPguTr+tk88n
+=2ClJ
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r3.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
index b5551773987c..e84b2b554f2f 100644
--- a/sys-cluster/openmpi/openmpi-1.8.4-r3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.4-r3.ebuild,v 1.1 2015/05/10 22:33:19 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild,v 1.1 2015/05/12 15:05:50 jsbronder Exp $
 
 EAPI=5
 
 FORTRAN_NEEDED=fortran
 
-inherit autotools cuda eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator multilib-minimal
+inherit autotools cuda eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -54,16 +54,15 @@ MPI_UNCLASSED_DEP_STR="
 		!app-text/lcdf-typetools
 	)"
 
-# dev-util/nvidia-cuda-toolkit is always multilib
 RDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
-	>=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}]
-	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=sys-apps/hwloc-1.10.0-r2[${MULTILIB_USEDEP},numa?]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
+	dev-libs/libevent
+	dev-libs/libltdl:0
+	>=sys-apps/hwloc-1.9.1[numa?]
+	sys-libs/zlib
+	cuda? ( dev-util/nvidia-cuda-toolkit )
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
 	openmpi_fabrics_ofed? ( sys-infiniband/ofed )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
@@ -75,10 +74,6 @@ RDEPEND="
 	"
 DEPEND="${RDEPEND}"
 
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/mpi.h
-)
-
 pkg_setup() {
 	fortran-2_pkg_setup
 
@@ -111,7 +106,7 @@ src_prepare() {
 	AT_M4DIR=config eautoreconf
 }
 
-multilib_src_configure() {
+src_configure() {
 	local myconf=(
 		--sysconfdir="${EPREFIX}/etc/${PN}"
 		--enable-pretty-print-stacktrace
@@ -125,7 +120,7 @@ multilib_src_configure() {
 			--enable-opal-multi-threads)
 	fi
 
-	if multilib_is_native_abi && use fortran; then
+	if use fortran; then
 		myconf+=(--enable-mpi-fortran=all)
 	else
 		myconf+=(--enable-mpi-fortran=no)
@@ -133,59 +128,43 @@ multilib_src_configure() {
 
 	! use vt && myconf+=(--enable-contrib-no-build=vt)
 
-	ECONF_SOURCE=${S} econf "${myconf[@]}" \
+	econf "${myconf[@]}" \
 		$(use_enable cxx mpi-cxx) \
 		$(use_with cma) \
 		$(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
 		$(use_enable romio io-romio) \
 		$(use_enable heterogeneous) \
 		$(use_enable ipv6) \
-		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
-		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
-		$(multilib_native_use_with openmpi_fabrics_open-mx mx "${EPREFIX}"/usr) \
-		$(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
-		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
-		$(multilib_native_use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
-		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
-		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
-		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
-		$(multilib_native_use_enable openmpi_ofed_features_failover btl-openib-failover) \
-		$(multilib_native_use_with openmpi_rm_pbs tm) \
-		$(multilib_native_use_with openmpi_rm_slurm slurm)
+		$(use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
+		$(use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
+		$(use_with openmpi_fabrics_open-mx mx "${EPREFIX}"/usr) \
+		$(use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
+		$(use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
+		$(use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
+		$(use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
+		$(use_enable openmpi_ofed_features_udcm openib-udcm) \
+		$(use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
+		$(use_enable openmpi_ofed_features_failover btl-openib-failover) \
+		$(use_with openmpi_rm_pbs tm) \
+		$(use_with openmpi_rm_slurm slurm)
 }
 
-multilib_src_install() {
+src_install () {
 	emake DESTDIR="${D}" install
 
-	# Remove la files, no static libs are installed and we have pkg-config
-	find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete
-
-	# fortran header cannot be wrapped (bug #540508), workaround part 1
-	if multilib_is_native_abi && use fortran; then
-		mkdir "${T}"/fortran || die
-		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
-	else
-		#some fortran files get installed unconditionally 
-		rm "${ED}"/usr/include/mpif* "${ED}"/usr/bin/mpif* || die
-	fi
-}
-
-multilib_src_install_all() {
 	# From USE=vt see #359917
 	rm "${ED}"/usr/share/libtool &> /dev/null
 
-	# fortran header cannot be wrapped (bug #540508), workaround part 2
-	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
-	fi
-
 	# Avoid collisions with libevent
 	rm -rf "${ED}"/usr/include/event2 &> /dev/null
 
+	# Remove la files, no static libs are installed and we have pkg-config
+	find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete
+
 	dodoc README AUTHORS NEWS VERSION || die
 }
 
-multilib_src_test() {
+src_test() {
 	# Doesn't work with the default src_test as the dry run (-n) fails.
 	emake -j1 check
 }