gentoo resync : 03.11.2018

3 files changed, 89 insertions, 2 deletions

diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 9950ee86dbc0..8a27b86b940f 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,6 +1,8 @@
 DIST hpx_0.9.99.tar.gz 3779841 BLAKE2B fae6b06a303964e3d52d68fcfd980f89625bfd2a7c04f3a4b027c47814c677bdcf7f367434aee912be08b67afbb6cfe811831dfdc284c0b785d7eaf8838566a9 SHA512 57c03c01c4a9f770e56a60645ec352338365fe05c544b18ff2e944044284315a7e76bbdc2c7193fe55e6992dcb51a51d1042372fdd141b572bd8e18bf1afc363
 DIST hpx_1.0.0.tar.gz 3972403 BLAKE2B 737282f2b547c2ce7e6e0367df64beaf22760d73840f2f1b983e8b970baef074b376f264a97f8c67873eedc24255ec2515bbf2a5bbcb364f89284f48ac18b177 SHA512 42c155654f118bff34b48d929b1732fd56126b8fd3e7657b5bd2f84275288ddf538572ed1152883c4aed5e9683de53b9b1f1c3613e5092e7bd1a5e165bed606d
+DIST hpx_1.1.0.tar.gz 4374855 BLAKE2B 17caeb085e0167d51a1a89c73bce653938d9918776b9db07ae9171cb11570a440e2f88cea86d8b8066b7d102e9a24f1e8304b47b2ade161cbe4e27cce91e3b84 SHA512 09b69a5f14bdb4cbf629bc3a10a4e1dc4c0ab35efdb74386fc7f0135558db5f9557ae8de4edd0ade12cfb91a78e6cc2fac25efbdf9a21042abcb0f303eda1938
 EBUILD hpx-0.9.99.ebuild 1890 BLAKE2B 4dfb8ac3b1aab563e889b3ea89f9ed0fe8dbb09fe7da47293d03f829dd92fa7a429e55228546d6dbd03c5070a0c9356f56a44b5fc71640586aaf4d122336c76f SHA512 8300f95ef02cbad1e959f6958d680f1cbd46729adf813af54063652ad5e3413e67664be743fe8950ae743d9074cc58c3f0175d3dcbe014e1d734844f2bb50e21
 EBUILD hpx-1.0.0.ebuild 1946 BLAKE2B 948184f9c8be17b11a3b089e39c782bbc2abd858c5bcf1bdb115b8a7cff6a9d5044d872340acf07f1b08d4acf6898435149cc2319f22fe206a270bc3bd1c58f5 SHA512 adacf71dc11747e3d1535044929a3a8f379f46a63c3e95e70eec96f0766eb39f921914899033a8250804930e38796cccdfc5afee6b3b5e617e916ea416339658
-EBUILD hpx-9999.ebuild 1898 BLAKE2B c283b73f9a7f4bd17e5a10fca81b0db3d11c800e22de95d0b3263d180a767739eaf193dca014a58e63e53662601dd60604f029851ac3423b4835ea9b5f77f772 SHA512 b6236b45b54a40ad1e01f34e6a750758294cb5b486d66b2a25fd6e0f2043cffed3143e6fab169980db2d09c6959986cd2350ad60bf6c5fdffbce2ef4c4cf99e1
+EBUILD hpx-1.1.0.ebuild 1943 BLAKE2B ccfea8c0fd8ef2f50655b82e950ea26a2f9c3a28c31525f6ffe9fee29b75f136fdd301c7d46c550065360a805f767ee8f42d2a4fd3bf17d29cec14ef902c5d3f SHA512 bb4406c69b03d8286ffe21ef322907903846aff77223cef3e1bd9c99b96c78135ca4634c24474a270b7d10f3e2dfb3d7cdebe2f8cca865b85aa1a5eebf5953b5
+EBUILD hpx-9999.ebuild 1943 BLAKE2B ccfea8c0fd8ef2f50655b82e950ea26a2f9c3a28c31525f6ffe9fee29b75f136fdd301c7d46c550065360a805f767ee8f42d2a4fd3bf17d29cec14ef902c5d3f SHA512 bb4406c69b03d8286ffe21ef322907903846aff77223cef3e1bd9c99b96c78135ca4634c24474a270b7d10f3e2dfb3d7cdebe2f8cca865b85aa1a5eebf5953b5
 MISC metadata.xml 1015 BLAKE2B 10711221bc93b52b674b0179b1d27ab762fc4f9de3a97e3af2e26296f7b42097aa75ab9acc0f6a5ed3faf053c31a575dd50dd2f1b7a69eb1ad4c7a745a547992 SHA512 a0215ad65388b911bb093d58903fb0b4948bfaaf32db26223c21ee2bd63bc7797f14f01d9a8e1203a27dea6bb6ea70c8f34bbeb22b53f49f70971d5e60ba8949
diff --git a/sys-cluster/hpx/hpx-1.1.0.ebuild b/sys-cluster/hpx/hpx-1.1.0.ebuild
new file mode 100644
index 000000000000..98afc4e22e11
--- /dev/null
+++ b/sys-cluster/hpx/hpx-1.1.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+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"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${PN}_${PV}"
+fi
+
+inherit cmake-utils fortran-2 multilib python-any-r1
+
+DESCRIPTION="C++ runtime system for parallel and distributed applications"
+HOMEPAGE="http://stellar.cct.lsu.edu/tag/hpx/"
+
+SLOT="0"
+LICENSE="Boost-1.0"
+IUSE="doc examples jemalloc papi +perftools tbb test"
+
+RDEPEND="
+	tbb? ( dev-cpp/tbb )
+	>=dev-libs/boost-1.49
+	papi? ( dev-libs/papi )
+	perftools? ( >=dev-util/google-perftools-1.7.1 )
+	>=sys-apps/hwloc-1.8
+	>=sys-libs/libunwind-1
+	sys-libs/zlib
+"
+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)
+		-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 )
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	# avoid over-suscribing
+	cmake-utils_src_make -j1 tests
+}
+
+src_install() {
+	cmake-utils_src_install
+	mv "${D}/usr/bin/spin" "${D}/usr/bin/hpx_spin"
+	if use examples; then
+		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 1fb725a966fc..98afc4e22e11 100644
--- a/sys-cluster/hpx/hpx-9999.ebuild
+++ b/sys-cluster/hpx/hpx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -76,6 +76,7 @@ src_test() {
 
 src_install() {
 	cmake-utils_src_install
+	mv "${D}/usr/bin/spin" "${D}/usr/bin/hpx_spin"
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples