gentoo auto-resync : 10:11:2022 - 21:28:32

7 files changed, 103 insertions, 41 deletions

diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index efc0b8c9a9e2..2e914f464d1d 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -5,12 +5,11 @@ DIST llvm-project-15.0.3.src.tar.xz.sig 438 BLAKE2B e7e0614e144eb878f694c12e97cf
 DIST llvm-project-15.0.4.src.tar.xz 110936424 BLAKE2B a02b76ad161e352b4d3d84baffdada9c6a0e704de7a2c4017df4d4d05a9e9d02113791cd7d91c3edfa1f5bcb7ab95e1772d60f7061514928c6828600f41a8322 SHA512 9d5b664dd77c08130601636f9d6c006b257f369470ce823aa56d06698a9f0edfec42f2c90da934b9ad52c4d7960d9a024ea46dc9640275be6d191b1ba9869459
 DIST llvm-project-15.0.4.src.tar.xz.sig 566 BLAKE2B f1a7be65fcce932dc125ae2b498f68a14e68dad0d7a1e031343c52c5dafb7b123e346f3efa50a7693584361abf01efe9401b1b5781dee6b92dc1045e538e9b7b SHA512 35899ffbd13fc44cade54246a423450571cb4b62b8d706864daa3eef2377c48e24ef3113218e39e29de995b7f7fa307f9187552766576c9050fd924beb517f6e
 DIST llvm-project-1fb186198af5f183dde053c1396f899567755d64.tar.gz 170328817 BLAKE2B c79199044e8d636127d1d163ceea856c1bcb1d59c892e9c72869ab788b4feb23f8c28585ac761764b4e29b883c61e43be9341610a523d8b64471200bb3aecfaa SHA512 8b366dc70506ceb70a5584ad051e100fa1cc620388fc757536ef775d102b4baaac016d4f62dbc8b1d9dd00b587622a25d9da735196d336faf35d611145cf5fdc
-DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAKE2B d3a82a07f855b038071fc8eb3f41a88b4c220a577219985ecddeb9a535ea8b159dbad575699997d90a49db74c074b5f4354ad707e91d6934daaa7319e0d8ee9b SHA512 3f5525c7d893bdac701cff4cf82dafc31608920d788d9b7401654f320b2432528cf4ae8ef013182807b3dc0c5b758c71f1efeedb672dd47fdb8aa6f434dfb583
 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B eb984d3f19f3b147d3974722c11218117240cad75033c12eb6664ef7d492e9ed77fd3c3dfef2fe59bb0c23716072b7ff3b10840b19b213fa96121d5aa7faa335 SHA512 66b74a3cb2ee6c54e6d348d64fe239f2ea72a43f28d1ab0cf22a4757cf87cadde427516d8aa74b4c95a947f38d01571f23e69388a04694527e2be9b0fd1bf94e
 EBUILD libclc-15.0.3.ebuild 1411 BLAKE2B 22c88236e222cf2e547b25bb19e971fc7df4416cb686dbcff6086a60c023c4b11ea44242bd1f65ce68fc760199ffb985c3635022c74d05df5ef8e25f07f28e2a SHA512 20d96c75fb7916cfd6ab2c9480d0833da81036c4104bfd922eac93e76ef44225b0e27c9fc20aa6bb10c2f7e609a52e8d752b447e41ad1a9ed51715d6e8c9d8eb
