gentoo resync : 12.05.2022

7 files changed, 82 insertions, 87 deletions

diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index fa97ee4c7ffe..d79573ee1520 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,11 +1,10 @@
 AUX opencl-clang-10.0.0.1_find-llvm-tblgen.patch 379 BLAKE2B 23587b8500ad6215603326572a10aef71ce66fcec322834b7e6a7648bfee5a92ce698fa706ebd9cfc0fe3048005919b1d9ec1ebb1d4123412f2fd06593b64841 SHA512 b2e9ae0ceec231b33e2b70664c3cb7c56f5d30f62e2444c6a505c7ab300a463d32ad1a650e8afe1b1bd4b568b3a31c02c280ead3caa8a66548d96df16dc8f131
-AUX opencl-clang-11.1.0_version.patch 404 BLAKE2B 31d8f90de04be1d563caf35534b86fb5f9aba08922be00b9685a402550eaf09334fb7ced28e7ba05d840e389b8d0b315d4809cd26763b4d9a76410401dded687 SHA512 57f59db22b33d856bec6deba6c04ae68d9e5da2c0b2da4fad5053c6915a5e634bb0206eb3c933f2228947df92a633ee2d051164b696803a8e6c330a9218ca6f9
 AUX opencl-clang-13.0.0_version.patch 404 BLAKE2B a1ce164d2e7492e8ebc3fc068fd1cbcdf8255923ecf54ae49677b857e022c4501e885f991c391e0e0ac4806d692c7f3ae7e60e66fbf68611c15be61fab2b523b SHA512 7dad6d570a92d4571d1a1ea2fb14b53167a390d193205b05784f55bc53d6604a8c9899a68ec56092b2f10c7d8e6f4c0b0a62b4090b10488b478043e815010a44
 AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84853a5cf08506b01d91f7c993273be910b38f9c97f1f31e1042d75a111734eaa86fad771bed5b09c6c9001e253c71f26bd7c1e668dcd SHA512 c5a715c05c7bc7b904a46cac8d6a10f161da6d978401c5c60853a19dfb63c65690994bdc57fe327ee36bb5b6151a0018d6931c38553917f2dc82e9cef44e0b0d
-DIST opencl-clang-11.1.0_pre20201222.tar.gz 77968 BLAKE2B efb1759329869eda69cb2e001afe27180d69f030b980cd45f137a34ca54be0bb41849a447dff8a28f20dbe3e7ed66204bcf54a62caef9efcecea815b25951f9e SHA512 46e904855122e24f6214748186d40ba3f85c14169403a192bd28b8d5faf68afeca36a424609ee7c94ddaa5aa0d8b1268bf89ce9cc255933093d71f587889e3e4
 DIST opencl-clang-12.0.0.tar.gz 25292 BLAKE2B 6979ce3f37b0e29e6b7ca9b015c04af6e01ceb6381158492a928d805b26b9bddf00b7a7a3edd987924f1c3a8ad914b7d6e9d9fea22b12166afceb25365edae6c SHA512 7fa05480b10be97dd784b8fb7579a2471cf3a904facd9949a980602085515bb3d42a042c74db80381771ad18f78bed2efdcb09538a865ac4a600d6190b8f9c31
 DIST opencl-clang-13.0.0.tar.gz 25299 BLAKE2B 1aabb4a97ba0bfd6129ea2b821508457de9d8ab78b4456217d655239081f8547e87730f54f05511e1a3ca6c54836fad5cb0cf69f26ac5ffd86ff6ae930f5e2dc SHA512 d346e51339060795d80bdf9d3e3b58e55b089d94ed3c0bc3c7e1e8f81a5f65238d90dacc95ec27e8db7d38a6a03b05df5c4120e9ba0ec72a7bbca28a59d697f7
