repoman appeasement through manifest/metadata

- also switched out sys-cluster/test in favor of testing natively in
  sys-cluster/mpich

6 files changed, 7 insertions, 121 deletions

diff --git a/eclass/mpi-select.eclass b/eclass/mpi-select.eclass
index 17485e0..7d67aac 100644
--- a/eclass/mpi-select.eclass
+++ b/eclass/mpi-select.eclass
@@ -77,7 +77,7 @@ mpi_foreach_implementation()
 	for implementation in "${@}"
 	do
 		# iterate through implementations, repeat same commands for each variant
-		if [[ "${IMPLEMENTATION_LIST}" ~= *"${implementation}"* ]]
+		if [[ "${IMPLEMENTATION_LIST}" == *"${implementation}"* ]]; then
 			local BUILD_DIR="${WORKDIR}/build"
 			
 			# modeling after multibuild for testing & learning
diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index ff6727d..8e02c9e 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -1,4 +1,4 @@
 DIST mpich-3.2.tar.gz 11862150 SHA256 0778679a6b693d7b7caff37ff9d2856dc2bfc51318bf8373859bfa74253da3dc SHA512 083c51655b4355827bd7fa4fe528046e2bc77b7747d869ff87b79fa324c3cc2a9b5640ccb7271490ccc0dd627e354a33a449bbab448501bbfddcfe5f999ee717 WHIRLPOOL 4196be94f5f5766f06e3f5893153e6d44fe93a5ef17dfcf3fce075b1506d5b762ba175dceeac0668284adc9f4a846917801f2138ed2d81f464d3a191b3f88f1c
 EBUILD mpich-3.2-r1.ebuild 3119 SHA256 8d21dc7403f293f93383c1f4b57fcb7aed3ba73edddb257098e4ec189941a77a SHA512 be2eb6795cb27c05aab47091f44cb785bd673cca7c877012dde5554040320fe1dc4bf2f2ab012d771f1e0be981446ebaf97d212a21fd1c14e630d59af4e4925a WHIRLPOOL 8a7119b63168c6178435ba3839fc370b671e97829716189d8411c144a8a64fb689eb34c01d46a16eaf45b627ea78382172f2c72a18e8c0355317ee10aaae2a0f
-EBUILD mpich-3.2.ebuild 2633 SHA256 c2efe9344d0c4d4bb283be689134ed2814fa0da3181e4a54eb1c6141dfb1ccf0 SHA512 e6f8ffffe0cae9d1cb69efd2957cba637ac5aa4ca976c397ed95de0fd3e9da81aa578db1dee0de09d696b81dbca280a4eb666606f5ff69075a474303c12aab07 WHIRLPOOL e4b6620662ade5d760c92814c1bf3483204cc324d69b3eccea82c808eb18cea0006a044b056cd5d28ac1dbba84b31b8de60e39ab3ab07b7b43c1776479a7dc9f
+EBUILD mpich-3.2.ebuild 2644 SHA256 d8a002ed5c6ad73050f6cc7161a409ff52096ab5a8f21a3fef6525570ec3c7ec SHA512 63fc999889f1689c377732cc3214081a99011495ead877fa576a5acfc85cd4c407414885e852876659a09c1f8bf62bb7bdf39500996bd6dfc30ac08d6a3d775d WHIRLPOOL 98723ea500f4b7a9f129929845a885023ac2c96003cecb30b125c462bee4805d6b9c357fe784fff6dd015140bc21cee3ab43965f28bbec6bceb7913c82630d24
 MISC metadata.xml 366 SHA256 7e30eda183210d5af43e7c4ba122d98c5d0c81a81e31a0ece717f112e39207fb SHA512 88a6ae57cbdb14090979b3995f2575c16dd66e0ecff400cb0c33616189d35fba73caf6aac1951a7d1079783aa269c1e194f67d24561cf7b28a0cdcfb086f4d51 WHIRLPOOL 15e31a6c4abcbb6f40ee9ade9dbb1d54ed16be2b1bdaff6a5ac8007c125169c16edc4dc76b1da65283daa1b573aeacf64267c60cdf0febbe5a7d20a7412a7f03
