gentoo resync : 20.03.2022

4 files changed, 78 insertions, 6 deletions

diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 0d5869ccbec2..401771b9f1e9 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,7 +1,9 @@
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
-DIST llvmorg-13.0.1-rc3.tar.gz 147302323 BLAKE2B 9ac2f97568062d7dd618295a68d6e14898fcd69e2bb66290b999ceb8c12132371f4e9b59d8ba2b252e5e5cb249045676b24fc50c117b2afae20abab98f426582 SHA512 88a04ad02af2d41ec21c7a62bad21ee0e627b7276a16795875afd062ed29ac7fb4aadec5b5e48785a6502c9fd797a4b67d648a21f193c9f7602112870b10a3d1
+DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
+DIST llvmorg-14.0.0-rc4.tar.gz 158082013 BLAKE2B 0e717898d8f1ed160e525a68aba56a84b7d31856ea72fdb8fa02e863c5a2074245a38d4a4aa7d178beab1ea64aa92d0ba9dcad4373ebb03868070bf718112107 SHA512 a942848aa5042b97bab6d0d5bcee11ea2f85f1244d7eaadb8f7000bf104b2160e6034c04e3755501dd178bc99c26669cf4aca40edb4bba598fdde6bcf3f40ddc
 EBUILD libclc-13.0.0.ebuild 1431 BLAKE2B 023945ee57d09ff8763d18d0076733f929d7d0834757e9c7bcc02398512899a3c004a5c79d25f3c33418114824d03e78d904022f889cd7420eafb95a1d3543a0 SHA512 536fea5a39a795ea8984cafd271617291c6da14ebb39214a448a835e62e80fcd1ce004e69b770a22c78e1660209f76efd4fd2e6dc90b0b431b710dadb7f9824b
-EBUILD libclc-13.0.1.9999.ebuild 1422 BLAKE2B f3af05e150ecfe6545b45f5aa8e1e37a99193eb00f3fdd3d2ac35824898ae1f7279233e1db91456dfa665f6f14689f3eb39db95ccad2aa3d36f9ff60320677fb SHA512 a37bde17738852f5e824108f99bf65535bec2fb2e568e5d9d00b5ee14ed2b07c3a26db19bbea03c8950b6f3d1f60a05fced021d7b3aa93964395b0e6b235e568
-EBUILD libclc-13.0.1_rc3.ebuild 1422 BLAKE2B 4581595de54d598a5aee5fd78b594a8aaea3c08913cf48597dd1aec88fdd299bc104ed44919ca96ea7b9ace2f290c370ce2edfcb57ab46fadc9e380b7bbce634 SHA512 1f0749b33eede2d913c2700511e46042f70c8825292ac47a2cf0b1c9ed0de470758b5d0222f11cde20b83d7599abc0150918d405c409837999529be2baf3535b
+EBUILD libclc-13.0.1.ebuild 1432 BLAKE2B 59269e3486b7baf86062f3734ba52750acbce0a8d93b6a925e5654f24611c2d9055306518b60a271857d9735591c102f86501b21f034135ab6afb98183a2bc45 SHA512 948fc251abdd2ade60a4b0fb57cb9c9a365c3c0082535e00c24c54c489aeb15e33735099c76054b8c71873eb0953910b12cfc883203538b8514dc34a3437e865
 EBUILD libclc-14.0.0.9999.ebuild 1443 BLAKE2B a1074740140a14cd68ee7491b4d1dc3d296accaa269a82cb4f98f8a3c49935a43a61e43bcd9c8da4435040117fdc170dd153771d5581f765f9375be98fb72ded SHA512 540a4bbfed08807ae4fda13516126d85c4fa5e0756d2143a2bd2b4c61d9c0cc538ff34a77d7147bd54ed315af9739b273d0b5f63921496bb8f99dba5b014d6a0
