gentoo resync : 18.05.2019

3 files changed, 114 insertions, 34 deletions

diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index ea3f271fca42..28fb168bc4e0 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -2,9 +2,11 @@ DIST hpx_0.9.99.tar.gz 3779841 BLAKE2B fae6b06a303964e3d52d68fcfd980f89625bfd2a7
 DIST hpx_1.0.0.tar.gz 3972403 BLAKE2B 737282f2b547c2ce7e6e0367df64beaf22760d73840f2f1b983e8b970baef074b376f264a97f8c67873eedc24255ec2515bbf2a5bbcb364f89284f48ac18b177 SHA512 42c155654f118bff34b48d929b1732fd56126b8fd3e7657b5bd2f84275288ddf538572ed1152883c4aed5e9683de53b9b1f1c3613e5092e7bd1a5e165bed606d
 DIST hpx_1.1.0.tar.gz 4374855 BLAKE2B 17caeb085e0167d51a1a89c73bce653938d9918776b9db07ae9171cb11570a440e2f88cea86d8b8066b7d102e9a24f1e8304b47b2ade161cbe4e27cce91e3b84 SHA512 09b69a5f14bdb4cbf629bc3a10a4e1dc4c0ab35efdb74386fc7f0135558db5f9557ae8de4edd0ade12cfb91a78e6cc2fac25efbdf9a21042abcb0f303eda1938
 DIST hpx_1.2.0.tar.gz 3918088 BLAKE2B 7c5eccef6a58f683f94e59e3773e949945652e1fc7c883d134da5b6d32f21bb9a2f526d073260561657da518687ac96487f058715e51236a334b97b27a414451 SHA512 e2dec9484490f5a5fa7d60f712989f70068bcddac643d8b730d2d52aa2a7e49260b28c3becd519925a8e96e9a703473f19955adce087061cf50b861f4fed8ab1
+DIST hpx_1.2.1.tar.gz 3919474 BLAKE2B 5f62f97a047c1b931068b671855bc9d7b8ff03d7f26793ee58445fb4c567d68c6c24c87844c7a6463901d784e11afe475120a41038e783a67cc75ede508473c5 SHA512 057724de1ef252e941a776174fa594a855255b5600461725a4da6e9002b1424a1e59be3f8a40673bb3db5a8aabd3c7b38abbb78042490befe247dd73c921b87c
 EBUILD hpx-0.9.99.ebuild 1884 BLAKE2B c38ecea42e0f981631bf5393cec7c24d9e52014ecacba06067d990a9d4a8325ddeb36cae9c6cd9b3e47fe5ee7ce4e28a8e1b8dde50c9e823cc0095ff34227c8e SHA512 72c17318f01794174ed83675b1e7a8a74eef4bf324511865963e6a77cd220bc79182980afae438d49b77090bdbcdf756088ed05b13410ee52ba796d0ab721a70
 EBUILD hpx-1.0.0.ebuild 1942 BLAKE2B cb09be80de38c0fa701d73562ddb66cdc90bc06d4244b91447a7f0b07173bad7f72e69ea21daa48c1f03191319e747c52e7d6bb5ede6492424aa2f047c713f77 SHA512 cc5f01a3c854ed94dc722c1b24219ca74dad390ad17fcf5f5e6f844c081d4fb661076ac1bfdcf7f46d46e5b4dd500d4e4b5793aa0c79797a886432abff3cfdc4
 EBUILD hpx-1.1.0.ebuild 1939 BLAKE2B 75751d10d4b3d88ddf478eb7a09ad71c861ca62ec78862300a9d99719dfa23ab147143fb5873004f77d100106a95e1ee6a5c5b01d1fd9b6f5f3549f3fe5d18f3 SHA512 350b39abf3e204601a31ad2175e6fb69330bae5dc212d0862f7c165770d9211935c5aaf1a775b9c0a7e6615692b018f71f28ba12f94e36fc852cad1609fb4659
 EBUILD hpx-1.2.0.ebuild 1939 BLAKE2B 75751d10d4b3d88ddf478eb7a09ad71c861ca62ec78862300a9d99719dfa23ab147143fb5873004f77d100106a95e1ee6a5c5b01d1fd9b6f5f3549f3fe5d18f3 SHA512 350b39abf3e204601a31ad2175e6fb69330bae5dc212d0862f7c165770d9211935c5aaf1a775b9c0a7e6615692b018f71f28ba12f94e36fc852cad1609fb4659
