gentoo resync : 21.09.2018

6 files changed, 4 insertions, 348 deletions

diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index 1559a69b3b05..723b4945b3d4 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -1,10 +1,5 @@
 DIST mpich-3.0.4.tar.gz 10921075 BLAKE2B 341aaac23277aed05a4448ea03d9caf1ee14cfe327a770c95d620fc1ee1ea7bfa6df36860aa44aad162eb6d630d35fdfb30ae9a866d67680ab71c7b4326c109c SHA512 f9d8b2cf561fe5f85c12512ef4dd7b0cf5ec8b53ddb07bfa0d1db2e3c8ae0382c77e0661f46b82ec96b05d18ea2d25328bb84e9528ac06e5925f30ec8ef030d0
-DIST mpich-3.1.3.tar.gz 11487313 BLAKE2B 15d39d8617e7b503bd1cb7d05ef098898736c2d634da2e50f33d7d3a92f2c0aeeb72ec152ee1907ab0658e5c485bd7ed8c2639b8d2abf1839981c542cfe2fc29 SHA512 3071d75e925808c13ea528aaff81a2ee44a4eb9732c74005a0cedd5a710aeafc691d30c7a035ae0aba14bd2b837c1c788202a7612599d3ffac8e5a9299467c09
-DIST mpich-3.1.4.tar.gz 11325036 BLAKE2B 606003f4a9120930841a261698ff9c572f289a88d1db40bf02c8ed89f67a7ba1081652ce39acbf995b7c42e7becb9336fbb262c04873f25a939e5f963eec7de3 SHA512 55bd4d12a42b9ebc116016bd777eb2b8ed8c51e69f5ea5faf823eba0aeb7eadfe2848c4cca3032aa38841a25a4902c07cec2409811149a057c4aa99a25c6b6da
 DIST mpich-3.2.tar.gz 11862150 BLAKE2B 2e0414b2e11b08a59497fa255d464a2130c754ba8798b99a8b84f7232179906bb27906abbe58b9546833541c238f42ae06df90bfe1133d3ff2d85921d9736452 SHA512 083c51655b4355827bd7fa4fe528046e2bc77b7747d869ff87b79fa324c3cc2a9b5640ccb7271490ccc0dd627e354a33a449bbab448501bbfddcfe5f999ee717
-EBUILD mpich-3.0.4.ebuild 2526 BLAKE2B ef416b0bdf8b85bac332cd1817200fbe51e0151a3b7ec9376ecff61d9ebc1895b255b8526a570629f4ec5185ca848af7be53f961181138468e4e3a4259c8375c SHA512 808d63d5d648a6012c21534b06906f45f8c339a07149e3fa66f29813eb38edc85bb035d7992b31fb8391a95846ecb071f569f8fcde3917b13ff2dd9ab60e2dd0
-EBUILD mpich-3.1.3.ebuild 2537 BLAKE2B 94139eb30a2a6afb224b05625cd47778e27f9486229b12dedfc45dbd8d84d2fbe3eaa4c29d8185873ec7ee2daccb9dfdba4280741fb5be54b11648ec4a1eb50a SHA512 55e3173dbc80341e9298be3c3939fd3e0fbefeeb510f887f310fdc447939e7e297b4ef2aa31fa77a457bf9b3e1a0ad7e4c8e4f45ac609b6269af0187345820ee
-EBUILD mpich-3.1.4.ebuild 2559 BLAKE2B 63f6105644af867b2d537bbc77af52a03f418e1aa55726a3562c6724a149e1f8f701f24b737efdac30c9a6d44a10c5d123690dedf3b23d90ea905a2124c77618 SHA512 3730cf6ccb4114d522a2a4dd07ae705b4300594e5964318893dfa2168133196993fd23d650ae32f88f69ef87d982c8eba54b3064dccfa0704594c1ea1e8b4956
-EBUILD mpich-3.2-r1.ebuild 3122 BLAKE2B a082492fbe2057d3bf3889d07144d9cb20001b783c186b3cbc21a0bb1b6da644ea0bfa9e4dab0aa4d3186e17b001a2091eacc38705cc2c856d60d14835a975ff SHA512 fb2583600a4f17bb9eebe1124b743b4e76d0e7a0ecdb1d3822d95e73fb7f82e40aec8d148bb4970bec8e418cf2fc47f27187bea21098f86cbcbadf18df7db532
-EBUILD mpich-3.2.ebuild 2559 BLAKE2B 63f6105644af867b2d537bbc77af52a03f418e1aa55726a3562c6724a149e1f8f701f24b737efdac30c9a6d44a10c5d123690dedf3b23d90ea905a2124c77618 SHA512 3730cf6ccb4114d522a2a4dd07ae705b4300594e5964318893dfa2168133196993fd23d650ae32f88f69ef87d982c8eba54b3064dccfa0704594c1ea1e8b4956
+EBUILD mpich-3.0.4.ebuild 2529 BLAKE2B d60c5eb9d4a9b7838de58dbc93c695ccf379136004a9ea670f9002c8b1173c5d8d7fb5107d29940025bf417dd5f2b3289ed44d062ba0de1f2ccfe77b14ee217b SHA512 c4588f2b52025fe4fca70b6b0b0c83b5595c4f2d281b744cede8f9ccfc73c0c880dea5f2271fb54a52f64a759488e194a14e5c55e017be63690a7aea9e9d2707
+EBUILD mpich-3.2-r1.ebuild 3113 BLAKE2B 9848838a9099f4b8a9dede5e396390cf32698aa0c219447445e5783cfd4c438acc22394530b7076095404c79d4abb6fd9bc0156a9e66e57e4e2a92927b476c72 SHA512 5e92a55e6303b9c352f3517affddf53e82427ce0f2ec1eb9edef84d97ef12dec69fea28b3aef280c63b7bbba8fc8a29c67cbbf9237f55dc2a8c1cecc8edd1e66
 MISC metadata.xml 658 BLAKE2B 2fc81d1e02086392471d734b5837e8a7ddf9bc8f06ac24766f7bb2e2c7f735a92fd80ed5de47f693224058dcad1c8e89d764c81a2568c363f28a59c50f275112 SHA512 fb8427b6757ba0571f5f78ee71bfd80ebf9e0835a1016b3ef1f66d27a2022033118c7a1fbfe4011e591d321bae9df48c4e4554e3daaa1a3033bee74b5f4c08fe