-EBUILD libclc-15.0.4.9999.ebuild 1402 BLAKE2B 3c240051e1752ea60d9c040f75a5f95319e97754684c4e98c8bdcc8fe60ec266736d573f71929328f12ce96357ca33376244adf7305d674ec5e21a182b635bb6 SHA512 0986f1338d3048444632759c5276c1bbfc8ed4dc4450a83603985aea7643b26eef86d24550eba3b52be06e851c0ad4d866eee295e84385b26bc3df911c1ad9a6
-EBUILD libclc-15.0.4.ebuild 1413 BLAKE2B 837a7970e531e7198059f14a7ab25f416852993c0775b76baf01e334cc6050ba0714cf74ce645b9c8aa6312152b5991b2aef2ae7d1d10d0235ab6724efe35a28 SHA512 047251cbf6e7185be5061d5d1e6db01833a97702b844511bc5a0db76b7323cb5f253f3ac77593c0b989515b7651c3bef2e3def8b017b1233457bd1ae4696dda5
-EBUILD libclc-16.0.0.9999.ebuild 1423 BLAKE2B 340c42c12fee9ca7f7fca73019d304e182f4e67b4ccd01c742f893483246d95fceafb4bdbdb6b3832520803ab3a7c58b6a21ead7ae40e32c7f0a3cbd48cab862 SHA512 448e79b028b81c9a6a601abb16ed1b4e71ae73611820e5c0f4287a924011619fe9af7d06eb0f2458a3c07fec8e30d1298d3ab810d5bd8bd995fe4e3e894b84c5
-EBUILD libclc-16.0.0_pre20221023.ebuild 1423 BLAKE2B 340c42c12fee9ca7f7fca73019d304e182f4e67b4ccd01c742f893483246d95fceafb4bdbdb6b3832520803ab3a7c58b6a21ead7ae40e32c7f0a3cbd48cab862 SHA512 448e79b028b81c9a6a601abb16ed1b4e71ae73611820e5c0f4287a924011619fe9af7d06eb0f2458a3c07fec8e30d1298d3ab810d5bd8bd995fe4e3e894b84c5
-EBUILD libclc-16.0.0_pre20221104.ebuild 1423 BLAKE2B 340c42c12fee9ca7f7fca73019d304e182f4e67b4ccd01c742f893483246d95fceafb4bdbdb6b3832520803ab3a7c58b6a21ead7ae40e32c7f0a3cbd48cab862 SHA512 448e79b028b81c9a6a601abb16ed1b4e71ae73611820e5c0f4287a924011619fe9af7d06eb0f2458a3c07fec8e30d1298d3ab810d5bd8bd995fe4e3e894b84c5
-MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
+EBUILD libclc-15.0.4-r1.ebuild 1664 BLAKE2B 442e70afd2336bf84f1757208eb3f3cd4aad8d4fbe8fc6e0679aa68fab13892685be093487191579ce11f6498e5dc255af5d5d6f93e2772ead136bebe67e9360 SHA512 8aa5886bffa82f0fc36c91bbc9832210f7db084fbc27ef682d1375b6bc571ce16ce11e3917603a0dc870cb4f84519f368f612962e2958f5e406fb9672d06b3bf
+EBUILD libclc-15.0.4.9999.ebuild 1658 BLAKE2B 3874dd2500b10a36ce6dd24bbce66bcba8b1835859e3a07debc3f4d17081b4b8f34d7adba7666b8c106b455a68b1ad41604d44d36b9ffc63ed40e1d5b99b0f8e SHA512 cf3d643b19823e6c0ec33122ea33b21da8300ac8b7476e906002ed7ef3e0501db2874d97c58e32ec71a524fc1278b29098f521cc0d6ca8076211305ab61a981a
+EBUILD libclc-15.0.4.ebuild 1371 BLAKE2B ec9f955ea786e7e6a407f250355c0a381b47099f4e159d0ba09d74169b4b0b80de9eef220bf0c5c84924537b21d3c303be4aeaf5c7baa6c060f8ffe2162865db SHA512 25c419bc6e6adb458db738a96fd8e80a29959e093af7989931adc70b02991cf0ad6ac259d89a9085275f6b1a4eb7d50a10bbc638c12d6f270ac0f2a4550fa706
+EBUILD libclc-16.0.0.9999.ebuild 1736 BLAKE2B b7c83cbea69242b5e143679e119e9cd54e0301a56ad54006f328a885ed3eef45af5b97a8cc307ed998ce5778ace4795f71bca235589e0f8207558549d029072a SHA512 3c403b99371a6e8d59473bcb439bb6095301ab5646a75c108c909aa466cb140fa10c335a1b102a1539e9ed7df6ae6c757b68ffdb525f3b9f2fcd34fe1522f2b0
+EBUILD libclc-16.0.0_pre20221104.ebuild 1736 BLAKE2B b7c83cbea69242b5e143679e119e9cd54e0301a56ad54006f328a885ed3eef45af5b97a8cc307ed998ce5778ace4795f71bca235589e0f8207558549d029072a SHA512 3c403b99371a6e8d59473bcb439bb6095301ab5646a75c108c909aa466cb140fa10c335a1b102a1539e9ed7df6ae6c757b68ffdb525f3b9f2fcd34fe1522f2b0
+MISC metadata.xml 362 BLAKE2B 768f93d0058e4da4b420569f3f1771dfa7385ad89540bbc18cf53b5a71e3f060a8afa1112ff37570d7fc9dc3e71619fa3fd8d0cf7b5d3954f5110b19e146df30 SHA512 e6335424da09f668953acd39dcd9b03a30e3b509b34b1de5c72644a3740a5b6b287f10e08405b79bafc8104cc4dc1324b7b9d7990c3b560b0235ae82da8c68a5
diff --git a/dev-libs/libclc/libclc-16.0.0_pre20221023.ebuild b/dev-libs/libclc/libclc-15.0.4-r1.ebuild
index 2ec99d83a103..f68055e81f44 100644
--- a/dev-libs/libclc/libclc-16.0.0_pre20221023.ebuild
+++ b/dev-libs/libclc/libclc-15.0.4-r1.ebuild
@@ -11,19 +11,25 @@ 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} )"
+KEYWORDS="~amd64"
+IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 
-LLVM_MAX_SLOT=16
+LLVM_MAX_SLOT=15
 BDEPEND="
 	${PYTHON_DEPS}
 	|| (
-		sys-devel/clang:16
-		sys-devel/clang:15
-		sys-devel/clang:14
-		sys-devel/clang:13
+		(
+			sys-devel/clang:15
+			spirv? ( dev-util/spirv-llvm-translator:15 )
+		)
+		(
+			sys-devel/clang:14
+			spirv? ( dev-util/spirv-llvm-translator:14 )
+		)
+		(
+			sys-devel/clang:13
+			spirv? ( dev-util/spirv-llvm-translator:13 )
+		)
 	)
 "
 
