10 files changed, 50 insertions, 57 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0b403dc4c73c..69960e113b82 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/capnproto/Manifest b/dev-libs/capnproto/Manifest
index 6e3caa11f5f5..2c9972b04088 100644
--- a/dev-libs/capnproto/Manifest
+++ b/dev-libs/capnproto/Manifest
@@ -3,6 +3,6 @@ DIST capnproto-0.10.2.tar.gz 2279393 BLAKE2B d78442bc122bc976fb636dfde694e10414b
 DIST capnproto-0.10.4.tar.gz 2280389 BLAKE2B 3a893b766302a96df71763613fa1624f6b7229b8926099d1d9c217f4a1817db16aa24d3bec7950e480da6b027bd9b6b0b5a4083e982e7bda8fc6594794fd379a SHA512 6179a202399f4391014827799c954e0b3ad811ab82ebd0addc01d8c7695b9c1a9c0a0c26b018cd392e3731e12b30cca58545459d1b3a140e86e34b75d7eacbc7
 DIST capnproto-0.9.1.tar.gz 2238849 BLAKE2B f8de56c7f79b0ddad35f3e8fec7740510ca2328e4ddc633a71420901d3fc44df44d807c3965213dfc2535bbe03832c5164242d33cd0bff901d6f288fb62bab21 SHA512 bdc5960f26214139744d768ca4558b085e2d359c375a8849ca532a4c458a2daf0ee1a1f4d00745de5abf353aa1e4084a2d85e5523006f23f591f21fac2d847fd
 EBUILD capnproto-0.10.2.ebuild 1040 BLAKE2B 947227d338687a593c3e5f039ad0f353508aa56e6343ece186fcb574d90c6ffe06391eabc0f07c746c86c6f14c9f6165c8417707d520c6d5fa3effd29d7c6a4e SHA512 28d1362f934eeedeb8a3110ec68426122a085aced8f6fa30e280978e875953452686257d1e5117157ff060ca9b8430398bf6f9912f0148ef894e3855f41cd5a4
-EBUILD capnproto-0.10.4-r1.ebuild 982 BLAKE2B a141d81d301022490d33228d9042ca4ee462fd220e6475e41b0b34b696c2313fd69e3068df1dca9699ac056d224390e28075fc4938308e069a2074cd6e13ee05 SHA512 e4bd279f63555f406a0aee3bb7f20cfe2a2ebc0d77e6b1e9e966d157ad8019b2b51eda7f181721e52049ebf67115316caa9daff410226e30917a82bf98b92163
+EBUILD capnproto-0.10.4-r1.ebuild 989 BLAKE2B 9cb9afaa313d4ae36d385b8aa2a2cd9e3e5d6e373cdbd51a1e5aa2484528e582831ca4d3f4a7b20fc6bfb20236720033a508279b06b054b6c7d59d632d11e21c SHA512 f7d705c96fd048002da554fe842e28ee7dda42bca3b1844b2c2a7ca48608573e7f16b5eacf74a03b2d85aad97914dde8e93d74f879263843bd8d1f33c04e41d7
 EBUILD capnproto-0.9.1.ebuild 982 BLAKE2B 14fecab4dff6be5e7b42222cecd47664a85c45058d810c578c3d093b7c7b6cc61d9ce72ca1aae7995ea7b729f202daa17a46303c4062e06eee81b41029e8c631 SHA512 1db279715ff228a167b8e8f5d87a5f77e0d5d2c1855a72f0c522792ed2e34dec52c11a97e9cdbe58741e87c30faa5954cc0f80b5d2887113aac6260edee22a18
 MISC metadata.xml 347 BLAKE2B 36c92aa137b803a5b0804f7684ecd55e13733f506000bed2fa306267b87922255486124dffe336822554c8644e2b2b34cfa13a5456a0f69f0e5b0e4136a1ce95 SHA512 af4c39c709263a8d5a3849a057475cebd9c7bac0228d599c28d0d9298c1c0d06a744f5999198217ee9248ed0318f95d376fb1802afe766082d18606f4776be57
