gentoo resync : 13.11.2021

4 files changed, 95 insertions, 13 deletions

diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 3dfed519b97e..cbd8ac765a09 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,5 +1,5 @@
-DIST libclc-0.2.0_pre20201001.tar.xz 122180 BLAKE2B 8587c5b29d517a6c54a927b529f7e5651f154785e4299ad6b90007bdbae19ffccea75ec873a308b9a025effbb6316f91e70f82af19cdcdaad87c4f1af2595f78 SHA512 1fc10fcd6163991fe3ce474351d07f892a628fbd4e4cfb9ea96f1288db421b7be87c1f818593bea7409e7a17a5fd4c84a07a88f5c3d998ef97ac0425970abf4d
-DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
-EBUILD libclc-0.2.0_pre20201001.ebuild 1450 BLAKE2B 4037c436548563561cef4f84374e7ebc1449126c3583c942607e6c7f2f8bd1df537b942854c6f6001a241f2bd4450974a31798aa3a4fb9a0d35eaf09ea8efad7 SHA512 77b6b9395c66d582e09a5e1b9fb1913c387d6dbc056f33cf55334d14cd7bc42e45c422994e26a4a909c676ce550096323d6aa6ae24bf041cc74d7a2aa840705c
-EBUILD libclc-13.0.0_rc1.ebuild 1456 BLAKE2B c6862781600f40fbf3270895109f798198e733e624bee41981807258f0fbaee204e1ba5d8796109ce454257c9dbf214cb82abc640d976c4996adafe15e3a9a30 SHA512 1b1d897d268d3a5965344700aa10ca1e675b5d897e1d9739a653df200259314824960c242fad9b9928f3a39bff11b2cc72fce0b333cd0fe596c09d588a049629
+DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
+EBUILD libclc-13.0.0.9999.ebuild 1422 BLAKE2B f3af05e150ecfe6545b45f5aa8e1e37a99193eb00f3fdd3d2ac35824898ae1f7279233e1db91456dfa665f6f14689f3eb39db95ccad2aa3d36f9ff60320677fb SHA512 a37bde17738852f5e824108f99bf65535bec2fb2e568e5d9d00b5ee14ed2b07c3a26db19bbea03c8950b6f3d1f60a05fced021d7b3aa93964395b0e6b235e568
+EBUILD libclc-13.0.0.ebuild 1431 BLAKE2B 023945ee57d09ff8763d18d0076733f929d7d0834757e9c7bcc02398512899a3c004a5c79d25f3c33418114824d03e78d904022f889cd7420eafb95a1d3543a0 SHA512 536fea5a39a795ea8984cafd271617291c6da14ebb39214a448a835e62e80fcd1ce004e69b770a22c78e1660209f76efd4fd2e6dc90b0b431b710dadb7f9824b
+EBUILD libclc-14.0.0.9999.ebuild 1443 BLAKE2B a1074740140a14cd68ee7491b4d1dc3d296accaa269a82cb4f98f8a3c49935a43a61e43bcd9c8da4435040117fdc170dd153771d5581f765f9375be98fb72ded SHA512 540a4bbfed08807ae4fda13516126d85c4fa5e0756d2143a2bd2b4c61d9c0cc538ff34a77d7147bd54ed315af9739b273d0b5f63921496bb8f99dba5b014d6a0
 MISC metadata.xml 395 BLAKE2B fe71cab225f1879c7bfcb591a2bf96aaf7c2d454a3b83a8f4730e36c609d7064a9f0a3c9cd105eb11248a80e552a6ddddaaf69db0ec7c955356698a63042f9d9 SHA512 160750cbd7da115c3b9d070a73afac330c6841cb4a0d3102c65f4e9396c008d82431e14f66fae1c7ec83199a97d3749b662cb01d9d769ee20bd6d08666f5565c
diff --git a/dev-libs/libclc/libclc-13.0.0_rc1.ebuild b/dev-libs/libclc/libclc-13.0.0.9999.ebuild
index eb1ed27099a0..de9b38e9f826 100644
--- a/dev-libs/libclc/libclc-13.0.0_rc1.ebuild
+++ b/dev-libs/libclc/libclc-13.0.0.9999.ebuild
@@ -4,14 +4,14 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org prefix python-any-r1 toolchain-funcs
+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="~amd64 ~x86"
+KEYWORDS=""
 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-0.2.0_pre20201001.ebuild b/dev-libs/libclc/libclc-13.0.0.ebuild
index ffc6fbd8be7b..7844998f92dc 100644
--- a/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild
+++ b/dev-libs/libclc/libclc-13.0.0.ebuild
@@ -2,14 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
 
-inherit cmake llvm prefix python-any-r1 toolchain-funcs
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-any-r1
 
 DESCRIPTION="OpenCL C library"
 HOMEPAGE="https://libclc.llvm.org/"
-# libclc subdir of https://github.com/llvm/llvm-project.git
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
 SLOT="0"
@@ -18,14 +16,19 @@ 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
 BDEPEND="
 	|| (
+		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}"
 }
@@ -38,9 +41,20 @@ 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")
+	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!"
 
diff --git a/dev-libs/libclc/libclc-14.0.0.9999.ebuild b/dev-libs/libclc/libclc-14.0.0.9999.ebuild
new file mode 100644
index 000000000000..6d6bb11fbe0a
--- /dev/null
+++ b/dev-libs/libclc/libclc-14.0.0.9999.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 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=14
+BDEPEND="
+	|| (
+		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
+}