Explicitly support Java using the appropriate eclass. Thanks to

monsieurp for the initial patch. Fixes bug #542700.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x9C6D7DE4

3 files changed, 56 insertions, 15 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 096599dcd788..f2497816e17c 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.141 2015/08/02 09:55:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.142 2015/08/02 23:30:00 chewi Exp $
+
+*openmpi-1.8.7-r1 (02 Aug 2015)
+
+  02 Aug 2015; James Le Cuirot <chewi@gentoo.org> +openmpi-1.8.7-r1.ebuild,
+  -openmpi-1.8.7.ebuild:
+  Explicitly support Java using the appropriate eclass. Thanks to monsieurp for
+  the initial patch. Fixes bug #542700.
 
   02 Aug 2015; Pacho Ramos <pacho@gentoo.org> openmpi-1.8.4-r4.ebuild:
   sparc stable wrt bug #525534
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index ad9c2cd78837..b428b0f39e4d 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -17,13 +17,25 @@ EBUILD openmpi-1.4.5.ebuild 2698 SHA256 4326f9fe35dabb5ed4c15a35edb7389c3a35d12d
 EBUILD openmpi-1.6.5-r1.ebuild 5431 SHA256 575ea177af8bee17b60931ccc6844d4c848bac21e2f03a43e8ed40b427fee9a8 SHA512 d17724df93b14168330d0cc0e7ce8c50a306a7ce295efc11234c8c2db0e5f6187bb3ca4161be183d5487475ca134d9d1c39524ccad5bb0f336fec789c1325878 WHIRLPOOL a0548e15d30aeb97cfc81a180c4eeb1623317ad6bff78c6b1677829364761c44d26aa937782579241b2af17f7ff98510ddfeac8301fb624e64a49c5dc61be574
 EBUILD openmpi-1.7.5-r1.ebuild 5122 SHA256 a010918511cf9145a75bfcddea09924b40a9ed8c2b9919bc88a5640542fbe985 SHA512 288e111c5731b9bd0576dc4aad6aba71946541d808405cbfb9140ba9e5bf25140a025e5a13ce2cdbec4695e38ebe7fc20754959f1ff241d1b5804d826bbe8d38 WHIRLPOOL ea6c1dfc5843b008a8eb18e21e015c88b044286a5ec43bf88a59fa8cfd45dc4f5c0fe90daad753a88c779809b0f2481715c61cceb3f10bb2dd5a43d619f88245
 EBUILD openmpi-1.8.4-r4.ebuild 5156 SHA256 e2a8c899210a5459d66101a871f422370a204d44e99a81152c7e1a2d8b2484b7 SHA512 15daa5afc9f6366c94a842bd2fc4ce4fe83b18e53e16f6cfd0d4a96dd0e818d67f5e346521ecc01303dd0fcbc5c0c22111d73070a65c6aca600eea492e0f7a51 WHIRLPOOL 1b01140ca7d9570bfde6231e9d17208572b46174b419404477349e9f3038336a9abd4d91d8bf4c32c6aa025bf0c76eb61fa4a5b629a7fc44883110b65c5b4461
-EBUILD openmpi-1.8.7.ebuild 4971 SHA256 5dd4928713e7f0c06aaa60f188a35af412c4bfb7ac98d77b86235e54f2afeaa4 SHA512 3f18f2ede4b83ed574f9174adf8565aacb5aa257ef3c8d94d76c2b39526e6f0b2526b3ebe06716f87e0249b278e94477a3ba6e042bbdf6031b73c451b8ddc0f4 WHIRLPOOL 18d1c2c66a069b6de3ef5ad50b712abe35c6a32832a0d8a13fa5c6ac0dbfceedbe013ea3c0d5b66626f61e390377d67db9bf6daa6f1b04d1ca48fe0da2952ab7
-MISC ChangeLog 22119 SHA256 ffcc15a51643805f9ec4c1ab201b1c2004388c9614344473696cbc8d261a0c4d SHA512 b3801b52bb003f7dc283ce28c131b680edfe0c3d19ce15dc4f1be43e426414f7c7f923b1bc8f4d541f9525c566ffb8911d762fb8872f524c9cd962d8f5a8e6f9 WHIRLPOOL d9ddec1769a771d417c41642cc106d73b897654da2a42fc2860a56f152f21c5d0aa5a7fcf907fb36b2ce69865e32e85044abce36cd7fc60233a5b8bf260fd65c
+EBUILD openmpi-1.8.7-r1.ebuild 5661 SHA256 ba6946f68f518212a4b44a5df2c9e10eab14386bd8a0056418367b7e236cf8e0 SHA512 d1861707396576a095e60ecbd4b1de84f6c69b34aa1b36419ee67797560a76b81cffb22f64dcd935c3b0044e6c775fe6e63b765d30f50af03bbd4a139cfab21b WHIRLPOOL 0c707aefd0ba88f683ac9b346a207e9ce68ff03849c50c267b3ea9185848a3b190932d5ccf2546b4bb5802ec6af74de9746960763a14f8be9c447f832214a426
+MISC ChangeLog 22374 SHA256 36e2ee06aa53646aad0119e8d0d2b4f4bcbae1262644b6dcd152a97153a6839a SHA512 dd1a7810c7186642ca5a299d06dc0b5146c9bc01fa6ab0a91e1cb42dd6f82482b5be2bbe8b423a79fa491ae2cc1564981c7fd4ad2491d66b898c3f7abe801b7c WHIRLPOOL cb86e271b8381c0b718fa66349326849ef0b6f404f5a30c2c055faf7c0b31ace6ed15e6c88ac44e05278610a717378767136cb6beb3532c58d605acad1439ccd
 MISC metadata.xml 791 SHA256 9edc79c0dc5999563fa3840cbba64de2b7061b7aa15fb62b7525944578f0b270 SHA512 0ec140f99b9ece69950b5d9cd283a097b3e4d6962b4c7941343b0eea1a914edf53b9ddfeb8bc2a8cc920219cf8e674b07370a0446136b1f9b416614acbcb97f6 WHIRLPOOL 761b3e76edadd1b7066937c3c9b93ae09c3c224dbf4b1da3771a218d54b92354e86adfa8dc945da049206f1e9b885653a12fd19342a7966ed3458a89df7f54ba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlW96P4ACgkQCaWpQKGI+9SDwwCcC3P8MTO5p7qX39Z9sBjFC077