-EBUILD hpx-9999.ebuild 1939 BLAKE2B 75751d10d4b3d88ddf478eb7a09ad71c861ca62ec78862300a9d99719dfa23ab147143fb5873004f77d100106a95e1ee6a5c5b01d1fd9b6f5f3549f3fe5d18f3 SHA512 350b39abf3e204601a31ad2175e6fb69330bae5dc212d0862f7c165770d9211935c5aaf1a775b9c0a7e6615692b018f71f28ba12f94e36fc852cad1609fb4659
+EBUILD hpx-1.2.1.ebuild 1835 BLAKE2B 5c5d32f35131050ec2be127ca77bed0a92d1a7f09e8b39994e767ebb73b35c5829ecc5fe35db477b7e82ff8bd8aa826f4aef254051d325398130d01348a218e2 SHA512 6c70913e196d2ee73ee621654e3c3b023a4b53b61a48603ab9f856f9ad70a89a29bc0a61fd605cebb939b990dde48ea4c4abdacb02324cb88f91a0f9bdbb0c5b
+EBUILD hpx-9999.ebuild 1835 BLAKE2B 5c5d32f35131050ec2be127ca77bed0a92d1a7f09e8b39994e767ebb73b35c5829ecc5fe35db477b7e82ff8bd8aa826f4aef254051d325398130d01348a218e2 SHA512 6c70913e196d2ee73ee621654e3c3b023a4b53b61a48603ab9f856f9ad70a89a29bc0a61fd605cebb939b990dde48ea4c4abdacb02324cb88f91a0f9bdbb0c5b
 MISC metadata.xml 1015 BLAKE2B 10711221bc93b52b674b0179b1d27ab762fc4f9de3a97e3af2e26296f7b42097aa75ab9acc0f6a5ed3faf053c31a575dd50dd2f1b7a69eb1ad4c7a745a547992 SHA512 a0215ad65388b911bb093d58903fb0b4948bfaaf32db26223c21ee2bd63bc7797f14f01d9a8e1203a27dea6bb6ea70c8f34bbeb22b53f49f70971d5e60ba8949
diff --git a/sys-cluster/hpx/hpx-1.2.1.ebuild b/sys-cluster/hpx/hpx-1.2.1.ebuild
new file mode 100644
index 000000000000..a57d12d298d1
--- /dev/null
+++ b/sys-cluster/hpx/hpx-1.2.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git"
+else
+	SRC_URI="https://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${PN}_${PV}"
+fi
+inherit cmake-utils fortran-2 python-any-r1
+
+DESCRIPTION="C++ runtime system for parallel and distributed applications"
+HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/"
+
+SLOT="0"
+LICENSE="Boost-1.0"
+IUSE="doc examples jemalloc papi +perftools tbb test"
+
+REQUIRED_USE="?? ( jemalloc perftools tbb )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( >=dev-libs/boost-1.56.0-r1[tools] )
+"
+RDEPEND="
+	>=dev-libs/boost-1.49:=
+	>=sys-apps/hwloc-1.8
+	>=sys-libs/libunwind-1
+	sys-libs/zlib
+	papi? ( dev-libs/papi )
+	perftools? ( >=dev-util/google-perftools-1.7.1 )
+	tbb? ( dev-cpp/tbb )
+"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DHPX_WITH_EXAMPLES=OFF
+		-DHPX_WITH_DOCUMENTATION=$(usex doc)
+		-DHPX_WITH_PAPI=$(usex papi)
+		-DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools)
+		-DBUILD_TESTING=$(usex test)
+	)
+	if use jemalloc; then
+		mycmakeargs+=( -DHPX_WITH_MALLOC=jemalloc )
+	elif use perftools; then
+		mycmakeargs+=( -DHPX_WITH_MALLOC=tcmalloc )
+	elif use tbb; then
+		mycmakeargs+=( -DHPX_WITH_MALLOC=tbbmalloc )
+	else
+		mycmakeargs+=( -DHPX_WITH_MALLOC=system )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	# avoid over-suscribing
+	cmake-utils_src_make -j1 tests
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use examples; then
+		mv "${D}/usr/bin/spin" "${D}/usr/bin/hpx_spin" || die
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild
index 9f8589d79686..a57d12d298d1 100644
--- a/sys-cluster/hpx/hpx-9999.ebuild
+++ b/sys-cluster/hpx/hpx-9999.ebuild
@@ -1,70 +1,67 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-CMAKE_MAKEFILE_GENERATOR="ninja"
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
-if [ ${PV} == 9999 ] ; then
+if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git"
 else
