gentoo auto-resync : 07:09:2022 - 22:36:52

6 files changed, 10 insertions, 89 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 585a6296d515..83295923c19d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index b3ecd0525b64..6fbfb5fbe9d0 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,11 +1,9 @@
 AUX intel-compute-runtime-22.24.23453-remove-fortify-sources.patch 1078 BLAKE2B 933cd6b5b3f9aefde4b416960151458eb7845f422e493ab40257330c88b55e1866cf0ff59338ec708d705750ca88c87d54014d51d9492c3dadba7525b523ab56 SHA512 ee831418acb9ba5deba95dc2e013119a0cfe7db533710108063dc67cd0a4030a4419bbad0a007fdab445eba14036fdcae26ea0b4ce675ebb20f402620b880de8
-DIST intel-compute-runtime-22.30.23789.tar.gz 5625283 BLAKE2B 0a59926453ae8a58afbd49a40d8b94ac9171d23a141f967c6d908b26ab66decbd082d42fe6e75bf9fd2b4327cbe5b4c71f6ef390a8a62435c06b749078d67cd4 SHA512 8f2caee7376a9a489efc7ee5b907786d1fc04ed3143dfc66e28069f4d19c13393c64cf6ea0159ce269ee2198dadddd7ef967a11efac90e616ce1f1c996b07153
 DIST intel-compute-runtime-22.31.23852.tar.gz 5644386 BLAKE2B 90eb629187d0aba7a713c600234f18a5472d7ad4e9a7c1130e61011970a9247165f17dab936abb875ee4dd9b4ba167135d158a1b19fce9f20d2bd1c23c9d065b SHA512 66fae1c0e3173f45f0565906d455d4511d40bc392a966625f60315e6a72daa30c741dddc799c50b8e020092577af6aa03810cd5a5e3e729ab19815cdb5e6a27a
 DIST intel-compute-runtime-22.32.23937.tar.gz 5656306 BLAKE2B 82cc631b69d24d2b845d6c9abc0525f06de8314c7915e651db3c800527244c94104eea6083acdde194cc51f9a68bdfcd39f3f4d296c96338e9f05c05d71cc21c SHA512 729d29c09624ae81ca1e8a455d4e3665fcb31cac87e9776730c038a3393e91e1a00e2079e2587adf4b9ab1797179f49fafd48ac5b855dab722837f1f3b77e0f0
 DIST intel-compute-runtime-22.34.24023.tar.gz 5696775 BLAKE2B 8a70751b54e2aaea51eb69d45ef1bed09198023b72b34354cbd87f73a91481f4c7c5a4e5d23815b8ab3d05d4525cb08136929c4b9c0c69b6bcb917b560d88c49 SHA512 592dbf4bad4898c2a5d7a95cd7f41d23cf2f7ab97a33d55f2322b8243a88a3b61ea28d0af1d853324456c5919082fa236fee5fa9cbfcebf248a791617e1533ad
 DIST intel-compute-runtime-22.35.24055.tar.gz 5710106 BLAKE2B a8efab3ab078b2bc3bc85110fc13f5f68cecd8e9e6978a0f6298d37eb470264303579a66a2bc840b8a8719ef03d67474f4d8959e6bf9442ffb997de1ad1af43b SHA512 c6a238a238647ff79c8ac7a38ebba3e1913f3b6f2ec1adbdde9b8eb9536078de12eac8b35ba45e77eea156b3ec1bd55d8b1279b1fbe729be23429b88de5a757f
