gentoo resync : 28.04.2021

6 files changed, 11 insertions, 115 deletions

diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 94b3188c1850..9cb9ec9bf999 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -2,14 +2,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
-DIST llvmorg-12.0.0-rc2.tar.gz 134242619 BLAKE2B bb741a311db608fc2ba7eeaab71c5c9f2a430f7fee3f0c5c4334e5c14caa19738d18c87b568de963d57d9b53e808ac412cf8554eca7fcae9ecca65aa4442e197 SHA512 d8f9b3dfeb0fe9b91eb7f49da393784333044db2653373fbb168afd3c8d50f3e3ec7a7b8f44df522d0facafbfe4cfc4d9e2906d19f1e6feb0bdc569b6c10a17d
-DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c0c78ad97391df95e2542d4edc31f657cc33c8a2a45de63eb421908d5dadd9392a736610fbb04b3ecbd336d6514a649da8 SHA512 1fae53c6f255160cf4be53848b8b92c8b162ddcfbddf1bf0017faf249859040c15c862c4b52bc3ba894149139afb814e0674da88793ddebfc0756ba3aa7626ce
+DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 EBUILD libomp-10.0.1.ebuild 2893 BLAKE2B 6085966e4e392ded8492c6b398d3a14ba5205aee8ecf3f63d0853e463f1bf007ff3b3c31555eb7cb566cc8c4bdc580e9d0ce38ca7cd58785820a7949e2969024 SHA512 e1b7b17dd0800908adbb06b29c7ef2d5bd73c66784104b554c59e5c5176c9c49c5432e0ecd72c6e3c00e71def839342cbedbd666f3886afa3ea92d8fc94ba591
 EBUILD libomp-11.0.0.ebuild 2900 BLAKE2B 8dd6c10719ec67cb10e15610cb99276e8e802994a19c3e3028e365458fc02cb2514cbb6032a1d62528776d31a023de81a08935f923520c1d4ec055e285aacf1b SHA512 855a5730ac4e786506ce70d92bf7c46e11531ef73e0a663e9512b9861e7bdf441113a484d1aa583313f6990bfc81e56eb536dcf8d81d95a8375a3073efca2ebc
 EBUILD libomp-11.0.1.ebuild 2902 BLAKE2B c032a2c7ba9ed2237c14ba6ba0f7558369990e29c96a3d0ef97e3f94492c6042bc626fca813718441ce2de3f44e3605331cc63d4d7db8677ddd6ed7539359cdd SHA512 0e70d6b1b84232b9090c069c437d40dd83a76177b5c3b4048a3ea3a52e4f50ef1d6de68fea78b0e7c8d79ca2f9fb876053219114829e6853c3e021b345fd4d79