diff --git a/sys-cluster/mpich/mpich-3.2.ebuild b/sys-cluster/mpich/mpich-3.2.ebuild
index 99ccbd7..f1604ea 100644
--- a/sys-cluster/mpich/mpich-3.2.ebuild
+++ b/sys-cluster/mpich/mpich-3.2.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 FORTRAN_NEEDED=fortran
 
-inherit fortran-2 mpi-providers
+inherit fortran-2 mpi-providers mpi-select
 
 MY_PV=${PV/_/}
 DESCRIPTION="A high performance and portable MPI implementation"
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 1c2dae6..75c39f1 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -2,4 +2,4 @@ DIST openmpi-1.4.5.tar.bz2 6643760 SHA256 a3857bc69b7d5258cf7fc1ed1581d9ac69110f
 DIST openmpi-2.1.1.tar.bz2 8242859 SHA256 bd7badd4ff3afa448c0d7f3ca0ee6ce003b957e9954aa87d8e4435759b5e4d16 SHA512 c11bba6ec815f9c8d32fce3578f8995f6cd694e02fb850d7e6cd3975989bb38fdbef348064264a1de418d0a21411c70ca74347ecff4f27eb5a2f6835019d6bca WHIRLPOOL a1bda50b6ea982333b79feb2883b0e5f04f19f973fe50c467ffd209b4ff3a693b1b8378c25bc5afa5ccf7304d460938a15edbd24bc6119c1bb0b36f94dff6ac4
 EBUILD openmpi-1.4.5.ebuild 2664 SHA256 bc52306550e53965e183faf830e4332b2eace66c21f71562d448b4919e69d02f SHA512 68ca3861c5a96df693bfb9aca203caf4d28763ca3609304be5e3d8f99be53c2a2a30092a2337b2c978dc4aaf9860eb3a96dd08ff4282302bded5c79463210c7f WHIRLPOOL 301f3c8b629dba0a5b61306239d84697cc0c3e88833e441235587dc335aa2be58e8b0a987674e708f42d3808d333dec039c9e6dd0fbb7dcf56464aa19662ab68
 EBUILD openmpi-2.1.1.ebuild 5802 SHA256 08d7b7ea154ea313d9ff42e3fc6711f4091ede330197f32204852abbd52a3656 SHA512 94ca9f9f4d84f7a503a85104917ca93b3c0558daca6a54df1c7255bece61fe2899686b04ee2f3e2d0c3ecec711af1bdfebd71563ad9dcb78f6e058c5618c8262 WHIRLPOOL 57d6cb617e3bbc8ed814bbba89c1a4b7f45e99ab7bd62baa420e9a9db2565697d3dc730448a52cb0db75dee8651bdea18dd21471c700db065f254d9a8a6eec3f
-MISC metadata.xml 469 SHA256 5886c62a7f771d6f4481dfdbff66bb0dd32f34b3bd9525c45dd65601f01f58b5 SHA512 dcfbe2f7f1d3b595b1798e090dd35ca86542592783ba6ec93709b1c9fcb66d52716384dc0f561294291c8567430387f00209691fc41cfd152b1412a65309a728 WHIRLPOOL ff3566c8fa636a6018f9037a57f9a683d755b20d50f955dee370df3b5e790144012d2890010fe0778bfa05935013d41372185e0069181c3c97a38ac441ec3bc8
+MISC metadata.xml 552 SHA256 857bda27ef53d915a9654c98498a7a7912333a4b73ab6a6f9db6b01117604c64 SHA512 9093261e9209cf4266a189668f86b1453cc2519cc0e74e4a7bbc3bb6975f01c01efe99d501ac2c946ee6ebbeab99ed0a2376cda829a1a49d0cbc5a4bfa21dadc WHIRLPOOL 77f4d86af4f9d618f85ad3aba884917ed33a6c35b6a5af8fbe5c40799168a86d3aa591be12f39bd8f965d455b8c5928dae1ab717b2ee2ae2533697fb020f795a
diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
index 57d8a45..2a2bf7b 100644
--- a/sys-cluster/openmpi/metadata.xml
+++ b/sys-cluster/openmpi/metadata.xml
@@ -13,5 +13,8 @@
 		<flag name="pbs"></flag>
 		<flag name="heterogeneous"></flag>
 		<flag name="vt"></flag>