diff --git a/sys-cluster/mpich/mpich-3.0.4.ebuild b/sys-cluster/mpich/mpich-3.0.4.ebuild
index c6a40b9fc6ab..906a2494626e 100644
--- a/sys-cluster/mpich/mpich-3.0.4.ebuild
+++ b/sys-cluster/mpich/mpich-3.0.4.ebuild
@@ -19,7 +19,7 @@ IUSE="+cxx doc fortran mpi-threads romio threads"
 
 COMMON_DEPEND="
 	dev-libs/libaio
-	sys-apps/hwloc
+	<sys-apps/hwloc-2
 	romio? ( net-fs/nfs-utils )"
 
 DEPEND="${COMMON_DEPEND}
diff --git a/sys-cluster/mpich/mpich-3.1.3.ebuild b/sys-cluster/mpich/mpich-3.1.3.ebuild
deleted file mode 100644
index 196aa6b6cfe3..000000000000
--- a/sys-cluster/mpich/mpich-3.1.3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2
-
-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"
-
-SLOT="0"
-LICENSE="mpich2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+cxx doc fortran mpi-threads romio 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}
-
-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"
-
-	# 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.
-
-	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} \
-		--with-pm=hydra \
-		--disable-mpe \
-		--disable-fast \
-		--enable-smpcoll \
-		--enable-versioning \
-		--with-hwloc-prefix=/usr \
-		$(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
-}
diff --git a/sys-cluster/mpich/mpich-3.1.4.ebuild b/sys-cluster/mpich/mpich-3.1.4.ebuild
deleted file mode 100644
index f7a59bdf3f58..000000000000
--- a/sys-cluster/mpich/mpich-3.1.4.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2
-
-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"
-
-SLOT="0"
-LICENSE="mpich2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+cxx doc fortran mpi-threads romio 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}
-
-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} \
-		--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
-}
diff --git a/sys-cluster/mpich/mpich-3.2-r1.ebuild b/sys-cluster/mpich/mpich-3.2-r1.ebuild
index aa21fd7acaef..ed837625e33b 100644
--- a/sys-cluster/mpich/mpich-3.2-r1.ebuild
+++ b/sys-cluster/mpich/mpich-3.2-r1.ebuild
@@ -20,7 +20,7 @@ IUSE="+cxx doc fortran mpi-threads romio threads"
 
 COMMON_DEPEND="
 	>=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
-	>=sys-apps/hwloc-1.10.0-r2[${MULTILIB_USEDEP}]
+	<sys-apps/hwloc-2[${MULTILIB_USEDEP}]
 	romio? ( net-fs/nfs-utils )"
 
 DEPEND="${COMMON_DEPEND}
diff --git a/sys-cluster/mpich/mpich-3.2.ebuild b/sys-cluster/mpich/mpich-3.2.ebuild
deleted file mode 100644
index f7a59bdf3f58..000000000000
--- a/sys-cluster/mpich/mpich-3.2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2
-
-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"
-
-SLOT="0"
-LICENSE="mpich2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+cxx doc fortran mpi-threads romio 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}
-
-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} \
-		--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
-}