6 files changed, 22 insertions, 93 deletions
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 58bf53df0c6d..78014cc46ccf 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -8,15 +8,13 @@ DIST openmp-3.8.1.src.tar.xz 2009572 BLAKE2B afb548cf08c741d98a966385ee4693089b6
 DIST openmp-3.9.0.src.tar.xz 2257596 BLAKE2B fae0e3e36afcd1a223030f09209865ce706b31c8a07f4d1e457d1a78f086a022260740da908f9e03e007bd63f2d9901d1c819393b2f46af06e4c7c162c8a89ba SHA512 030432bb10d86016f0f1c4f4d8b25f78acdb4aed33c604baf07c825bbcc6198306f2f71a3e56030f20864a92ab0187357aff94d34e47f7166991faf539c0104d
 DIST openmp-3.9.1.src.tar.xz 2031588 BLAKE2B feafb94a832ec48a67d6e00720724dcecb533a4a09e0d69462af33e13454b20393aa21fabb062c362824cdfbee712db1030732271e4cd49085fa69cff9800835 SHA512 80924a6f9765f634d24d7b0aa036d92c912dbd8e067487a14bdd03b4c587fdfc92e83eb29926bfa637ef45be3f133a924f77ab12099ea3706c18e9c42774708b
 DIST openmp-4.0.1.src.tar.xz 2275240 BLAKE2B e63cf670c4cd2678afc4d7b96be85c3d157bf91a69510f980d9a0a07f61b449b22ff28d63753f32e63afedb4a7077c662a633f689a660b5047a83bcf1fb7f009 SHA512 0b737dde832c5907a0cac41fe1d594b61e85dd405eee42b39f09233db62b44543204ccc775e52e2981f9c9f0683b234526e288a3a7a04f712280fb3a575abcaf
-DIST openmp-5.0.0.src.tar.xz 2074004 BLAKE2B db4a94ab4a40eef794494b9ca00568d8841ccab57d9832227b07014f13494b2dd1fd90c4c4a34aa7516388efb827026f5353ffe67bc55d1a9b80617859fd6822 SHA512 038cc1d262414fac9a05eabdce97b21eb04fc1b3609d07f8da2c9da6b1aaa143f8b26953cb799e7dde82f708103539fe03fe939ba7323a71bd3e9e3925bd5513
 DIST openmp-5.0.1.src.tar.xz 2075472 BLAKE2B a4da4726a17dc0fd083e11fe1bebf446978137aa4453000e8fea950021fff091a818246f0817dd60ce67353d3f7d75ab8fec2b9e955389d9c94e195945efda50 SHA512 4493b918fd83ef26e2b3f3429d1b00d722328e4c9697ac7625a390834f6e88ada8e5b02ce0ecb4771129207b1b81a9d171f4599ab9388762a3c6db0afc499ff4
 EBUILD libomp-3.7.1.ebuild 1368 BLAKE2B 31a4e2b6cea595eedf00655e46a11e235c52a03c278bef9f61586e35fc59d288c63d1416880ad0e70cf6c935bd3466437ff7508d208c6153e19e6b5db12f46ca SHA512 ae3b3688f05694e867d98f1a02ef70a36d95b457f0fb369c0f60c86ee4b1a37fab860d1866bf437c6a4344b96904618e717b3a3a5ec7e6756065e4d5e35c9a3a
 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 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-6.0.9999.ebuild 2200 BLAKE2B 11219c8c7b5ca6ac355c5efe6f6663232cc05495cf79c1d91b0cfb2ac75d0ecc6bf453f166d576528c32f805b52e5b30f8514f95ae3a981cda66d57f8fe5e573 SHA512 5d8aa7ba2e1a3973bd1adfc2141b55600ef1ada84fcdb8e12e14d953949ec7ccfcb538756c856bc8eb2b97d15a32b7bd13b67f720afb83ce61fdb2d4119bf493