+		<flag name="cma"></flag>
+		<flag name="cuda"></flag>
+		<flag name="numa"></flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/test/mpich-test.ebuild b/sys-cluster/test/mpich-test.ebuild
deleted file mode 100644
index cff30d2..0000000
--- a/sys-cluster/test/mpich-test.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 mpi-providers mpi-select
-
-MY_PV=${PV/_/}
-DESCRIPTION="A high performance and portable MPI implementation"
-HOMEPAGE="http://www.mpich.org/"
-SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="mpich"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+cxx doc fortran threads romio mpi-threads"
-
-COMMON_DEPEND="
-	dev-libs/libaio
-	>=sys-apps/hwloc-1.9
-	romio? ( net-fs/nfs-utils )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	sys-devel/libtool"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/mpich2
-	!sys-cluster/openmpi"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-# test
-mpi_foreach_implementation mpich openmpi
-
-pkg_setup() {
-	FORTRAN_STANDARD="77 90"
-	fortran-2_pkg_setup
-
-	if use mpi-threads && ! use threads; then
-		ewarn "mpi-threads requires threads, assuming that's what you want"
-	fi
-}
-
-src_prepare() {
-	# Using MPICHLIB_LDFLAGS doesn't seem to fully work.
-	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
-		src/packaging/pkgconfig/mpich.pc.in \
-		src/env/*.in \
-		|| die
-}
-
-src_configure() {
-	local c="--enable-shared"
-	local hydra_c="--with-hwloc-prefix=/usr"
-
-	# The configure statements can be somewhat confusing, as they
-	# don't all show up in the top level configure, however, they
-	# are picked up in the children directories.  Hence the separate
-	# local vars.
-
-	if use mpi-threads; then
-		# MPI-THREAD requries threading.
-		c="${c} --with-thread-package=pthreads"
-		c="${c} --enable-threads=runtime"
-	else
-		if use threads ; then
-			c="${c} --with-thread-package=pthreads"
-		else
-			c="${c} --with-thread-package=none"
-		fi
-		c="${c} --enable-threads=single"
-	fi
-
-	c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
-	c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
-
-	export MPICHLIB_CFLAGS=${CFLAGS}
-	export MPICHLIB_CPPFLAGS=${CPPFLAGS}
-	export MPICHLIB_CXXFLAGS=${CXXFLAGS}
-	export MPICHLIB_FFLAGS=${FFLAGS}
-	export MPICHLIB_FCFLAGS=${FCFLAGS}
-	export MPICHLIB_LDFLAGS=${LDFLAGS}
-	unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
-
-	econf ${c} \
-		--sysconfdir="$(mpi-providers_sysconfdir)" \
-		--with-pm=hydra \
-		--disable-fast \
-		--enable-versioning \
-		${hydra_c}
-		$(use_enable romio) \
-		$(use_enable cxx) \
-		$(use_enable fortran f77) \
-		$(use_enable fortran fc)
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	dodir /usr/share/doc/${PF}
-	dodoc README{,.envvar} CHANGES RELEASE_NOTES
-	newdoc src/pm/hydra/README README.hydra
-	if use romio; then
-		newdoc src/mpi/romio/README README.romio
-	fi
-
-	if ! use doc; then
-		rm -rf "${D}"usr/share/doc/${PF}/www*
-	fi
-	mpi-providers_safe_mv
-}