gentoo resync : 23.12.2017

6 files changed, 12 insertions, 80 deletions

diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index b8860ff74d48..09b1ef3e15a5 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -14,9 +14,8 @@ EBUILD libomp-3.7.1.ebuild 1368 BLAKE2B 31a4e2b6cea595eedf00655e46a11e235c52a03c
 EBUILD libomp-3.8.1.ebuild 1368 BLAKE2B b686505a85cd3a343808fa1343d0fa6c31c8e66c43c81f92152553c4e996ba88000def2355ac079e2b7b0755efe064596ed7b51409443a1143287c6a1a26e6e1 SHA512 7ba7b4fccdbc2e9a69f73f5fafd985f862b4b28eb3f775d2650e78a2596826b1d8d947aa6e19f708572409139ea094da0d1c24ee35fb3d8812f8363bd948b3c7
 EBUILD libomp-3.9.0.ebuild 1264 BLAKE2B d47970eb3edd24601f97770c326f9274849425ae33aa745cb3544f91a0475944bd1d637b7a50fe3ef0f4643f7fb7adaa91756ca79acf556216362e8c8e1c53b1 SHA512 e0772254fd1ccf735a4325a41bcd30eaaeec30063a541b9f77a5295e1674e0b4a38af86738bfc9a71f4196b81945cd7c08655fc468105aa11d24c38d303aac0a
 EBUILD libomp-3.9.1.ebuild 1326 BLAKE2B 4e1c5178e66a3d4371556bcb26fab5ea84e2bac1ce0abb127d68bbe09f4e735d6d8ed4404f19bb6d8cb4808a782a5b72c9425e4acd2fe2cc97ebc3372de1c72c SHA512 99afa3364dfe73c52792e1f0c4cc19c9beb1fdb28d7fd009a778c351f86fd1759a1c4bfcd46194890b51f227844c063fed53085d78c0b91351858ed517e42794
-EBUILD libomp-4.0.1.ebuild 1971 BLAKE2B d19562b2b0778606a4d4b71bf435387c6b5e0f0fa361172a5603e07d43a87be015a65cc138b775a5187d0acb050b07a7fb2401b1a6db8fc4492c4086a3f73399 SHA512 682abb24a1023a0edd550ed0dd10a8f4882d2b2b1c16ac2c83f88d43055474a8175c5a5bd25fb0f2ccec11e21e71b6ee17bd2a36088c92eea99bd8b656c4ae52
-EBUILD libomp-5.0.0.ebuild 1807 BLAKE2B b33ad89c820b4583321ba6bed22a6445cd71ad2287915cb3676e57a107b10e7357c5c9dd16fea04ce7fad6f40d714f747f8e73f042e0f46e7b968a2ad2ad968b SHA512 f559d0a90ed50d88ceca3fff2cb0ded4dd15fdd2845d8259453429c4ccfa7232c32d39d295d39cfa5d417c0f87eb72bc260f31ab41c635be460fa7b0661e05d8
-EBUILD libomp-5.0.1.ebuild 1807 BLAKE2B b33ad89c820b4583321ba6bed22a6445cd71ad2287915cb3676e57a107b10e7357c5c9dd16fea04ce7fad6f40d714f747f8e73f042e0f46e7b968a2ad2ad968b SHA512 f559d0a90ed50d88ceca3fff2cb0ded4dd15fdd2845d8259453429c4ccfa7232c32d39d295d39cfa5d417c0f87eb72bc260f31ab41c635be460fa7b0661e05d8
-EBUILD libomp-5.0.9999.ebuild 1847 BLAKE2B cb17caf6b069c5b2dc8389dea3a1d27762f1ef09fb9678f21b4da38c9eed801e2e30bfb70c9e5c1a377384c9d6e6d86d1ac1d36793f8010510ff62db9e1789d3 SHA512 cb455d949d818e7e05d2ab58c3e3ac43714273e4fc8fe9551e774e7fd72587be1353b8acfa00487fbe982716f366fc1f64023952b8d525df1febec5cd837f3a1
-EBUILD libomp-9999.ebuild 1972 BLAKE2B 857ebaa53c46c3d359660f78b747e8dfa0e056634bde1a7bd7950ac36c1c05d6404cdf9b12f94c1440085d506cab5e35dea03fbf98132ce20a746bfce5c7a089 SHA512 9198129a5bc13f36c882b9790ce03d452481f702e10ab9bfba7362c11d250889c30e5ffab90143e57d953fe27fd0d050413cfe72ccdb34d33752b8650e68d058
+EBUILD libomp-4.0.1.ebuild 2053 BLAKE2B 951e6d1290ded761b9ad5b8b111adc7dcbbdfe6d957001917073a0420fbba5d2aee8ef5c89c06b5ab938dffdbd43d7dd54daff0d16a6258ff7ebfad67f56dc96 SHA512 f6670cf731957f39927d0378b280889ec83aa811bf22980379486c6cfa41e0d4309f4e0ed6a0b7c5b15a72a3b9ee7bbee3f4ee6e3ea396288c1751a32bc63ab2
+EBUILD libomp-5.0.0.ebuild 1889 BLAKE2B f09475c0732e0df8c5d2dc607ec8aeaef786128199ff042311df101e21044053a7f1126d06af6ab094f15a4638e171fbe85b6e34bba3fee5e61d32b49e00fb61 SHA512 0dc4338c9b877c83754a711231369f38f781de447d035623e479aa6b6cec4248b4fa158eb6801e1266066e5ed4528a22a09e0c3738aa6441cb9012c69222c2d0
+EBUILD libomp-5.0.1.ebuild 1889 BLAKE2B f09475c0732e0df8c5d2dc607ec8aeaef786128199ff042311df101e21044053a7f1126d06af6ab094f15a4638e171fbe85b6e34bba3fee5e61d32b49e00fb61 SHA512 0dc4338c9b877c83754a711231369f38f781de447d035623e479aa6b6cec4248b4fa158eb6801e1266066e5ed4528a22a09e0c3738aa6441cb9012c69222c2d0
+EBUILD libomp-9999.ebuild 2043 BLAKE2B b97582b120c1fbcfdbebef908c6efa61b41392aac7c319b2a655c6d40c46335f907aafc229805b4f1b39a56e8ba0ddb7a6395fe2b63a5fec27cc786c432582a7 SHA512 5918ea4691402ef663872dc1482c52853db7ade37b2a68d11a0174a529f67efb033d7270c1e74d0cc38286927ad2d9b1e397e5596e737d4050521e618802ece6
 MISC metadata.xml 670 BLAKE2B e059d444954246af28f1e5fde5a5bcda4662965a09fbe77d852e27ee7017e1723937b693c4e057963b71e32b5492660965a15af60087c540dc1161dc1a349a38 SHA512 d4269bb7192e00feed26327bb2ac36db3b1c4f5d55417c22efb9a64fa5a006c17dd39459ecc305e8a9a3a954271ad10013fe5c9159a30ea609513aabddebf485