-rZ8AnjjbsUqVhk23KTO8e4qqTkLMWBNu
-=6U0q
+iQJ8BAEBCABmBQJVvqf5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kNtoP/jrx/IGe8iALgaoGd2BBtugJ
+v8wjtMtvEvGr/CRzTnKhouV6eDHDPfZ0XhR7JKz4Q3dd6SySYUmzXqi8lhwmcHXv
+FxQLm5oNdcMzQLfCwkLw2GhEKamfZ/Ya9SNKHnueuSc7nU236SRtSentD3SjWhie
+bCwfVcLYzGxw636Bn4ws0cuR1z0ivnC1ScmaVnxjGnF2PdVEBwlcoSqJpaHVqXOK
+mYAyskA+NLAvlDeILR6ezgT61QdYqlW4p6IMS+8eMyQ9NChQaWqnK6+hcFOzI2D2
+tDMwQrZ60NrJ9zSaKj4LDIGIVD+DG39UhTewjlvXFUzUO9ufon1YES26+crrv9CV
+bWch+9r12rmRd+GelyOVHwZzbUI/KF8nPFT3Nefl2jCnEukz97EnVrdaKoPfnFCs
+1UGAEGH8yGfwpUUnEAax0C8AvWqkl1BYUlycRkmQm/iV6EnLjMsLnjf1lpnbH3zB
+NR/tEDZvZbmF+pOs/LIVeaNUSE/2mxYnLvuG4XHYYbsw4jUylYVe70kv7XE8GKDb
+7NnEiw9DwlOkyy2rHeRbPWfpsAILDVzKIjqG7TpUfhZ8c4UrNBlEud7rqTPkBQg8
+k64lhQhcS/X6ZEyiGx47Q6BR1nHLPTqrJmzAMq7ph2BeSpQwffxbE/grl/VmcRaS
+luWDj7Sr0ruh3MjjrRXr
+=mpAx
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/openmpi-1.8.7.ebuild b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
index 51cb55cf9f33..80ebad59fdc5 100644
--- a/sys-cluster/openmpi/openmpi-1.8.7.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.7-r1.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.7.ebuild,v 1.1 2015/07/17 16:18:16 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild,v 1.1 2015/08/02 23:30:00 chewi Exp $
 
 EAPI=5
 
 FORTRAN_NEEDED=fortran
 
-inherit cuda eutils flag-o-matic fortran-2 toolchain-funcs versionator
+inherit cuda eutils flag-o-matic fortran-2 java-pkg-opt-2 multilib toolchain-funcs versionator
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -35,7 +35,7 @@ SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
-IUSE="cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads numa romio threads vt
+IUSE="cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 +java mpi-threads numa romio threads vt
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
 
 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
@@ -54,7 +54,7 @@ MPI_UNCLASSED_DEP_STR="
 		!app-text/lcdf-typetools
 	)"
 
-RDEPEND="
+CDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
@@ -70,12 +70,17 @@ RDEPEND="
 	openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm )
 	openmpi_rm_pbs? ( sys-cluster/torque )
 	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm )
-	"
-DEPEND="${RDEPEND}"
+	openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm )"
+
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+DEPEND="${CDEPEND}
+	java? ( >=virtual/jdk-1.6 )"
 
 pkg_setup() {
 	fortran-2_pkg_setup
+	java-pkg-opt-2_pkg_setup
 
 	if use mpi-threads; then
 		echo
@@ -116,6 +121,13 @@ src_configure() {
 		myconf+=(--enable-mpi-fortran=no)
 	fi
 
+	if use java; then
+		# We must always build with the right -source and -target
+		# flags. Passing flags to javac isn't explicitly supported here
+		# but we can cheat by overriding the configure test for javac.
+		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+	fi
+
 	! use vt && myconf+=(--enable-contrib-no-build=vt)
 
 	econf "${myconf[@]}" \
@@ -137,7 +149,9 @@ src_configure() {
 		$(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)
+		$(use_with openmpi_rm_slurm slurm) \
+		$(use_enable java) \
+		$(use_enable java mpi-java)
 }
 
 src_install () {
@@ -152,6 +166,14 @@ src_install () {
 	# Remove la files, no static libs are installed and we have pkg-config
 	find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete
 
+	if use java; then
+		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
+		java-pkg_dojar "${mpi_jar}"
+		# We don't want to install the jar file twice
+		# so let's clean after ourselves.
+		rm "${mpi_jar}" || die
+	fi
+
 	dodoc README AUTHORS NEWS VERSION || die
 }