-EBUILD libomp-11.1.0.ebuild 2905 BLAKE2B 1a0e17f861b690031143fadc3f93c0a9def81e49b2c2786b085e921eb0ba93de7372a2a85ee1adbecc6ea877696e7912052e1b3ff78341b81e6e20f5e7a4c222 SHA512 c2365e3ed12b208478bb4ea064bd8899ebabbbc620877de074daed04678df9a4dc528be233a72ccdb26742da3c0c7f8460310991a37f56caae18e5cbae29356b
-EBUILD libomp-12.0.0.9999.ebuild 2858 BLAKE2B 7e0c70445e2822d34c0f48f99debbe2f99e35601cfc3ce8e5d5a22888b29b6af5ca5090c66ebc7fb77990e2fdce37b958a2803d2a4be7e626359b48a7ad68c01 SHA512 8c7c35ed7c2d747d0d47a0d9588f2486a93852f31e7e1120688f41b09089e9507534fbae5d609b18bb28899de7dce2670ea1b87eb2e90cf06bbc116cac7daa22
-EBUILD libomp-12.0.0_rc2.ebuild 2858 BLAKE2B 1472a9384d0b92de2402af12c14ea7225aab79198114290c1511b12df7bd63956f95c40791928f85cc67a88c92f62059ac4d4fda1f7a0c3e831a33d827ad19b7 SHA512 2524adeb5ce85b79ea591e273631ffb65bcb8e409367bb7db8a38e9368622cf39d6d7ca2d200b7a57ca125081844ebdc625fdda33193f64e1af0c93ed0f48a22
-EBUILD libomp-12.0.0_rc3.ebuild 2858 BLAKE2B 1472a9384d0b92de2402af12c14ea7225aab79198114290c1511b12df7bd63956f95c40791928f85cc67a88c92f62059ac4d4fda1f7a0c3e831a33d827ad19b7 SHA512 2524adeb5ce85b79ea591e273631ffb65bcb8e409367bb7db8a38e9368622cf39d6d7ca2d200b7a57ca125081844ebdc625fdda33193f64e1af0c93ed0f48a22
-EBUILD libomp-13.0.0.9999.ebuild 2858 BLAKE2B 1472a9384d0b92de2402af12c14ea7225aab79198114290c1511b12df7bd63956f95c40791928f85cc67a88c92f62059ac4d4fda1f7a0c3e831a33d827ad19b7 SHA512 2524adeb5ce85b79ea591e273631ffb65bcb8e409367bb7db8a38e9368622cf39d6d7ca2d200b7a57ca125081844ebdc625fdda33193f64e1af0c93ed0f48a22
+EBUILD libomp-11.1.0.ebuild 2902 BLAKE2B c032a2c7ba9ed2237c14ba6ba0f7558369990e29c96a3d0ef97e3f94492c6042bc626fca813718441ce2de3f44e3605331cc63d4d7db8677ddd6ed7539359cdd SHA512 0e70d6b1b84232b9090c069c437d40dd83a76177b5c3b4048a3ea3a52e4f50ef1d6de68fea78b0e7c8d79ca2f9fb876053219114829e6853c3e021b345fd4d79
+EBUILD libomp-12.0.0.9999.ebuild 2885 BLAKE2B a4ae00d8e2500cc8c76999c17624a3a2ebe6107c34f9deb90cb12de77c4656dd110275e073ab9413332f0fa9c2a86d860a620c85a36555e5996d358c1e25e522 SHA512 ba72ef7a346ac74297526df15949395a18750625b048c26650a7cdec4212af72dcb2b9c8d68dc117abeb7bce9aba4f0b0de1134bcacd841d1a475f77f4a77157
+EBUILD libomp-12.0.0.ebuild 2946 BLAKE2B 6e9857ff95e8a802b6d66852b17ac26c09fb0b4cebb05e47beede3ade25c745b04b4612630d4411cb895e3cd6d0467f753e93ebd59a9473f732e004c7a4bb4c1 SHA512 63b93ae10d91d666d0c44c417a5c2c6eb8d66d6e2b3bebdd3ce2ba0eb28d82822e4c803beef2905a5443b18a527871cc3ad339683e16be0fb820576d61543d09
+EBUILD libomp-13.0.0.9999.ebuild 2885 BLAKE2B a4ae00d8e2500cc8c76999c17624a3a2ebe6107c34f9deb90cb12de77c4656dd110275e073ab9413332f0fa9c2a86d860a620c85a36555e5996d358c1e25e522 SHA512 ba72ef7a346ac74297526df15949395a18750625b048c26650a7cdec4212af72dcb2b9c8d68dc117abeb7bce9aba4f0b0de1134bcacd841d1a475f77f4a77157
 MISC metadata.xml 825 BLAKE2B 9c4afd81e02ecba9db7cac8487acf4e9dcbf772d62ee46c5c95510f1c624b52e0005786d06c119d4d7f0bf498fbd9cae2f9200a27ea427c9d6e83a5d74d45c1c SHA512 b2ba293ffb87f06c21172607234e8f69730d8ade0732fe98a5bc876353a01853dbef8cbe0ace0f6a556f2ae7217facee040349b460815dc2cf2f3b48cfd46762
diff --git a/sys-libs/libomp/libomp-11.1.0.ebuild b/sys-libs/libomp/libomp-11.1.0.ebuild
index 351b5006feff..6706c0daa20f 100644
--- a/sys-libs/libomp/libomp-11.1.0.ebuild
+++ b/sys-libs/libomp/libomp-11.1.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv 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 ) )"
diff --git a/sys-libs/libomp/libomp-12.0.0.9999.ebuild b/sys-libs/libomp/libomp-12.0.0.9999.ebuild
index 0e4b59de3db2..0fd7afe0ff42 100644
--- a/sys-libs/libomp/libomp-12.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-12.0.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -94,6 +94,7 @@ multilib_src_configure() {
 		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
 		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
 	)
+	addpredict /dev/nvidiactl
 	cmake_src_configure
 }
 
diff --git a/sys-libs/libomp/libomp-12.0.0_rc2.ebuild b/sys-libs/libomp/libomp-12.0.0.ebuild
index 592037ef0b29..a1640af9cb73 100644
--- a/sys-libs/libomp/libomp-12.0.0_rc2.ebuild
+++ b/sys-libs/libomp/libomp-12.0.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~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 ) )"
@@ -94,6 +94,7 @@ multilib_src_configure() {
 		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
 		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
 	)
+	addpredict /dev/nvidiactl
 	cmake_src_configure
 }
 
diff --git a/sys-libs/libomp/libomp-12.0.0_rc3.ebuild b/sys-libs/libomp/libomp-12.0.0_rc3.ebuild
deleted file mode 100644
index 592037ef0b29..000000000000
--- a/sys-libs/libomp/libomp-12.0.0_rc3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake-multilib linux-info llvm.org python-any-r1
-
-DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
-HOMEPAGE="https://openmp.llvm.org"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS=""
-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}]
-		dev-libs/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 )
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-		>=sys-devel/clang-6
-	)"
-
-LLVM_COMPONENTS=( openmp llvm/include )
-llvm.org_set_globals
-
-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="$(get_lit_flags)"
-
-		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
-		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-libomp
-}
diff --git a/sys-libs/libomp/libomp-13.0.0.9999.ebuild b/sys-libs/libomp/libomp-13.0.0.9999.ebuild
index 592037ef0b29..0fd7afe0ff42 100644
--- a/sys-libs/libomp/libomp-13.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-13.0.0.9999.ebuild
@@ -94,6 +94,7 @@ multilib_src_configure() {
 		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
 		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
 	)
+	addpredict /dev/nvidiactl
 	cmake_src_configure
 }