6 files changed, 120 insertions, 1 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 2db231e00639..d033831ebc52 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/c-blosc2/Manifest b/dev-libs/c-blosc2/Manifest
index af424bf7dee8..d3ae8fed85b7 100644
--- a/dev-libs/c-blosc2/Manifest
+++ b/dev-libs/c-blosc2/Manifest
@@ -1,5 +1,6 @@
+AUX c-blosc2-2.9.1-header.patch 882 BLAKE2B e1537c56f56aba3ba7012c1bad8460514e4d41cccf73394986fc4389b431d51934380d0ce674922c5c3c6f7c43f626ee2dce41ed7dca0f72aef52fb8cba6f735 SHA512 645c6e3ee1178b292341eb6758e9c49377ad1571cb222dd270eb88c8664ed3c290c6295733c265a3397008899f67b407a0af330a65d0e9f86fdf5c2cc5ba1842
 DIST c-blosc2-2.6.1.gh.tar.gz 2365300 BLAKE2B a3fdc8798eb70e97791b7b708ef872142d38b9c4fdb8efc6d5da2010149fa61f4115f27af630a43edd5f351cb8693fbb79457f19ccf1a518f057902b93196b3d SHA512 9f5daa59d5191784ee91deb18ed15a3b36504b05061ca8b1532eaf8e402c793944059894b277843e8da19f00af05615e0865d9fdb80decd83aa07867b0e661a0
 DIST c-blosc2-2.9.1.gh.tar.gz 2793299 BLAKE2B 1853611566f081f5c6236ade1882b07aa6d596f65bb303823f418faaf0e971c1850e3e78ca501650880d4611110200c302896e81a5b13cdf05bc43c81b81dd3a SHA512 9430c026f9d7a98e38915e3d308402989073aa6fa1e8e1d5b9bdb155c70c5cc24ca118cdb5b3584647f72ae80a13be0a8467250af7ef336a1ac72eb8ec8a67f5
 EBUILD c-blosc2-2.6.1.ebuild 1391 BLAKE2B 2b44bfc10ec112298f66cbf8d681ff7396b37378c021d4c43492c6ec02a5483c3e04971b9c4d8aa21ec6fea0b96cefc7918c71dfef1381ef0daab64e2c400afc SHA512 bd4aee3783cc1fac740df283629054fdb83a5c98406b7f39efb9aff412aac0387a1adfbed9c3506e66bf5d826df2cddd89350a7b54fc15f8af91aeff53841fac
-EBUILD c-blosc2-2.9.1.ebuild 1394 BLAKE2B 8a147114436734249aee396ab2f0e0a57e84d741fa104baf21b88bd79daae253018e19713628eaa4caae86fa74c0dee7e3e9f9efd6ff14bae1f11ca2d4ae6778 SHA512 232708c46657997be859a9a1f545fc4235165a371633ae09dd4aac9e4a87bfab706741471904ff3e9537b4917c9ccb29fd1fb9b039667e12dd1bd8f83b8a01fa
+EBUILD c-blosc2-2.9.1-r1.ebuild 1474 BLAKE2B 72fc3e552d5a38bac4fe8e0b81ef8295dda1c1de8a470a8652a745e42f480b5d642856ea9e242a656ed4d8a5591e4e65f7f51106ea2ce988b6cb10238cd07afa SHA512 bbfe7a2bdd3a7effe2ba2b6b30cdd0d7d016f7b1829373315d8b522b53f4d9b21c04c07a3b80d82464ddb2174b48b26543b9c5aa87b7d883d2231bb8f84bec31
 MISC metadata.xml 327 BLAKE2B 5fafd7f688780e7c5479d492da4943b9a95122d5c64e36e4415fe69a708f983f9463824981d771424c1c75f7236a159ef843738a0b31430ccd572770fbc5a74e SHA512 9d2aa06eb8e144bafe1c65b9c7704993633f9e1db629d77209e8c832e09de34c641d9f588cf208d8f5f65ff489c56f1e01ef573213439ba99678601d6a790ee0
diff --git a/dev-libs/c-blosc2/c-blosc2-2.9.1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild
index 1a7c40ef0f55..842752b8909c 100644
--- a/dev-libs/c-blosc2/c-blosc2-2.9.1.ebuild
+++ b/dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild
@@ -31,6 +31,11 @@ RDEPEND="
 	${DEPEND}
 "
 