@@ -31,6 +37,10 @@ LLVM_COMPONENTS=( libclc )
 llvm.org_set_globals
 
 llvm_check_deps() {
+	if use spirv; then
+		has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
+			return 1
+	fi
 	has_version -b "sys-devel/clang:${LLVM_SLOT}"
 }
 
@@ -42,6 +52,10 @@ pkg_setup() {
 src_configure() {
 	local libclc_targets=()
 
+	use spirv && libclc_targets+=(
+		"spirv-mesa3d-"
+		"spirv64-mesa3d-"
+	)
 	use video_cards_nvidia && libclc_targets+=(
 		"nvptx--"
 		"nvptx64--"
@@ -56,7 +70,6 @@ src_configure() {
 		"amdgcn-mesa-mesa3d"
 		"amdgcn--amdhsa"
 	)
-	# TODO: spirv
 	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
 
 	libclc_targets=${libclc_targets[*]}
diff --git a/dev-libs/libclc/libclc-15.0.4.9999.ebuild b/dev-libs/libclc/libclc-15.0.4.9999.ebuild
index 95d6c01bbc6c..94f834e120c6 100644
--- a/dev-libs/libclc/libclc-15.0.4.9999.ebuild
+++ b/dev-libs/libclc/libclc-15.0.4.9999.ebuild
@@ -12,17 +12,24 @@ 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} )"
+IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 
 LLVM_MAX_SLOT=15
 BDEPEND="
 	${PYTHON_DEPS}
 	|| (
-		sys-devel/clang:15
-		sys-devel/clang:14
-		sys-devel/clang:13
+		(
+			sys-devel/clang:15
+			spirv? ( dev-util/spirv-llvm-translator:15 )
+		)
+		(
+			sys-devel/clang:14
+			spirv? ( dev-util/spirv-llvm-translator:14 )
+		)
+		(
+			sys-devel/clang:13
+			spirv? ( dev-util/spirv-llvm-translator:13 )
+		)
 	)
 "
 
@@ -30,6 +37,10 @@ LLVM_COMPONENTS=( libclc )
 llvm.org_set_globals
 
 llvm_check_deps() {
+	if use spirv; then
+		has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
+			return 1
+	fi
 	has_version -b "sys-devel/clang:${LLVM_SLOT}"
 }
 
@@ -41,6 +52,10 @@ pkg_setup() {
 src_configure() {
 	local libclc_targets=()
 
+	use spirv && libclc_targets+=(
+		"spirv-mesa3d-"
+		"spirv64-mesa3d-"
+	)
 	use video_cards_nvidia && libclc_targets+=(
 		"nvptx--"
 		"nvptx64--"
@@ -55,7 +70,6 @@ src_configure() {
 		"amdgcn-mesa-mesa3d"
 		"amdgcn--amdhsa"
 	)
-	# TODO: spirv
 	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
 
 	libclc_targets=${libclc_targets[*]}
diff --git a/dev-libs/libclc/libclc-15.0.4.ebuild b/dev-libs/libclc/libclc-15.0.4.ebuild
index 9993b696f309..19a2eb2a6f32 100644
--- a/dev-libs/libclc/libclc-15.0.4.ebuild
+++ b/dev-libs/libclc/libclc-15.0.4.ebuild
@@ -14,7 +14,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 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="
diff --git a/dev-libs/libclc/libclc-16.0.0.9999.ebuild b/dev-libs/libclc/libclc-16.0.0.9999.ebuild
index 2ec99d83a103..ed252b9ab52d 100644
--- a/dev-libs/libclc/libclc-16.0.0.9999.ebuild
+++ b/dev-libs/libclc/libclc-16.0.0.9999.ebuild
@@ -12,18 +12,28 @@ 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} )"
+IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 
 LLVM_MAX_SLOT=16
 BDEPEND="
 	${PYTHON_DEPS}
 	|| (
-		sys-devel/clang:16
-		sys-devel/clang:15
-		sys-devel/clang:14
-		sys-devel/clang:13
+		(
+			sys-devel/clang:16
+			spirv? ( dev-util/spirv-llvm-translator:16 )
+		)
+		(
+			sys-devel/clang:15
+			spirv? ( dev-util/spirv-llvm-translator:15 )
+		)
+		(
+			sys-devel/clang:14
+			spirv? ( dev-util/spirv-llvm-translator:14 )
+		)
+		(
+			sys-devel/clang:13
+			spirv? ( dev-util/spirv-llvm-translator:13 )
+		)
 	)
 "
 
@@ -31,6 +41,10 @@ LLVM_COMPONENTS=( libclc )
 llvm.org_set_globals
 
 llvm_check_deps() {
+	if use spirv; then
+		has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
+			return 1
+	fi
 	has_version -b "sys-devel/clang:${LLVM_SLOT}"
 }
 
@@ -42,6 +56,10 @@ pkg_setup() {
 src_configure() {
 	local libclc_targets=()
 
+	use spirv && libclc_targets+=(
+		"spirv-mesa3d-"
+		"spirv64-mesa3d-"
+	)
 	use video_cards_nvidia && libclc_targets+=(
 		"nvptx--"
 		"nvptx64--"
@@ -56,7 +74,6 @@ src_configure() {
 		"amdgcn-mesa-mesa3d"
 		"amdgcn--amdhsa"
 	)
-	# TODO: spirv
 	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
 
 	libclc_targets=${libclc_targets[*]}
diff --git a/dev-libs/libclc/libclc-16.0.0_pre20221104.ebuild b/dev-libs/libclc/libclc-16.0.0_pre20221104.ebuild
index 2ec99d83a103..ed252b9ab52d 100644
--- a/dev-libs/libclc/libclc-16.0.0_pre20221104.ebuild
+++ b/dev-libs/libclc/libclc-16.0.0_pre20221104.ebuild
@@ -12,18 +12,28 @@ 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} )"
+IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 
 LLVM_MAX_SLOT=16
 BDEPEND="
 	${PYTHON_DEPS}
 	|| (
-		sys-devel/clang:16
-		sys-devel/clang:15
-		sys-devel/clang:14
-		sys-devel/clang:13
+		(
+			sys-devel/clang:16
+			spirv? ( dev-util/spirv-llvm-translator:16 )
+		)
+		(
+			sys-devel/clang:15
+			spirv? ( dev-util/spirv-llvm-translator:15 )
+		)
+		(
+			sys-devel/clang:14
+			spirv? ( dev-util/spirv-llvm-translator:14 )
+		)
+		(
+			sys-devel/clang:13
+			spirv? ( dev-util/spirv-llvm-translator:13 )
+		)
 	)
 "
 
@@ -31,6 +41,10 @@ LLVM_COMPONENTS=( libclc )
 llvm.org_set_globals
 
 llvm_check_deps() {
+	if use spirv; then
+		has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
+			return 1
+	fi
 	has_version -b "sys-devel/clang:${LLVM_SLOT}"
 }
 
@@ -42,6 +56,10 @@ pkg_setup() {
 src_configure() {
 	local libclc_targets=()
 
+	use spirv && libclc_targets+=(
+		"spirv-mesa3d-"
+		"spirv64-mesa3d-"
+	)
 	use video_cards_nvidia && libclc_targets+=(
 		"nvptx--"
 		"nvptx64--"
@@ -56,7 +74,6 @@ src_configure() {
 		"amdgcn-mesa-mesa3d"
 		"amdgcn--amdhsa"
 	)
-	# TODO: spirv
 	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
 
 	libclc_targets=${libclc_targets[*]}
diff --git a/dev-libs/libclc/metadata.xml b/dev-libs/libclc/metadata.xml
index 072910296ca3..7518ab30a1c7 100644
--- a/dev-libs/libclc/metadata.xml
+++ b/dev-libs/libclc/metadata.xml
@@ -7,4 +7,7 @@
 	<upstream>
 		<remote-id type="github">llvm/llvm-project</remote-id>
 	</upstream>
+	<use>
+		<flag name="spirv">Build SPIRV targets</flag>
+	</use>
 </pkgmetadata>