-EBUILD intel-compute-runtime-22.30.23789.ebuild 1982 BLAKE2B 20c0fda1c683d65e213d3f492b392a1826cb6f3eeca283819edc68eccea16530812ab6d636dc876cd4d3f814c76bd51baa97f64c979e04a430f6e04478170842 SHA512 9216c791966c11977c4f9ab3d7a280158f620c28fefbd2e0ab8c4086bbc09d93f331e090bd2a6e64b7f6f1af1154c0f25279b32e82b6a6e02e09bddaf2d3ac94
-EBUILD intel-compute-runtime-22.31.23852.ebuild 1983 BLAKE2B 3099d855a211d6893f216fec029f7aa78ca31460dedcfb19f1a1449549ad4ceae714b179b893a2b47b5d501dfa754cbb9d244a393cfccc5a0badffa069a2e423 SHA512 b24d315de1ddacb1a2999ec5f7e0971ab6313b5dd84a1ac5fefcf1827f5ccc054eb3a6ab10ca40d807445e13c981a0ad5269804523f3051d83bc5000f9f5245f
+EBUILD intel-compute-runtime-22.31.23852.ebuild 1982 BLAKE2B 20c0fda1c683d65e213d3f492b392a1826cb6f3eeca283819edc68eccea16530812ab6d636dc876cd4d3f814c76bd51baa97f64c979e04a430f6e04478170842 SHA512 9216c791966c11977c4f9ab3d7a280158f620c28fefbd2e0ab8c4086bbc09d93f331e090bd2a6e64b7f6f1af1154c0f25279b32e82b6a6e02e09bddaf2d3ac94
 EBUILD intel-compute-runtime-22.32.23937.ebuild 1983 BLAKE2B 3099d855a211d6893f216fec029f7aa78ca31460dedcfb19f1a1449549ad4ceae714b179b893a2b47b5d501dfa754cbb9d244a393cfccc5a0badffa069a2e423 SHA512 b24d315de1ddacb1a2999ec5f7e0971ab6313b5dd84a1ac5fefcf1827f5ccc054eb3a6ab10ca40d807445e13c981a0ad5269804523f3051d83bc5000f9f5245f
 EBUILD intel-compute-runtime-22.34.24023.ebuild 1983 BLAKE2B 3099d855a211d6893f216fec029f7aa78ca31460dedcfb19f1a1449549ad4ceae714b179b893a2b47b5d501dfa754cbb9d244a393cfccc5a0badffa069a2e423 SHA512 b24d315de1ddacb1a2999ec5f7e0971ab6313b5dd84a1ac5fefcf1827f5ccc054eb3a6ab10ca40d807445e13c981a0ad5269804523f3051d83bc5000f9f5245f
 EBUILD intel-compute-runtime-22.35.24055.ebuild 1983 BLAKE2B 3099d855a211d6893f216fec029f7aa78ca31460dedcfb19f1a1449549ad4ceae714b179b893a2b47b5d501dfa754cbb9d244a393cfccc5a0badffa069a2e423 SHA512 b24d315de1ddacb1a2999ec5f7e0971ab6313b5dd84a1ac5fefcf1827f5ccc054eb3a6ab10ca40d807445e13c981a0ad5269804523f3051d83bc5000f9f5245f
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.30.23789.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.30.23789.ebuild
deleted file mode 100644
index 6786aa838eae..000000000000
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.30.23789.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
-HOMEPAGE="https://github.com/intel/compute-runtime"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+l0 +vaapi"
-
-RDEPEND=">=media-libs/gmmlib-22.1.7:="
-
-DEPEND="
-	${DEPEND}
-	>=dev-libs/intel-metrics-library-0_pre20220526:=
-	dev-libs/libnl:3
-	dev-libs/libxml2:2
-	>=dev-util/intel-graphics-compiler-1.0.11485
-	>=dev-util/intel-graphics-system-controller-0.8.0:=
-	media-libs/mesa
-	>=virtual/opencl-3
-	l0? ( >=dev-libs/level-zero-1.8.5:= )
-	vaapi? (
-		x11-libs/libdrm[video_cards_intel]
-		x11-libs/libva
-	)
-"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "README.md" "FAQ.md" )
-
-PATCHES=( "${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch" )
-
-src_prepare() {
-	# Remove '-Werror' from default
-	sed -e '/Werror/d' -i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# See https://github.com/intel/compute-runtime/issues/531
-	filter-flags -flto=* -flto
-
-	local mycmakeargs=(
-		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
-		-DBUILD_WITH_L0="$(usex l0)"
-		-DDISABLE_LIBVA="$(usex !vaapi)"
-		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
-		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
-		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
-		-DSUPPORT_DG1="ON"
-		-Wno-dev
-
-		# See https://github.com/intel/intel-graphics-compiler/issues/204
-		# -DNEO_DISABLE_BUILTINS_COMPILATION="ON"
-
-		# If enabled, tests are automatically run during
-		# the compile phase and we cannot run them because
-		# they require permissions to access the hardware.
-		-DSKIP_UNIT_TESTS="1"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.31.23852.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.31.23852.ebuild
index af9f16456a1e..6786aa838eae 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.31.23852.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.31.23852.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+l0 +vaapi"
 
 RDEPEND=">=media-libs/gmmlib-22.1.7:="
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index 300373999eb3..4c4909d08aed 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,5 +1,5 @@
 DIST opencl-icd-loader-2022.01.04.tar.gz 81969 BLAKE2B 20018654ae1e9566d806f4d1de64301e0f023ffad2d432c852d4dcf7e323c9c1d60f2aa49a1290cc1263e0e9386b7b0ae4095341f9aaffd6a27edf53b1d1b49e SHA512 060769ed8c84d906b2feacb4be5402c67b5cd561dc2334b384a731e66f301840ad2fc2ed143d32cfeab246d91a6c1f5377b6c9db4d8fc0571a90838c575aca01
 DIST opencl-icd-loader-2022.05.18.tar.gz 86968 BLAKE2B 24931d9f59e885ea5673c774c30632735392a9994545d87737ac392566af991385f25a5b71a8f79b4dd271c6675667088123d25c015fbc843378641f19791ffa SHA512 a02cfef224f552294f029ad5ffda8901cc486cedaab8e7b47723eec59d215488bce4d255bd6350980e8fbcf7f71c73939b10ebb2b7cfd51c5b8051079e2b3af7
 EBUILD opencl-icd-loader-2022.01.04.ebuild 874 BLAKE2B 49e153c18b42683f6a411031674f9901e6b4b06c99dee468acbb1e4a4fafcc46d60a7cd916af33d73d0ca4181618ee80d6cdd5ef1807b3abbde9215d41cdfa05 SHA512 909b7a861c3c30074bc2a740138ff986e6d9ced5a2ab06259d80b796d058f7050c559747fb39a6668fdbb5fae99fa8e9b264a73149081a4a85b61d45fba8774a
-EBUILD opencl-icd-loader-2022.05.18.ebuild 872 BLAKE2B f6260f1402ad6b0c6e4fc8f080a6c59d46f3d7f2a5a2819ead1b4385579e67be8e9ede8648bf8a0125653e846dd6a713710ab44a4f9e04d5409c18b31cbae427 SHA512 a08159be3e0df31966300d1bc90e76bdff8a441f85f57f07c469bde9994585930e42ae6c7e995532e1a08127314940526f87467bcc368f181e9467841367143a
+EBUILD opencl-icd-loader-2022.05.18-r1.ebuild 999 BLAKE2B 7e0cdfb84671c416ce0386ba7c3bc96e7f5163c4f7b3b90c0f008d6c8953f9539376341f7520a3b073a7271d4cada3d2c931919008d4e0ce06e79a866dc2aa78 SHA512 3d7b50f8a88a265cae0ae42bae2620628acc24470e4019ef28654ddc2f0d9b36fac835caf2504a4bcb00a29b98eb80b741ea2d4a709a43307f617ae871fcd560
 MISC metadata.xml 341 BLAKE2B b49a18b36fbbf0c978ad2445ee4688f32cafd66001f04e02256a420b9dd1e808f85c32e43adb15e5814957f5273a135f82c5fdfe37baf7e6fa73abe2c8fcd990 SHA512 5dcf111b1e5ec3e7532258ed2e29946cab993051193bec1413096b52148117c935b028e071c501863620c4a51e81aee333b9e4375caa14fdab3701524da99268
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18-r1.ebuild
index 0799e46d6593..082f069a5031 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18-r1.ebuild
@@ -19,21 +19,23 @@ IUSE="test"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=dev-util/opencl-headers-${PV}
-	!dev-libs/ocl-icd"
-RDEPEND="${DEPEND}"
+RDEPEND="!dev-libs/ocl-icd"
+# Need an opencl-headers ebuild which installs cmake package configs
+# TODO: revert to the usual >=${PV} come next upstream version
+DEPEND="${RDEPEND}
+	>=dev-util/opencl-headers-2022.05.18-r1"
 
 S="${WORKDIR}/${MY_P}"
 
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)
-		-DOPENCL_ICD_LOADER_HEADERS_DIR="${EPREFIX}/usr/include"
 	)
 	cmake_src_configure
 }
 
 multilib_src_test() {
-	OCL_ICD_FILENAMES="${BUILD_DIR}/test/driver_stub/libOpenCLDriverStub.so" \
+	local -x OCL_ICD_FILENAMES="${BUILD_DIR}/test/driver_stub/libOpenCLDriverStub.so"
+	local -x OCL_ICD_VENDORS="/dev/null"
 	cmake_src_test
 }