gentoo resync : 15.12.2019

3 files changed, 120 insertions, 21 deletions

diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 18868059cd4a..5beaf3b0ca69 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -1,11 +1,13 @@
-DIST openmp-6.0.1.src.tar.xz 2048320 BLAKE2B 08b3a7051c985903f78331f55a1c6e928399b87c862c43c991e9bf78b66b6e412fc96f202b82c051176dbbe02422f8ceb7414f44ea8f3522f418e515c0f70c62 SHA512 abb956583e5d11d0c6f6d97183c081d658616a74933be884a591eaa3d8c4bb04f08f02016d2c86d7384c7ff1aa44fb949b0d967fc0ff50e3132aaba412e9add8
+DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
+DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
 DIST openmp-7.1.0.src.tar.xz 909320 BLAKE2B 7a5fd4374992b7c440ff27917c0af6a2ec64aaeb2fda645f75b5affd4981e3ceef7f15cba61c37934c5b35be543af315cc4bff2937545fbf5eaa6593f1aa8b83 SHA512 57f18beede401c1c39766e13a03b52083a0f7b437758069f66b73d6d1388dc51e48c34b0a7ecd3552244fd35e2db57388642588febef413c161f5c5411ab1e5d
 DIST openmp-8.0.1.src.tar.xz 933320 BLAKE2B 02a7bf70cd3a217845ef1c5a35e0d7dbfbb39069a9029d462c797b5ddf2240fd627dee55856146ca4bb81622a41f31ecd11e0ed66baf3b7d99447087271991b0 SHA512 9ded785c8129e7b3a70b54f07c4dde529456edcc94904ad77fc578cf7f096cfa3ff2279959d7f7f1db51571e11c53375f33b597c7f36ce6dc6b512c44ced8026
 DIST openmp-9.0.0.src.tar.xz 939036 BLAKE2B 3eee75f05f65a294db6e65c29b8871bb2dd4e0ee753447d2356010ca1a114f3ad2dc54c2f39ad7ffcebd510d912e96f54a2884ecdc7f50864f909184c707e7a5 SHA512 0be0e95026db574ad75d4a9d2fe4234056d16dc4fe24760f3e9e39f3e10099c7eea4ff76d7236e5a570809111fa18fa017cb679391c16a995ba0c194eb9391d4
 EBUILD libomp-10.0.0.9999.ebuild 2989 BLAKE2B 6d8b584d8f2b533ddd2d42c82957aaf749df591c57bf518e2cd0bcb900acd5631097099f172d6a95c3b2f8714be7240f6f641df4c8a77675cd7a442746f3e498 SHA512 efd8c7cb3368590b5171c4ee0308bff23b1eac6160bddeadc9ccdff139628425c93d87a679cf51e1c4c46cdad857a7602e4b02b654486281fab4d8ec3a41a488
-EBUILD libomp-6.0.1-r1.ebuild 3249 BLAKE2B c0128b595df288ca5d233d0de9f3dd1c6d60be6796530e3944d3cfe8b6aa983ba634714a0f1b8cdd5fd51a719c0547a34ab788c3fb2456d84b055d3b58c38f7b SHA512 c6f934694852f6c4ac474d04ab3b33204d5094c2a42f8935f6744e74041e2cfb6f9746b53dadadfeb1c5892efdf97c8d33865f72a9e4baa048984470a3efbcef
 EBUILD libomp-7.1.0.ebuild 3250 BLAKE2B c01271dec02e6315408cf8751580a870f0a8a08f8a7d7801efd6780049676742acc10a284ab21eff5d178570f59995cc0c388adf7d4cbafe5a07324c63de7402 SHA512 463b486bdb6fbd4b85d0935905e7b80d7c28a3279159a15182ecc364aa56eff268ba6e1dd4c4e38d90c3229b057dcbc6037419442e9aae137afd71e69816bd45
 EBUILD libomp-8.0.1.ebuild 3280 BLAKE2B ad34cfd8d5043c0fa706e292f78c5458c659b26ce260c4a049a9e8ecc88f3c268d0b4849c269a41e95255c8ca72f8db0b1f57eb342a4af0980dd34bce77c3c69 SHA512 fbe46c483dcf27d5598058b6f6394811d1e2fd2ce73cb3c34bf6519d2de0ba274562cd4d1caaae3737b70a6188c36079547518ec3a47afadf69c4696d9ec5634
 EBUILD libomp-9.0.0.ebuild 3043 BLAKE2B 576e5a7be336b136e9e1e9d94c84e7b58a044ca42202fe0354bdc8894787a361759e65f7210e8c62e7bd9d00191d1030561c3b0ccfb3e28595ba1f805bf1ac93 SHA512 8aa473a0d22da3ae055a534dfcc87509e8810ba98ad6deec0828fd38e3c3752af7982efd7a9c8cf5653becba1bc2ba911b230eadf93da01dbe97abc499261b2d
 EBUILD libomp-9.0.1.9999.ebuild 2989 BLAKE2B 6d8b584d8f2b533ddd2d42c82957aaf749df591c57bf518e2cd0bcb900acd5631097099f172d6a95c3b2f8714be7240f6f641df4c8a77675cd7a442746f3e498 SHA512 efd8c7cb3368590b5171c4ee0308bff23b1eac6160bddeadc9ccdff139628425c93d87a679cf51e1c4c46cdad857a7602e4b02b654486281fab4d8ec3a41a488