+PATCHES=(
+	# https://bugs.gentoo.org/906644
+	"${FILESDIR}/${P}-header.patch"
+)
+
 src_configure() {
 	# remove bundled libs (just in case)
 	rm -rf internal-complibs || die
diff --git a/dev-libs/c-blosc2/files/c-blosc2-2.9.1-header.patch b/dev-libs/c-blosc2/files/c-blosc2-2.9.1-header.patch
new file mode 100644
index 000000000000..5ec28e936de7
--- /dev/null
+++ b/dev-libs/c-blosc2/files/c-blosc2-2.9.1-header.patch
@@ -0,0 +1,26 @@
+From 04035a3759b8c100e4808918e44a3eaef4969875 Mon Sep 17 00:00:00 2001
+From: Dimitri Papadopoulos
+ <3234522+DimitriPapadopoulos@users.noreply.github.com>
+Date: Sat, 13 May 2023 21:40:32 +0200
+Subject: [PATCH] BLOSC_STUNE is not defined in c-blosc
+
+Therefore, do not guard it with BLOSC_H, the include guard of blosc.h
+from previous version c-blosc.
+---
+ include/blosc2.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/include/blosc2.h b/include/blosc2.h
+index dc6d1fc7..ef035f07 100644
+--- a/include/blosc2.h
++++ b/include/blosc2.h
+@@ -211,9 +211,7 @@ enum {
+  * @brief Codes for the different tunes shipped with Blosc
+  */
+ enum {
+-#ifndef BLOSC_H
+     BLOSC_STUNE = 0,
+-#endif // BLOSC_H
+     BLOSC_LAST_TUNE = 1,
+     //!< Determine the last tune defined by Blosc.
+     BLOSC_LAST_REGISTERED_TUNE = BLOSC2_GLOBAL_REGISTERED_TUNE_START + BLOSC2_GLOBAL_REGISTERED_TUNES - 1,
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 18af9ac2d94f..e445e9997674 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -4,11 +4,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.3.src.tar.xz 117998136 BLAKE2B 6117586a117c30515e9a5623ab91d29ba65d33c8041274de0ecdbce08ae4fe1c8c3b120db9ca625f42fdbb2301537b4ffe8f7add701c178282be4f583fa0c8ca SHA512 2eb5eca1cbee92a499d7fba5729b61f31186353bc0545b17eefa300cf2b27c8d9a2f307443b2c1c9fe1b0ba412abf5143fdd4d25aaeb33d975a9a834221d7602
 DIST llvm-project-16.0.3.src.tar.xz.sig 566 BLAKE2B bbd96268b006fecffd7402452ae7559bd2ea42c7b771999f58893a48d66b1b056b476a7022c70e2ab8f11dba8318ccc141f97a05ece3b9ed3b4405a6890b0c3a SHA512 cdd5e1c2a252ba58f9b7f8687d6cf9a330c188988707bd72f4632a8158a2db9ac180b3936da99b87e7e99886c39cb8517ebbb04b7d1be198e76964e31ec8dc58
+DIST llvm-project-16.0.4.src.tar.xz 117996332 BLAKE2B 2ea3ef25290ce6180d271e42fbf5e02da973a21e3929c1ac8d1e3e7b268d39db97611e15654ca7e6527add24542d0eed0ee2b1b9d85dfd0ba661e55356bac5d3 SHA512 860bcb999005f55bed25691304983d7bf707f8e3246000595b412b9e88f4a1614be0adb43bbff9c30f49b969373fa0becab02a56ac37915a5f83c52ca8ea3f95
+DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8efcfed9c6780fae3b5c71c0f1aea19a4131ee91c36bdf5b10e44f478f2370c8d22a9038038ecd607f25a95f2d3e33628eb9ac0 SHA512 c902d1b652e6e144fcf74f550539f56665475b6bdf673ba5bf2f1731c3bb8f5717ed56433d488c54bbf2f429b432da84e0bfb4b5fb5f2b7fa208b4f24f682be7
 DIST llvm-project-52882de0e641487329c9e093a90ea3dad01842c8.tar.gz 182953335 BLAKE2B 98682729992d73202e35b540d5d0d87e2acf44e4ab6896a0b6f9ac4a7423f55ad370ae1d7e919a6c86dc7f138a66890ac89b852b03305612d248ab567833f8be SHA512 3685aff0f648e9b477e1e01edebe4799498c21587e2ed5577e2fdef98bb21ea215e206606a11692fbb93a0989fd59fd324faff2c4d97b7afca0851b53f123f05
 DIST llvm-project-7d436d56b60b36508b94e39d08761f1405a9c770.tar.gz 183363091 BLAKE2B e0d3520814b3455e33107715697f00d653ad46bb8d8200caf42c42743520f389217ea2e57449bbc2e98126b602b2aa344e4125e4b1f92152f7957a11a9b9a150 SHA512 65a8e30702217e5e1309efe3daeda5115eeb2e8d25238db1fa4e8dcfc729d75655a10b3394f2f70b7e7efb8ea33a31b6e2482065cc81805023101da00584a81e
 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B b355a93d63ee4beb5f3782cda8514aa02f16e71563f66bac6fc7a5e3beae40efa1bdbe098f3d83ce775d0458118f19fceb7225f2b5511823c8e56cabdae4f2d8 SHA512 488e5c278fe4b48ec8ce6ccd76d489cf08251ce6e8f8bd417048a80a10e4a5cf72f20462aa8115f72afe1a40dbee02d936680d516dd1c940fd52fe6f55402e69
 EBUILD libclc-15.0.7.ebuild 1667 BLAKE2B 496db7dddd88d6aba0a9bf96b9b874022da60073993b456316fd391b9c0ed76134fa4af3cae20df64af47884755aa68ea586fe4410d5a4eeea86b51a99566dd7 SHA512 155adf1cacc694b7a1c4d54b60ead79158796f56b5437109f7f6262c8d40d79181c2d78ec3a2028b5159973ae42da6ca85e159fb95818dfdfb6e384be7fdc25f
 EBUILD libclc-16.0.3.ebuild 1665 BLAKE2B 7868cebbbe8646b753b31cd1e3722b6d6bdc339302da7929c312792aca1a8310eb170c9c4e9322fff4fd432cd543b48d840649619aec64a14d4b77cfb575c3df SHA512 260fa8e90774c7d168815ce2a48826cb72cb73d5bda725db087a2b2ed5a71a5d0529633b89c9bdfaca2552bedc85a84ca48cc9dde243f14c0158ea758fd5f6ed
+EBUILD libclc-16.0.4.ebuild 1665 BLAKE2B 7868cebbbe8646b753b31cd1e3722b6d6bdc339302da7929c312792aca1a8310eb170c9c4e9322fff4fd432cd543b48d840649619aec64a14d4b77cfb575c3df SHA512 260fa8e90774c7d168815ce2a48826cb72cb73d5bda725db087a2b2ed5a71a5d0529633b89c9bdfaca2552bedc85a84ca48cc9dde243f14c0158ea758fd5f6ed
 EBUILD libclc-16.0.5.9999.ebuild 1647 BLAKE2B 3711c9e847206a4eb82851d577ac3c90bb58361ab1d97e0ae1bd084a15b76311cf35b6eaf30a45cb78c1c22d318f5dc27cdb9df4e51effdb56fa096f6ffdb1f8 SHA512 5303f1404e478b766028c565a3f9a5bfc8655f0d71ebcdf5197168acf1c85e1731edf8fba9bc4bbce5d9999086d797b059ea46cc00a6e706d092f3bfefa34eca
 EBUILD libclc-17.0.0.9999.ebuild 1725 BLAKE2B 6af25c457993cd3f87b7fcb43a3824d43d7e57a3208270982dd7cddef72282c99d40d729041157be22b3a638613f1cdc8b43ddae8d19af05b44395cbd28404c8 SHA512 28079adbb36dbcf7beb4069afc4d10e505ae5ca74bbecda5b91c4641294d646a253dcce79149c31b90fa8c241f2155a01ff8f5b0f4d553caafa3412f2b9a20a3
 EBUILD libclc-17.0.0_pre20230502.ebuild 1725 BLAKE2B 6af25c457993cd3f87b7fcb43a3824d43d7e57a3208270982dd7cddef72282c99d40d729041157be22b3a638613f1cdc8b43ddae8d19af05b44395cbd28404c8 SHA512 28079adbb36dbcf7beb4069afc4d10e505ae5ca74bbecda5b91c4641294d646a253dcce79149c31b90fa8c241f2155a01ff8f5b0f4d553caafa3412f2b9a20a3
diff --git a/dev-libs/libclc/libclc-16.0.4.ebuild b/dev-libs/libclc/libclc-16.0.4.ebuild
new file mode 100644
index 000000000000..e3f8c7873aba
--- /dev/null
+++ b/dev-libs/libclc/libclc-16.0.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+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 ~riscv ~x86"
+IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+
+LLVM_MAX_SLOT=16
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		(
+			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 )
+		)
+	)
+"
+
+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}"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use spirv && libclc_targets+=(
+		"spirv-mesa3d-"
+		"spirv64-mesa3d-"
+	)
+	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"
+	)
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+	)
+	cmake_src_configure
+}