diff --git a/sys-libs/libomp/libomp-4.0.1.ebuild b/sys-libs/libomp/libomp-4.0.1.ebuild
index 0ca953656f66..2eed580030c3 100644
--- a/sys-libs/libomp/libomp-4.0.1.ebuild
+++ b/sys-libs/libomp/libomp-4.0.1.ebuild
@@ -22,6 +22,8 @@ LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE="hwloc ompt test"
+# Restrict tests to avoid hanging, https://bugs.gentoo.org/638410
+RESTRICT="test"
 
 RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )"
 # tests:
diff --git a/sys-libs/libomp/libomp-5.0.0.ebuild b/sys-libs/libomp/libomp-5.0.0.ebuild
index 7b723ea293a9..f90baa29e665 100644
--- a/sys-libs/libomp/libomp-5.0.0.ebuild
+++ b/sys-libs/libomp/libomp-5.0.0.ebuild
@@ -22,6 +22,8 @@ LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="hwloc ompt test"
+# Restrict tests to avoid hanging, https://bugs.gentoo.org/638410
+RESTRICT="test"
 
 RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )"
 # tests:
diff --git a/sys-libs/libomp/libomp-5.0.1.ebuild b/sys-libs/libomp/libomp-5.0.1.ebuild
index 7b723ea293a9..f90baa29e665 100644
--- a/sys-libs/libomp/libomp-5.0.1.ebuild
+++ b/sys-libs/libomp/libomp-5.0.1.ebuild
@@ -22,6 +22,8 @@ LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="hwloc ompt test"
+# Restrict tests to avoid hanging, https://bugs.gentoo.org/638410
+RESTRICT="test"
 
 RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )"
 # tests:
diff --git a/sys-libs/libomp/libomp-5.0.9999.ebuild b/sys-libs/libomp/libomp-5.0.9999.ebuild
deleted file mode 100644
index fc51f5600aa2..000000000000
--- a/sys-libs/libomp/libomp-5.0.9999.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 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 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_50"
-
-# 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-3.9.0
-	)"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DLIBOMP_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
-		-DLIBOMP_TEST_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 3a3f7466c591..6b0c0b5b8014 100644
--- a/sys-libs/libomp/libomp-9999.ebuild
+++ b/sys-libs/libomp/libomp-9999.ebuild
@@ -24,7 +24,8 @@ LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
 KEYWORDS=""
 IUSE="hwloc ompt test"
-RESTRICT="!test? ( test )"
+# Restrict tests to avoid hanging, https://bugs.gentoo.org/638410
+RESTRICT="test !test? ( test )"
 
 RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )"
 # tests: