EAPI 5 bump. Set up proper (optional) Java support and suppress QA warning. Fixes bug 298242.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

3 files changed, 170 insertions, 7 deletions

diff --git a/sys-cluster/mpe2/ChangeLog b/sys-cluster/mpe2/ChangeLog
index a55620141d77..ab20ddbde5a1 100644
--- a/sys-cluster/mpe2/ChangeLog
+++ b/sys-cluster/mpe2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/mpe2
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpe2/ChangeLog,v 1.11 2013/01/06 18:48:37 jsbronder Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpe2/ChangeLog,v 1.12 2015/07/28 08:48:42 monsieurp Exp $
+
+*mpe2-1.0.6_p1-r2 (28 Jul 2015)
+
+  28 Jul 2015; Patrice Clement <monsieurp@gentoo.org> +mpe2-1.0.6_p1-r2.ebuild:
+  EAPI 5 bump. Set up proper (optional) Java support and suppress QA warning.
+  Fixes bug 298242.
 
   06 Jan 2013; Justin Bronder <jsbronder@gentoo.org> mpe2-1.0.6_p1.ebuild,
   mpe2-1.0.6_p1-r1.ebuild:
diff --git a/sys-cluster/mpe2/Manifest b/sys-cluster/mpe2/Manifest
index 533c5f8de553..937f0cd4c63e 100644
--- a/sys-cluster/mpe2/Manifest
+++ b/sys-cluster/mpe2/Manifest
@@ -5,13 +5,18 @@ AUX slog2sdk-trace_rlog-makefile-fixes.patch 2734 SHA256 015ac2a9bed7d84a9e101c4
 AUX slog2sdk-trace_sample-makefile-fixes.patch 2746 SHA256 e611b08f6c7a2cdccee7d37075ff1f8ab4bce84458b40bc859c87f541d54fd2a SHA512 dd5f1f86a4a2abc9a5248856b0eddfc276f9bfb1376ac65f98ec28280d98fb6039e4425c5fe3a02b3ef38bd993a0440b200734520f25afef52feee7af9cd11f9 WHIRLPOOL b5edc131538295c330a6464d691c693331eadc70dc8efde6d265e7594afd83e8f89d43cbb8d4b54b4e45fd1a332b743ceb161dc3d8c1773a400e917d44367b42
 DIST mpe2-1.0.6p1.tar.gz 9313216 SHA256 23cfef2b8a0a27408b5bdadeb216ba3adb3b02bf40d0fa6fc0a110cefd8c5863
 EBUILD mpe2-1.0.6_p1-r1.ebuild 3743 SHA256 6e3645efb1c537fd7361976a5e737160f3f58397046071e73a6e7c6ae3d98f0d SHA512 f9ed71350c0ebc29f8c98b7b67c7fd22b313375ebc478b36aa363c9f00760bc8ae68c041ce23a970e6e86d3b153a3b31693d07b4d65d59df67efcefae9c41f19 WHIRLPOOL 5d4c223830a33ced29a08840d75ffea3bbcfe83af0c6b1ceece6e1099e1d13aaa1d233446a462c8843bf9588ab2ba8644603ece3dc31e75ad51c2cfb4b10857c
+EBUILD mpe2-1.0.6_p1-r2.ebuild 3851 SHA256 765572c6bf0862e3baaf38e86cfcfb627cdc4d2ae450d2fe880eada0c17917cf SHA512 458f01c5af6f91bfb8235816ae25a38376e401472f9755fb723f22c6a894428bd118b965ad92856681b84c366d29c50358b0510f7870307c9c7c6c376d4eb135 WHIRLPOOL 975c09320b73c810f095705591f9502b382b4589919b169aa85798769eb3cc747044878b75ca3b04aa6e9a67bb1b211c077e75aa67bb1b2e5b27fd495c724344
 EBUILD mpe2-1.0.6_p1.ebuild 3617 SHA256 0eb43c2ee9ef2f013718d41a1cd3e4d7034d059b9958a7f0be7c670141bde721 SHA512 3904dbe3938916466dcb9fc4fe0190a2d6eb7563949f3f3cba5cf93931ec52d63d793cf0975f0d5728aacb9508e25a6ac1ee76425b5efa4d7f59a24957ff03d6 WHIRLPOOL 4154aff01014933326071022ef66e1b71625b19801d9136ceab9608ce073ebc27ab15f28ca444383381fc939bcd0366d5804b55a19a7aefb54c33aa31027641a