-	SRC_URI="http://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz"
+	SRC_URI="https://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${PN}_${PV}"
 fi
-
-inherit cmake-utils fortran-2 multilib python-any-r1
+inherit cmake-utils fortran-2 python-any-r1
 
 DESCRIPTION="C++ runtime system for parallel and distributed applications"
-HOMEPAGE="http://stellar.cct.lsu.edu/tag/hpx/"
+HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/"
 
 SLOT="0"
 LICENSE="Boost-1.0"
 IUSE="doc examples jemalloc papi +perftools tbb test"
 
+REQUIRED_USE="?? ( jemalloc perftools tbb )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( >=dev-libs/boost-1.56.0-r1[tools] )
+"
 RDEPEND="
-	tbb? ( dev-cpp/tbb )
-	>=dev-libs/boost-1.49
-	papi? ( dev-libs/papi )
-	perftools? ( >=dev-util/google-perftools-1.7.1 )
+	>=dev-libs/boost-1.49:=
 	>=sys-apps/hwloc-1.8
 	>=sys-libs/libunwind-1
 	sys-libs/zlib
+	papi? ( dev-libs/papi )
+	perftools? ( >=dev-util/google-perftools-1.7.1 )
+	tbb? ( dev-cpp/tbb )
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	test? ( ${PYTHON_DEPS} )
-	doc? ( >=dev-libs/boost-1.56.0-r1:=[tools] )
 "
-REQUIRED_USE="
-	jemalloc? ( !perftools !tbb )
-	perftools? ( !jemalloc !tbb )
-	tbb? ( !jemalloc !perftools )
-	"
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
 src_configure() {
-	CMAKE_BUILD_TYPE=Release
 	local mycmakeargs=(
-		-DHPX_BUILD_EXAMPLES=OFF
-		-DHPX_MALLOC=system
-		-DLIB=$(get_libdir)
-		-Dcmake_dir=cmake
-		-DHPX_BUILD_DOCUMENTATION=$(usex doc)
-		-DHPX_JEMALLOC=$(usex jemalloc)
+		-DHPX_WITH_EXAMPLES=OFF
+		-DHPX_WITH_DOCUMENTATION=$(usex doc)
+		-DHPX_WITH_PAPI=$(usex papi)
+		-DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools)
 		-DBUILD_TESTING=$(usex test)
-		-DHPX_GOOGLE_PERFTOOLS=$(usex perftools)
-		-DHPX_PAPI=$(usex papi)
 	)
-
-	use perftools && mycmakeargs+=( -DHPX_MALLOC=tcmalloc )
-	use jemalloc && mycmakeargs+=( -DHPX_MALLOC=jemalloc )
-	use tbb && mycmakeargs+=( -DHPX_MALLOC=tbbmalloc )
+	if use jemalloc; then
+		mycmakeargs+=( -DHPX_WITH_MALLOC=jemalloc )
+	elif use perftools; then
+		mycmakeargs+=( -DHPX_WITH_MALLOC=tcmalloc )
+	elif use tbb; then
+		mycmakeargs+=( -DHPX_WITH_MALLOC=tbbmalloc )
+	else
+		mycmakeargs+=( -DHPX_WITH_MALLOC=system )
+	fi
 
 	cmake-utils_src_configure
 }
@@ -76,8 +73,8 @@ src_test() {
 
 src_install() {
 	cmake-utils_src_install
-	mv "${D}/usr/bin/spin" "${D}/usr/bin/hpx_spin"
 	if use examples; then
+		mv "${D}/usr/bin/spin" "${D}/usr/bin/hpx_spin" || die
 		insinto /usr/share/doc/${PF}
 		doins -r examples
 	fi