gentoo resync : 04.01.2018

3 files changed, 96 insertions, 5 deletions

diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index e28ddbfa1013..58bf53df0c6d 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -17,5 +17,6 @@ EBUILD libomp-3.9.1.ebuild 1326 BLAKE2B 4e1c5178e66a3d4371556bcb26fab5ea84e2bac1
 EBUILD libomp-4.0.1.ebuild 2188 BLAKE2B a59f253ab870927b3cf2adc1682701d8805dda2c52f56529b34ab66987168f1039ef9b285680e8a8ca09fc2dbec48eec55b15ca59cc0ae365c6c5a11e5ad9f2a SHA512 e39909c1b48042fa7da5dd8eab5804721d3775f3c74c196257ded941fa5fafb1b1e697484d9ca96f21797583fcaa381372dbb28a97d0eee4d8993a3dd8d94506
 EBUILD libomp-5.0.0.ebuild 2024 BLAKE2B 1278194f24e5e37ce636fb0269e133d996581d9be8578a0b1bb8aaa29518e2e2936987515ba665a45730889853c42ffe5982474cda58073d612c402c724901ef SHA512 7b39d3a903cf1ee049d2257d14236314965d17b9bc99de8da78252647f42ff3f40e8b26b5763992be1965deca87b61e2f5ffce3c8fdb9a1c739bee30ec958b3e
 EBUILD libomp-5.0.1.ebuild 2024 BLAKE2B 1278194f24e5e37ce636fb0269e133d996581d9be8578a0b1bb8aaa29518e2e2936987515ba665a45730889853c42ffe5982474cda58073d612c402c724901ef SHA512 7b39d3a903cf1ee049d2257d14236314965d17b9bc99de8da78252647f42ff3f40e8b26b5763992be1965deca87b61e2f5ffce3c8fdb9a1c739bee30ec958b3e
-EBUILD libomp-9999.ebuild 2162 BLAKE2B 09d9069c77be4810e8ee75a66c543c76ce0256713a50d0371d77ec5d804283e64c8a16a16774062b7f4da3efe627a324d07d62b82d7788a40ac113be5bcb3922 SHA512 76183694ec4fce233c288036f52abbc80352c378e9571c026acf58f1ae739506a29a24cb0150407a7d0bdab1b99a945ce8e161f39af5b10b94d0dd0d9c23fdf6
+EBUILD libomp-6.0.9999.ebuild 2200 BLAKE2B 11219c8c7b5ca6ac355c5efe6f6663232cc05495cf79c1d91b0cfb2ac75d0ecc6bf453f166d576528c32f805b52e5b30f8514f95ae3a981cda66d57f8fe5e573 SHA512 5d8aa7ba2e1a3973bd1adfc2141b55600ef1ada84fcdb8e12e14d953949ec7ccfcb538756c856bc8eb2b97d15a32b7bd13b67f720afb83ce61fdb2d4119bf493
+EBUILD libomp-9999.ebuild 2175 BLAKE2B e4ae9d9fb4beb69d387826b2298dd29faa2e4b37438b9ba5c1d4e53882d231f82babea6af92589dc8b23273b5d44addb075d294c02488fc9550b7599fc492fa3 SHA512 b1a37e10303e076648aa532b8715f3177da6218adec4adc136ba4e04eb6f65cb31612048aba729879a9fe92bcc9c75484b3bbb0226105163b4a8cf5cee928810
 MISC metadata.xml 670 BLAKE2B e059d444954246af28f1e5fde5a5bcda4662965a09fbe77d852e27ee7017e1723937b693c4e057963b71e32b5492660965a15af60087c540dc1161dc1a349a38 SHA512 d4269bb7192e00feed26327bb2ac36db3b1c4f5d55417c22efb9a64fa5a006c17dd39459ecc305e8a9a3a954271ad10013fe5c9159a30ea609513aabddebf485
diff --git a/sys-libs/libomp/libomp-6.0.9999.ebuild b/sys-libs/libomp/libomp-6.0.9999.ebuild
new file mode 100644
index 000000000000..461064323a15
--- /dev/null
+++ b/sys-libs/libomp/libomp-6.0.9999.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-multilib git-r3 linux-info python-any-r1
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/openmp.git
+	https://github.com/llvm-mirror/openmp.git"
+EGIT_BRANCH="release_60"
+
+# Additional licenses:
+# - MIT-licensed Intel code,
+# - LLVM Software Grant from Intel.
+
+LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
+SLOT="0"
+KEYWORDS=""
+IUSE="hwloc ompt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )"
+# tests:
+# - dev-python/lit provides the test runner
+# - sys-devel/llvm provide test utils (e.g. FileCheck)
+# - sys-devel/clang provides the compiler to run tests
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+		sys-devel/llvm
+		>=sys-devel/clang-6
+	)"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+CONFIG_CHECK="~!SCHED_PDS"
+ERROR_SCHED_PDS="PDS scheduler is not supported as it does not implement sched_yield()"
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	linux-info_pkg_setup
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
+
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="-vv"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake-utils_src_make check-libomp
+}
diff --git a/sys-libs/libomp/libomp-9999.ebuild b/sys-libs/libomp/libomp-9999.ebuild
index 4d5905215164..630a7bf4f050 100644
--- a/sys-libs/libomp/libomp-9999.ebuild
+++ b/sys-libs/libomp/libomp-9999.ebuild
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
 	test? (
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 		sys-devel/llvm
-		>=sys-devel/clang-3.9.0
+		>=sys-devel/clang-6
 	)"
 
 # least intrusive of all
@@ -61,8 +61,7 @@ pkg_setup() {
 multilib_src_configure() {
 	local libdir="$(get_libdir)"
 	local mycmakeargs=(
-		-DLIBOMP_LIBDIR_SUFFIX="${libdir#lib}"
-		-DLIBOMPTARGET_LIBDIR_SUFFIX="${libdir#lib}"
+		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
 
 		-DLIBOMP_USE_HWLOC=$(usex hwloc)
 		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
@@ -70,11 +69,13 @@ multilib_src_configure() {
 		-DLIBOMP_INSTALL_ALIASES=OFF
 		# disable unnecessary hack copying stuff back to srcdir
 		-DLIBOMP_COPY_EXPORTS=OFF
-		-DLIBOMP_TEST_COMPILER="$(type -P "${CHOST}-clang")"
 	)
 	use test && mycmakeargs+=(
 		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
 		-DLLVM_LIT_ARGS="-vv"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
 	)
 	cmake-utils_src_configure
 }