diff --git a/dev-libs/capnproto/capnproto-0.10.4-r1.ebuild b/dev-libs/capnproto/capnproto-0.10.4-r1.ebuild
index 30c2d9f10ffc..ce80f057da1e 100644
--- a/dev-libs/capnproto/capnproto-0.10.4-r1.ebuild
+++ b/dev-libs/capnproto/capnproto-0.10.4-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}/c++
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ssl test zlib"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest
deleted file mode 100644
index 0320e29b4e87..000000000000
--- a/dev-libs/clhpp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST clhpp-2023.04.17.tar.gz 115042 BLAKE2B df0db751eda9fe2f23a5e3ef97f263885a09ca4b341b24c9580522e84a192e9afe526a441d0e3660e8819492945b2ff89bff7c96cd1fd1b3bd6a177042ec759e SHA512 1e37af647a37737240de1622bd772e1f154a07c2d27e020487163c42d0833096c1a2f2f2185b8f6371889c2cad3992f0c7a9d233c36941367da743ee7ee8e486
-EBUILD clhpp-2023.04.17.ebuild 931 BLAKE2B 04ac707b17d11b1fc5dc83ea0d6f6c7b85d2970bb617da5afe29b53b4c543faf828e840df1331cb39495bea491b31e6ac07857e6599578005775f1065b7399b0 SHA512 0df6000f35eb499304dd4aa224d033be68b91ae586d3870e380f7e97f00d6d00cae38fe83a0038851665ab4f578f0f94f8c1ea9b22f7bdcd55effc649c8ddc2e
-MISC metadata.xml 346 BLAKE2B acef91691221b9b27c8153b22470984b76fb92c720b9017da5cbae9464839c9625ea1d8902d18bf711ef7fcb435a07e7baf781d998881fe8179780d68e4c505e SHA512 78da9f326b7064b15eaf832bda21362f0a6eb495ed6a63c01cafb961d4ec7791c0806bd5f14d774092783fb55bb57012dc5ed74c04d445fce38cf72bc3998f73
diff --git a/dev-libs/clhpp/clhpp-2023.04.17.ebuild b/dev-libs/clhpp/clhpp-2023.04.17.ebuild
deleted file mode 100644
index 9c106083d8d2..000000000000
--- a/dev-libs/clhpp/clhpp-2023.04.17.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PN="OpenCL-CLHPP"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Khronos OpenCL C++ bindings"
-HOMEPAGE="https://github.com/KhronosGroup/OpenCL-CLHPP/"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Khronos-CLHPP"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="test"
-
-# Tests require CMock (NOT cmocka), which is currently not in Gentoo
-# and has been found to be extremely awkward to package.
-# Should it ever get packaged, consult git history for how to set things up
-# for the clhpp test suite.
-RESTRICT="test"
-
-RDEPEND="virtual/opencl"
-DEPEND="${RDEPEND}
-	>=dev-util/opencl-headers-${PV}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCS=OFF
-		-DBUILD_EXAMPLES=OFF
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/clhpp/metadata.xml b/dev-libs/clhpp/metadata.xml
deleted file mode 100644
index 4fab41399c23..000000000000
--- a/dev-libs/clhpp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>marecki@gentoo.org</email>
-    <name>Marek Szuba</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">KhronosGroup/OpenCL-CLHPP</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index e95eec861bd6..c972d7191d96 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -3,5 +3,5 @@ DIST libwacom-2.7.0.tar.xz 111424 BLAKE2B 2cb046a7390c017680a2a67197896b0613fa3b
 DIST libwacom-2.8.0.tar.xz 112244 BLAKE2B cc9bd7118f8e8d8d4ee3a22a6af20f00b95a3660cbc7c0822b7c067c1e78d89a9615db710cd8f3fbcf3a14ccdd434a2694dbb3ce0ef9bdd540b456c774927536 SHA512 b374ee8ded4f5cb7961699d2b9826ad69a3089f9a3073b4275596e1036f0e08813fba09c98653e852da73781c34c779e3faf20dab66eff667812a655e153f133
 EBUILD libwacom-2.6.0.ebuild 1493 BLAKE2B c4f9b028abe655a8dcb050a7203aebe12fc58c1e82b7f74453e24cb3749815877b1b818c7156a5b7180a4ae74d97cac5d43de89f7d0feae0fccbafd3b494ae33 SHA512 c246818c84be4deedf7c80a1b725aec84d0259888f43602afaf6c85eb3a124cfdc182e39ef246286ad3e5130e5eb0e9b62d98b0b4ed1ff0233482f70c46abc23
 EBUILD libwacom-2.7.0.ebuild 1493 BLAKE2B c4f9b028abe655a8dcb050a7203aebe12fc58c1e82b7f74453e24cb3749815877b1b818c7156a5b7180a4ae74d97cac5d43de89f7d0feae0fccbafd3b494ae33 SHA512 c246818c84be4deedf7c80a1b725aec84d0259888f43602afaf6c85eb3a124cfdc182e39ef246286ad3e5130e5eb0e9b62d98b0b4ed1ff0233482f70c46abc23