-EBUILD opencl-clang-11.1.0_pre20201222.ebuild 1262 BLAKE2B 4b130083a32b8e696a70a6f1058409596823de40432ae2925756ba901223981bc92f32380e74874ac67a0e4001dc1304939329ad34f901fc564ad2bca2c7c96a SHA512 44ce33fd10db3aedd36c892815326cd1295983cf267ec9fa57518067d8d974463953313bcea915a0d16cdcba8ae7935a94c09c10eab0de7825dcd90b203af205
-EBUILD opencl-clang-12.0.0.ebuild 963 BLAKE2B 75f81c1822e9977fc38a8bb296e209e7ecbed243a66874773e6d04cb44cfb832fcba1bef0df8338c7bbc68f79f23c1bc933325cf00a8969a3459402d8e55ea88 SHA512 3b46e1fd9878e169c800ed4cc5115f1ea8f10a80c6c221b2ef4931ea20c8328249b2e884085eb63cd209deaf58ef54151d55d692de9b4c881c26dec7eeca20cb
-EBUILD opencl-clang-13.0.0.ebuild 1006 BLAKE2B c0ad8bb1c96b6eee0e94b2645ebce7f3c75ff6eb46eea361b6b98203b930a8b061e19bb45259794ec1a386f96072b1faabe2eaf879758c6498ef07c424b20192 SHA512 f561f5ef4903c47b62ad9143300d403b5a5c503c4e73cc3eee4c2daf53605731af05eb70daf854011819fa9fb647732ee0328d3572f721cc6257b2f03728d4bb
-MISC metadata.xml 251 BLAKE2B b22019593bb3b4bc147601f4bb0d9b1b581cdc60b044374d440221c23a56dd8d66361e70a22f91445b364a91e5082a103107c9b17e25370d9e5da54a38031438 SHA512 0ed66fe371eb8158e69a8bf0cbf9b184e7d04450c034121fe45d200be9285ee4e6347c5fa9c7bfead588bcfdbe4928556418e3cac6d3e55622eb30d47c186a78
+DIST opencl-clang-14.0.0.tar.gz 26109 BLAKE2B 2ae5e6d69e2f13b867712d03b52fce893aeb70566f7f97d54858639786276f49b0b6b5768aebfedeb7fe50d95511178d7dd9df7e80d3fd27df1fb3fe1d2ab955 SHA512 ab9a3fd40542283bdd2646d9ef8d3217420c82a41b183d705e48f48949505ecadc1fa435e23a7ceadf5a335200f5f3752b42715e2ac7f63173fc09637c5c609a
+EBUILD opencl-clang-12.0.0.ebuild 889 BLAKE2B 8425391fe210277d711c1004f518663ac42b330d28248051c00bac651dc3c2f750933e2edb4964a3cbb37280c389e0cdee89652537520e0e597d4b3f414ef3d9 SHA512 3e4b16553a983134a02ad94b48a33a51e564df6228a4482a3a2f09b95e263b36e9c08969849146ef6b3ff79e7e5b085d0d57441a00d65ad191f632affd9b2102
+EBUILD opencl-clang-13.0.0-r1.ebuild 921 BLAKE2B 27c6192ef832933135aab894574c064f2406ec37992cae78366d6a0f5225b5e1479d9bab6c24182e9d2614cb997ce2682c4f75632347c58e1c947e5d733d95fc SHA512 577e0403af1962813e0f854a81ac830410e40b89be981c6e4811e9f6f4e71959b08c145e51fab88ac95f7049e41b7c0426e91e62a581e2e2b1ba3d6c665eead2
+EBUILD opencl-clang-14.0.0.ebuild 880 BLAKE2B 8b128d2cdc2db8bfe4c6e9d07a3b14c473a5eae9c033d696c2d9ca9f12a1db0b450cc5ce99ea544d0be320bec5ea065d6e3569a2dcb502f4d7cbefbe57979c7c SHA512 e4fa70772ddde5571c526f2aeda40e00e6daf81a612309db61e8db9f2123c717f6e3daba1f6c5c169089df385ab3aa3f9e8f456dc891365802bcfb776a18ec48
+MISC metadata.xml 583 BLAKE2B a16519cc07cd2add030b90218d3cdcf9473c684e0a1a0149e7dd352881213c8579c3ed7ceee69db479264fca10561ac023c01be7451ce689fa6408b81cf8b032 SHA512 d3c3f41c5c5fdb4b6b85c737071540ef8d53e148d5f7e69367eeaa6cbe7cb84563d2381de851cc4da41b5300856dd7e6b1e67454a4fc9a9d890590e3a17526b5
diff --git a/dev-libs/opencl-clang/files/opencl-clang-11.1.0_version.patch b/dev-libs/opencl-clang/files/opencl-clang-11.1.0_version.patch
deleted file mode 100644
index 6df90f21a059..000000000000
--- a/dev-libs/opencl-clang/files/opencl-clang-11.1.0_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,7 +20,7 @@
-     add_definitions(-DUSE_PREBUILT_LLVM)
- 
-     if(NOT PREFERRED_LLVM_VERSION)
--        set(PREFERRED_LLVM_VERSION "11.0.0")
-+        set(PREFERRED_LLVM_VERSION "11.1.0")
-     endif(NOT PREFERRED_LLVM_VERSION)
-     message(STATUS "Looking for LLVM version ${PREFERRED_LLVM_VERSION}")
-     find_package(LLVM ${PREFERRED_LLVM_VERSION} REQUIRED)
diff --git a/dev-libs/opencl-clang/metadata.xml b/dev-libs/opencl-clang/metadata.xml
index 93d25671c3c2..8d57fc8b99de 100644
--- a/dev-libs/opencl-clang/metadata.xml
+++ b/dev-libs/opencl-clang/metadata.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>gentoo@taujhe.de</email>
+		<name>Jan Henke</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">intel/opencl-clang</remote-id>
 	</upstream>