-MISC ChangeLog 1921 SHA256 b8084581f6c85c94fe16fe05631f93cc2b0bf842a38bd13a4fe794492340f841 SHA512 38cebb29e229779acc0c73a496161e5626fdaed4bdce5ea4a5c3c472b93ba71f997465503e5a7874dfffa6fa973ddfac27ce4e89b772cc8ec9ae35d681581973 WHIRLPOOL 735879ff553516fe716a921764fc17a8af388a99e80a68ce3bef74bcd5fac328739d758535ef97997471c54f148fdd9e42192f50d4fcb4e20f7d319fe68f532a
+MISC ChangeLog 2133 SHA256 8736dc11b3c840bfdcef19cd2209416288a13ff85572487b66e56bd1c5b7b98b SHA512 dd9e3ef8afaeec5a66c714ba9483d7a262b9627243d6c40c1f45c1d764ebd02b9b2430b4e2809693b91406a9acfbe2ad0dbd3304686cfe2eeefd8816b3b08b82 WHIRLPOOL 419f6be79cbe90e404f32fb6be1bf7bf7746b2489683e950f6dd0753175a99f7582a71adb3e4f4911eb407b2329ddc2a570efe67eb43be60f03e1658af254833
 MISC metadata.xml 258 SHA256 81817288aeb64674e0aca4c5fd28dcd54fdd38dd4259818ef81ae86aee92ec39 SHA512 5f654ea8b808527f37b1d53fc3dcdf02a63fe30a7b53c91c7b6b77de5bac7a06ce224f2b8cfc8a9be0d0e90bf05967e04fce063fc8dbe9a8b0449b1ae534a342 WHIRLPOOL 1b1d16dc937fa51f49552ea8ff4ac4725fe13ec6ad513ae9958471708c40b31b0817cd70954f80801743f957527e5476a62b13e0661a9c9cb9660c2a43553926
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlDpxwYACgkQ4MrvBE1wQ8mmhACeMOe4MEbUDkiSal2FEEPOGboR
-ABIAnRVsKKybGNNo6BgYZEdiA7nZvjbw
-=EESH
+iQEcBAEBCAAGBQJVt1AzAAoJEJGRpfGTSRu4NkgH/2wglPKPKr+sp2DX/r8j+/qE
+Bcqx9mT2EgCGPYiwUG17v7ni0ww/zuS+hCzvFp4JbO3jU/NzRehQh9AyrEXuTLq1
+arhr6AIJxpIiD4O9Io83i1hPZFOylwB6jcCFKzmmxRdlWmsPEEvcXQD+AxEhWWP9
+zAezZKUHD03w6/wh9RmhhNkkymrhyZwfbLSaQMdN3hX6d+AUchvH16haePha8gH7
+5XHrVocihs+CifXVN5ce9KMBcCCkz+Hdvnfy0+RGsvOY0dGHqx+2iBtqFgCWjVgR
+qdZasjzgw3bMb+puvcSD3WZ2+j6+gyRLkMV17LhLIMjy7ELt2u9TDQ33H8/k+Hk=
+=/5Ka
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
new file mode 100644
index 000000000000..fb3d5e32cddf
--- /dev/null
+++ b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild,v 1.1 2015/07/28 08:48:42 monsieurp Exp $
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit eutils fortran-2 java-pkg-opt-2 toolchain-funcs
+
+MY_P=${P/_/}
+DESCRIPTION="MPI development tools"
+HOMEPAGE="http://www-unix.mcs.anl.gov/perfvis/download/index.htm"
+SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${PN%2}/${MY_P}.tar.gz"
+
+LICENSE="mpich2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal fortran threads debug"
+
+COMMON_DEPEND="!minimal? ( x11-libs/libXtst
+		x11-libs/libXi )
+	|| ( sys-cluster/openmpi[fortran?,threads?]
+		sys-cluster/mpich2[fortran?,threads?] )"
+
+DEPEND="!minimal? ( >=virtual/jdk-1.6 )
+	${COMMON_DEPEND}"
+
+RDEPEND="
+!minimal? ( >=virtual/jre-1.6 )
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+MPE_IMP=""
+
+# README:
+# This ebuild is created to handle building with both mpich2 and openmpi.
+# However, without empi (in the science overlay), and some further
+# conversion to use mpi.eclass, we can only handle one implementation
+# at a time.  I still believe it's better to have the ebuild setup
+# correctly in preperation.
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	local i
+
+	if has_version sys-cluster/openmpi; then
+		MPE_IMP=openmpi
+	elif has_version sys-cluster/mpich2; then
+		MPE_IMP=mpich2
+	else
+		die "Unknown MPI implementation"
+	fi
+
+	export JFLAGS="${JFLAGS} $(java-pkg_javac-args)"
+
+	if [[ "${MPE_IMP}" == openmpi ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then
+		echo
+		elog "Currently src_test fails on collchk with openmpi, hence"
+		elog "testing is disabled by default.  If you would like to"
+		elog "force testing, please add MPE_FORCE_OPENMPI_TEST=1"
+		elog "to your environment."
+		echo
+	fi
+
+	einfo "Building with support for: sys-cluster/${MPE_IMP}"
+
+	if ! minimal; then
+		java-pkg-opt-2_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Don't assume path contains ./
+	sed -i 's,\($MPERUN\) $pgm,\1 ./$pgm,' sbin/mpetestexeclog.in
+	epatch "${FILESDIR}"/slog2sdk-trace_rlog-makefile-fixes.patch
+	epatch "${FILESDIR}"/slog2sdk-trace_sample-makefile-fixes.patch
+
+	if ! minimal; then
+		java-pkg-opt-2_src_prepare
+	fi
+}
+
+src_configure() {
+	local c="--with-mpicc=/usr/bin/mpicc"
+
+	if use fortran; then
+		c="${c} --with-mpif77=/usr/bin/mpif77"
+	else
+		c="${c} --disable-f77"
+	fi
+
+	if use minimal; then
+		c="${c} --enable-slog2=no --disable-rlog --disable-sample"
+	else
+		c="${c} --with-java2=$(java-config --jdk-home) --enable-slog2=build"
+	fi
+
+	if [[ "${MPE_IMP}" == openmpi ]]; then
+		c="${c} --disable-rlog --disable-sample"
+	fi
+
+	econf ${c} \
+		--sysconfdir=/etc/${PN} \
+		--datadir=/usr/share/${PN} \
+		--with-htmldir=/usr/share/${PN} \
+		--with-docdir=/usr/share/${PN} \
+		--enable-collchk \
+		--enable-wrappers \
+		$(use_enable !minimal graphics) \
+		$(use_enable threads threadlogging) \
+		$(use_enable debug g)
+}
+
+src_test() {
+	local rc
+
+	cd "${S}"
+	if [[ "${MPE_IMP}" == mpich2 ]]; then
+		echo "MPD_SECRETWORD=junk" > "${T}"/mpd.conf
+		chmod 600 "${T}"/mpd.conf
+		export MPD_CONF_FILE="${T}/mpd.conf"
+		"${ROOT}"usr/bin/mpd -d --pidfile="${T}"/mpd.pid
+	elif [[ "${MPE_IMP}" == openmpi* ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then
+		elog
+		elog "Skipping tests for openmpi"
+		elog
+		return 0
+	fi
+
+	# No parallel make:
+	# http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1
+	emake -j1 \
+		CC="${S}"/bin/mpecc \
+		FC="${S}"/bin/mpefc \
+		MPERUN="${ROOT}/usr/bin/mpiexec -n 4" \
+		CLOG2TOSLOG2="${S}/src/slog2sdk/bin/clog2TOslog2" \
+		check;
+		rc=${?}
+	if [[ "${MPE_IMP}" == mpich2 ]]; then
+		"${ROOT}"usr/bin/mpdallexit || kill $(<"${T}"/mpd.pid)
+	fi
+
+	return ${rc}
+}
+
+src_install() {
+	# No parallel make:
+	# http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1
+	emake -j1 DESTDIR="${D}" install || die
+	rm -f "${D}"/usr/sbin/mpeuninstall || die
+}