-EBUILD libwacom-2.8.0.ebuild 1416 BLAKE2B 6e8f6f39545b88d2257aabccafe0c90046a08554b306a038440da62cd5f1a948c484dc2d2cd3479dac3b32ae873c225a7722d3e0ce3b8ee15ec91904ec6d19ad SHA512 3b0663ff887abe42017d3910a28a3244746f9549abbb69a86d206a8579a5626e11bf9288e03008b68dc835e6686f3287777d328f3fae80c8c85afef5cf2634ef
+EBUILD libwacom-2.8.0.ebuild 1415 BLAKE2B e1c7454a3baec0a9eb06d66509a22d8c14704ac497b1a65f08a17c098ac85bf3074ee8ef4ce0736f66df749bd3644189ec30fd3e982cce447bb738cfc6d31693 SHA512 efc47c768680618a904006ec7af5a387dd8bbbbcf59d9a490ab34be3f208000363008644ec0198dbadb994a238371bfc035aa2b8cbd3d6b1d657defc8f028a06
 MISC metadata.xml 313 BLAKE2B bee5263fa9309d84996574f86a17a4292e58a7eefc65159ecd0df578ccab24e39f4c050deaaabbcd33e5a86292af6c57c5b2c9eb2c9b6e3caeab86e5633cf3c7 SHA512 b1575775a9f633ffe2124bd5ebef65ab864ae697ed733f50e3028484d2d60ea827e5ac12305d57beedcdbe58d8699bbc7e67cb0c844041c7a56045cb91eae633
diff --git a/dev-libs/libwacom/libwacom-2.8.0.ebuild b/dev-libs/libwacom/libwacom-2.8.0.ebuild
index 886211f149fa..949cf4f8b757 100644
--- a/dev-libs/libwacom/libwacom-2.8.0.ebuild
+++ b/dev-libs/libwacom/libwacom-2.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/9" # libwacom SONAME
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index 8779b1bc52f5..f0f6deb59ba2 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,3 +1,5 @@
 DIST opencl-icd-loader-2023.04.17.tar.gz 93179 BLAKE2B 056213043095029cdc721d87fc9fb5023f6c593e975b4b069037c8db278317e68517227d2ccea444469baf15412e435de3dd8418f1d010c72a6c1dc252742b87 SHA512 55d1f5ac62da1294bfe4814f2370db0a11636f18afa7da06f04b84b9c1e6ef546846420d27094aaa838eb6cc87197cf6e120a38af0b7ce71297be646a58ecb7b
+DIST opencl-icd-loader-2023.12.14.tar.gz 93193 BLAKE2B 13b0e085dddfd1d3d493dac40984b18b839a58c2a72a8a0684a353391d9fa80888567d97e7de06caa4f0f8255bb9747b88c218ead112dca3c1df971339aded5b SHA512 b30aa0b856e6c73450fc23f768201ac01d3c5519a14305c79127debc6407be656b68ae2bd527bb7225d4268865f7bdf0b384279eb78b2806725d37ab940bf56e
 EBUILD opencl-icd-loader-2023.04.17.ebuild 953 BLAKE2B 8827e26e1f5c3f07934fa282bdffdd1a6ccbe10c8edea9ac226fcebe06fd91d15bd3bebba7b92939f48d619522e85ff37e122b4f2deb0fdf6e9689e340815b17 SHA512 e2e4dd064bd37539b170dfe3f8504de0fd5f689506001cd82407928b755c4d0ccf8d16918ca24ad62e857aaa4a7939299f4bf79887175b028252b2131867a78b
+EBUILD opencl-icd-loader-2023.12.14.ebuild 956 BLAKE2B d0dc0ea55c407fc0337f291dad413406925705db70ee5031770d6945305ea74946f175cff10d43cd069ded3d4ec86c3804f590f4b9526abb1dc3cbbd720730b7 SHA512 c00bbd25781e7287400070912e34ac03cd7da506a3af24e1dc91cd8b9adb448de77d30252f42a7d863342aad6782f13076b985f7ceff96d1f35432705a952abb
 MISC metadata.xml 341 BLAKE2B b49a18b36fbbf0c978ad2445ee4688f32cafd66001f04e02256a420b9dd1e808f85c32e43adb15e5814957f5273a135f82c5fdfe37baf7e6fa73abe2c8fcd990 SHA512 5dcf111b1e5ec3e7532258ed2e29946cab993051193bec1413096b52148117c935b028e071c501863620c4a51e81aee333b9e4375caa14fdab3701524da99268
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.12.14.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.12.14.ebuild
new file mode 100644
index 000000000000..3531e3631cf7
--- /dev/null
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.12.14.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib multibuild prefix
+
+MY_PN="OpenCL-ICD-Loader"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Official Khronos OpenCL ICD Loader"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-ICD-Loader"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="!dev-libs/ocl-icd"
+DEPEND="${RDEPEND}
+	>=dev-util/opencl-headers-${PV}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	hprefixify loader/icd_platform.h
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local -x OCL_ICD_FILENAMES="${BUILD_DIR}/test/driver_stub/libOpenCLDriverStub.so"
+	local -x OCL_ICD_VENDORS="/dev/null"
+	cmake_src_test
+}