-EBUILD libomp-9999.ebuild 2175 BLAKE2B e4ae9d9fb4beb69d387826b2298dd29faa2e4b37438b9ba5c1d4e53882d231f82babea6af92589dc8b23273b5d44addb075d294c02488fc9550b7599fc492fa3 SHA512 b1a37e10303e076648aa532b8715f3177da6218adec4adc136ba4e04eb6f65cb31612048aba729879a9fe92bcc9c75484b3bbb0226105163b4a8cf5cee928810
+EBUILD libomp-4.0.1.ebuild 2413 BLAKE2B f0d72a3a85e94a5a92f6ce68dce9a27eef08ef1b10bf6c85b3dc1ac4e4a5831ab6d744e5606cd198a480c373ce67a392fa1f238081a3830de8c01368aecd4f89 SHA512 196bb81a32308109df8485bf5e2eb9a5c5658b069c8c168b193e01839e2b2cad2a147dc0e0af2efd6029784e3a8dc891d1487c17b0e94d73ea634e69a3173928
+EBUILD libomp-5.0.1.ebuild 2248 BLAKE2B caa3e0f8bb68db828c06160e705d08379e975d589ca837a25cf762f1e05d55f4e53cce22c27c4457fd112bbe8d74ae521c4c6028ee81acacac53478fa147a783 SHA512 b8f9f43635539891b8de0ecaf8d016ed351e07de4cb03c9420a22741ce20a3a85528318f56c549eb46307bddaa7a4ce55a6d93b99050351d50ba424fa7309bd5
+EBUILD libomp-6.0.9999.ebuild 2425 BLAKE2B 89caec2f5f0e0110b310d3f2da1e0856bda2a4cf5933df589985808e35e437956d62842e22a5a4084da2f943ee040509ca680264a327a8e9eac5309a232d3be9 SHA512 e90f826e26aa8893d41a7a8d566e6fada64c3b2278a3b0f0b943c746f7f6f8e66690cb937811ecd7b7d4e9ac87dd6396ecdc4d91bd2935a59758ab4a376af3b4
+EBUILD libomp-9999.ebuild 2400 BLAKE2B 8cbcf18ff9b9fe8b92ad693282d31a93b54432978021cc6037c63584a050c11a44de385a283a31d0e5379f878eca7c8a24bfc77ca4e0fc4838ecb23263daa47a SHA512 c82f937b54b2b5f2543aa4f260bc5a632d8e5dc9683a05c2f027ffc91aeddbb1ae3f1b6583dc0ba9fe4c85661c01c1d55c32e830e3290711c21f3d11518a7ffc
 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 299e49921e10..920d364c8a85 100644
--- a/sys-libs/libomp/libomp-4.0.1.ebuild
+++ b/sys-libs/libomp/libomp-4.0.1.ebuild
@@ -43,7 +43,10 @@ S=${WORKDIR}/openmp-${PV/_/}.src
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
 CONFIG_CHECK="~!SCHED_PDS"
-ERROR_SCHED_PDS="PDS scheduler is not supported as it does not implement sched_yield()"
+ERROR_SCHED_PDS="PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels
+>= 4.13-pf11, no fixed release yet) 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."
 
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/libomp/libomp-5.0.0.ebuild b/sys-libs/libomp/libomp-5.0.0.ebuild
deleted file mode 100644
index 87c3bfe493f6..000000000000
--- a/sys-libs/libomp/libomp-5.0.0.ebuild
+++ /dev/null
@@ -1,81 +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 linux-info 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.
-
-LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-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
-	)"
-
-S=${WORKDIR}/openmp-${PV/_/}.src
-
-# 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=(
-		-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-5.0.1.ebuild b/sys-libs/libomp/libomp-5.0.1.ebuild
index 87c3bfe493f6..9075688c9e49 100644
--- a/sys-libs/libomp/libomp-5.0.1.ebuild
+++ b/sys-libs/libomp/libomp-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz"
 
 LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="hwloc ompt test"
 RESTRICT="!test? ( test )"
 
@@ -43,7 +43,10 @@ S=${WORKDIR}/openmp-${PV/_/}.src
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
 CONFIG_CHECK="~!SCHED_PDS"
-ERROR_SCHED_PDS="PDS scheduler is not supported as it does not implement sched_yield()"
+ERROR_SCHED_PDS="PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels
+>= 4.13-pf11, no fixed release yet) 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."
 
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/libomp/libomp-6.0.9999.ebuild b/sys-libs/libomp/libomp-6.0.9999.ebuild
index 461064323a15..5e156aca296c 100644
--- a/sys-libs/libomp/libomp-6.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-6.0.9999.ebuild
@@ -44,7 +44,10 @@ DEPEND="${RDEPEND}
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
 CONFIG_CHECK="~!SCHED_PDS"
-ERROR_SCHED_PDS="PDS scheduler is not supported as it does not implement sched_yield()"
+ERROR_SCHED_PDS="PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels
+>= 4.13-pf11, no fixed release yet) 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."
 
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/libomp/libomp-9999.ebuild b/sys-libs/libomp/libomp-9999.ebuild
index 630a7bf4f050..ad6d62ae7449 100644
--- a/sys-libs/libomp/libomp-9999.ebuild
+++ b/sys-libs/libomp/libomp-9999.ebuild
@@ -43,7 +43,10 @@ DEPEND="${RDEPEND}
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
 CONFIG_CHECK="~!SCHED_PDS"
-ERROR_SCHED_PDS="PDS scheduler is not supported as it does not implement sched_yield()"
+ERROR_SCHED_PDS="PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels
+>= 4.13-pf11, no fixed release yet) 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."
 
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"