diff --git a/dev-libs/opencl-clang/opencl-clang-11.1.0_pre20201222.ebuild b/dev-libs/opencl-clang/opencl-clang-11.1.0_pre20201222.ebuild
deleted file mode 100644
index 80403ddf333c..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-11.1.0_pre20201222.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="c67648d41df00ea8ee9d701d17299b86f86f0321"
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib llvm
-
-MY_PV="$(ver_rs 3 -)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-LICENSE="UoI-NCSA"
-SLOT="11"
-KEYWORDS="amd64"
-
-# Force a rebuild of this package once clang has been updated from 10.0.0 to 10.0.1
-# in order to work around Bug #743992. Hopefully a one-time thing.
-DEPEND="
-	>=dev-util/spirv-llvm-translator-11.0.0:11=[${MULTILIB_USEDEP}]
-	~sys-devel/clang-11.1.0:11=[static-analyzer,${MULTILIB_USEDEP}]
-	sys-devel/llvm:11=[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-LLVM_MAX_SLOT=11
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
-	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
-	"${FILESDIR}"/${PN}-11.1.0_version.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-12.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-12.0.0.ebuild
index a676d51782e7..90d12ac835a9 100644
--- a/dev-libs/opencl-clang/opencl-clang-12.0.0.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-12.0.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-CMAKE_ECLASS=cmake
+LLVM_MAX_SLOT="12"
 
-inherit cmake-multilib llvm
+inherit cmake llvm
 
 DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
 HOMEPAGE="https://github.com/intel/opencl-clang"
@@ -13,27 +13,28 @@ SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.
 S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
-SLOT="12"
+SLOT="$(ver_cut 1)"
 KEYWORDS="amd64"
 
-DEPEND="
-	>=dev-util/spirv-llvm-translator-12.0.0:12=[${MULTILIB_USEDEP}]
-	>=sys-devel/clang-12.0.0:12=[static-analyzer,${MULTILIB_USEDEP}]
-	sys-devel/llvm:12=[${MULTILIB_USEDEP}]
+RDEPEND="
+	dev-util/spirv-llvm-translator:${SLOT}=
+	sys-devel/clang:${SLOT}=[static-analyzer]
+	sys-devel/llvm:${SLOT}=
 "
-RDEPEND="${DEPEND}"
 
-LLVM_MAX_SLOT=12
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
 	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
 )
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
 		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
+		-Wno-dev
 	)
+
 	cmake_src_configure
 }
diff --git a/dev-libs/opencl-clang/opencl-clang-13.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-13.0.0-r1.ebuild
index 1c05a54ecb8e..51eeb4ac021b 100644
--- a/dev-libs/opencl-clang/opencl-clang-13.0.0.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-13.0.0-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-CMAKE_ECLASS=cmake
+LLVM_MAX_SLOT="13"
 
-inherit cmake-multilib llvm
+inherit cmake llvm
 
 DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
 HOMEPAGE="https://github.com/intel/opencl-clang"
@@ -14,16 +14,15 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="13"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
-DEPEND="
-	>=dev-util/spirv-llvm-translator-13.0.0:13=[${MULTILIB_USEDEP}]
-	>=sys-devel/clang-13.0.0:13=[static-analyzer,${MULTILIB_USEDEP}]
-	sys-devel/llvm:13=[${MULTILIB_USEDEP}]
+RDEPEND="
+	dev-util/spirv-llvm-translator:${SLOT}=
+	sys-devel/clang:${SLOT}=[static-analyzer]
+	sys-devel/llvm:${SLOT}=
 "
-RDEPEND="${DEPEND}"
 
-LLVM_MAX_SLOT=13
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
@@ -31,10 +30,12 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-13.0.0_version.patch
 )
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
 		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
+		-Wno-dev
 	)
+
 	cmake_src_configure
 }
diff --git a/dev-libs/opencl-clang/opencl-clang-14.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-14.0.0.ebuild
new file mode 100644
index 000000000000..02c30dc2f648
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-14.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT="14"
+
+inherit cmake llvm
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="UoI-NCSA"
+SLOT="14"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-util/spirv-llvm-translator:${SLOT}=
+	sys-devel/clang:${SLOT}=[static-analyzer]
+	sys-devel/llvm:${SLOT}=
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}