+EBUILD libomp-9.0.1_rc2.ebuild 3043 BLAKE2B 576e5a7be336b136e9e1e9d94c84e7b58a044ca42202fe0354bdc8894787a361759e65f7210e8c62e7bd9d00191d1030561c3b0ccfb3e28595ba1f805bf1ac93 SHA512 8aa473a0d22da3ae055a534dfcc87509e8810ba98ad6deec0828fd38e3c3752af7982efd7a9c8cf5653becba1bc2ba911b230eadf93da01dbe97abc499261b2d
+EBUILD libomp-9.0.1_rc3.ebuild 3043 BLAKE2B 576e5a7be336b136e9e1e9d94c84e7b58a044ca42202fe0354bdc8894787a361759e65f7210e8c62e7bd9d00191d1030561c3b0ccfb3e28595ba1f805bf1ac93 SHA512 8aa473a0d22da3ae055a534dfcc87509e8810ba98ad6deec0828fd38e3c3752af7982efd7a9c8cf5653becba1bc2ba911b230eadf93da01dbe97abc499261b2d
 MISC metadata.xml 825 BLAKE2B 07802144018f2f74b0927b53a346f99cbc7e36dbf501bb8dfc786f8d549c10eb688afafb1759f13d4d56d10f1bcae67dfa86cc2047cc39a9655a09a22e9a4260 SHA512 de43d5be94a5ea1cdfd3ae747d55b50d5d6ee577743f55d006d585d2d5acd5b3100845486ac415685f07361cd9985bae9347fff9c65417d198c49a61b4f6ba5e
diff --git a/sys-libs/libomp/libomp-6.0.1-r1.ebuild b/sys-libs/libomp/libomp-9.0.1_rc2.ebuild
index abc8941fe1ff..50704d497432 100644
--- a/sys-libs/libomp/libomp-6.0.1-r1.ebuild
+++ b/sys-libs/libomp/libomp-9.0.1_rc2.ebuild
@@ -1,26 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${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 linux-info multiprocessing python-any-r1
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="https://openmp.llvm.org"
-SRC_URI="https://releases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz"
-
-# Additional licenses:
-# - MIT-licensed Intel code,
-# - LLVM Software Grant from Intel.
+LLVM_COMPONENTS=( openmp )
+llvm.org_set_globals
 
-LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
 IUSE="cuda hwloc kernel_linux offload ompt test"
 # CUDA works only with the x86_64 ABI
 REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
@@ -37,16 +30,14 @@ RDEPEND="
 # - 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
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
 	offload? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
 	test? (
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 		>=sys-devel/clang-6
 	)"
 
-S=${WORKDIR}/openmp-${PV/_/}.src
-
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
diff --git a/sys-libs/libomp/libomp-9.0.1_rc3.ebuild b/sys-libs/libomp/libomp-9.0.1_rc3.ebuild
new file mode 100644
index 000000000000..50704d497432
--- /dev/null
+++ b/sys-libs/libomp/libomp-9.0.1_rc3.ebuild
@@ -0,0 +1,106 @@
+# 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,6,7}} )
+inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+LLVM_COMPONENTS=( openmp )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cuda hwloc kernel_linux offload ompt test"
+# CUDA works only with the x86_64 ABI
+REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )
+	offload? (
+		virtual/libelf:=[${MULTILIB_USEDEP}]
+		virtual/libffi:=[${MULTILIB_USEDEP}]
+		cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	)"
+# 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}"
+BDEPEND="dev-lang/perl
+	offload? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+		>=sys-devel/clang-6
+	)"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+kernel_pds_check() {
+	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
+		local CONFIG_CHECK="~!SCHED_PDS"
+		local ERROR_SCHED_PDS="\
+PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
+< 4.14-pf9) do not implement sched_yield() call which may result in horrible
+performance problems with libomp. If you are using one of the specified
+kernel versions, you may want to disable the PDS scheduler."
+
+		check_extra_config
+	fi
+}
+
+pkg_pretend() {
+	kernel_pds_check
+}
+
+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)
+
+		-DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
+
+		# 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 offload && mycmakeargs+=(
+		# this is non-fatal and libomp checks for CUDA conditionally
+		# to ABI, so we can just ignore passing the wrong value
+		# on non-amd64 ABIs
+		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
+	)
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+
+		-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
+}