+EBUILD libclc-14.0.0_rc4.ebuild 1443 BLAKE2B 96d9dc2863ff6e20917576d1775b8e30d6a36dd25b35582e75d9f05d7771507d76f35ef31c75ffb95f38c30ffdb740189e84901809ffa6f8853acf700959bac4 SHA512 a0424e1b83d6af76f4e3d4d51b1c25bfe62841cbdc849fcc7841db1b9cc91c85a24efefed00d34d2c2e6bb66b93090917f8734ba00615fd8aafeb7902d4a04e4
+EBUILD libclc-15.0.0.9999.ebuild 1464 BLAKE2B eb3defea1ec4f77f431b772f9fc0f8695344e4d80a0a42a9620e983bf12fe6c965380fd26bfc6b17bef66ae26893cd2d63df948dee58981492c1e4731e3fb838 SHA512 6c06c48e42969f10cff381407be3d8d1e02752529ea8dc9944fb11d97f680a687951f83900225585d8df0a37d1341c33c18f3f3a082119e8b8b9045b411040cf
 MISC metadata.xml 395 BLAKE2B fe71cab225f1879c7bfcb591a2bf96aaf7c2d454a3b83a8f4730e36c609d7064a9f0a3c9cd105eb11248a80e552a6ddddaaf69db0ec7c955356698a63042f9d9 SHA512 160750cbd7da115c3b9d070a73afac330c6841cb4a0d3102c65f4e9396c008d82431e14f66fae1c7ec83199a97d3749b662cb01d9d769ee20bd6d08666f5565c
diff --git a/dev-libs/libclc/libclc-13.0.1_rc3.ebuild b/dev-libs/libclc/libclc-13.0.1.ebuild
index 1da191d1914e..8c385a0c2f8c 100644
--- a/dev-libs/libclc/libclc-13.0.1_rc3.ebuild
+++ b/dev-libs/libclc/libclc-13.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://libclc.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="amd64 ~x86"
 IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 IUSE="${IUSE_VIDEO_CARDS}"
 REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
diff --git a/dev-libs/libclc/libclc-13.0.1.9999.ebuild b/dev-libs/libclc/libclc-14.0.0_rc4.ebuild
index de9b38e9f826..36da442fa39d 100644
--- a/dev-libs/libclc/libclc-13.0.1.9999.ebuild
+++ b/dev-libs/libclc/libclc-14.0.0_rc4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,9 +16,10 @@ IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 IUSE="${IUSE_VIDEO_CARDS}"
 REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
 
-LLVM_MAX_SLOT=13
+LLVM_MAX_SLOT=14
 BDEPEND="
 	|| (
+		sys-devel/clang:14
 		sys-devel/clang:13
 		sys-devel/clang:12
 		sys-devel/clang:11
diff --git a/dev-libs/libclc/libclc-15.0.0.9999.ebuild b/dev-libs/libclc/libclc-15.0.0.9999.ebuild
new file mode 100644
index 000000000000..139479da9e37
--- /dev/null
+++ b/dev-libs/libclc/libclc-15.0.0.9999.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS=""
+IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+IUSE="${IUSE_VIDEO_CARDS}"
+REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
+
+LLVM_MAX_SLOT=15
+BDEPEND="
+	|| (
+		sys-devel/clang:15
+		sys-devel/clang:14
+		sys-devel/clang:13
+		sys-devel/clang:12
+		sys-devel/clang:11
+		sys-devel/clang:10
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	# we do not need llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use video_cards_nvidia && libclc_targets+=(
+		"nvptx--"
+		"nvptx64--"
+		"nvptx--nvidiacl"
+		"nvptx64--nvidiacl"
+	)
+	use video_cards_r600 && libclc_targets+=(
+		"r600--"
+	)
+	use video_cards_radeonsi && libclc_targets+=(
+		"amdgcn--"
+		"amdgcn-mesa-mesa3d"
+		"amdgcn--amdhsa"
+	)
+	# TODO: spirv
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+		-DLLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+	)
+	cmake_src_configure
+}