9 files changed, 65 insertions, 82 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 6c87377c361c..51bd74fb652c 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest
index 38586edd2e5c..0320e29b4e87 100644
--- a/dev-libs/clhpp/Manifest
+++ b/dev-libs/clhpp/Manifest
@@ -1,5 +1,3 @@
-DIST clhpp-2023.02.06.tar.gz 106874 BLAKE2B c57cdff048fe80b8fd95f14a77883f0d3eb7a64f7b9fea2661e0127172783ece911f908d7b6597e1b1b2cdfc86c1d841a3047d295a85408ba4c25cb5c8a262f8 SHA512 30252a832287375d550a5e184779881d5b22207a636298c7f52f277c219d3a1ae6983259cfea7bf4f90f0840fec114ee0e7a8c1e6a6fe48c24fd3b5119e7a7f8
 DIST clhpp-2023.04.17.tar.gz 115042 BLAKE2B df0db751eda9fe2f23a5e3ef97f263885a09ca4b341b24c9580522e84a192e9afe526a441d0e3660e8819492945b2ff89bff7c96cd1fd1b3bd6a177042ec759e SHA512 1e37af647a37737240de1622bd772e1f154a07c2d27e020487163c42d0833096c1a2f2f2185b8f6371889c2cad3992f0c7a9d233c36941367da743ee7ee8e486
-EBUILD clhpp-2023.02.06.ebuild 932 BLAKE2B b0527213917a031f4500183a4754f26cb69e6bafca6abf1a51d6bface0a90f3fa0165f8b4b3d7d94a9fc626b1252eea0399a64b4c5d3a8585fce36b0a8b6622b SHA512 c9fae768a12f4dd132787a8233fb1cd7f209ed46f88bf32cbedd59345ea1df230bb23b44e491dee615dff2f3deaa82926a82f0dd249305f8db464bf2f6cbbb1b
 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.02.06.ebuild b/dev-libs/clhpp/clhpp-2023.02.06.ebuild
deleted file mode 100644
index 366b4f04fcb7..000000000000
--- a/dev-libs/clhpp/clhpp-2023.02.06.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/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index a917a22ff172..7021a4d2aeb7 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,5 +1,3 @@
-DIST opencl-icd-loader-2023.02.06.tar.gz 92484 BLAKE2B f86264a57533e67816711dba86e4f34920d5b1a605a6c0fdb01314b09eb9ced2022b1d25a88dfff58356ec8cdcf8ff8b1c857d49ddf196a4506e4e3420e3ace3 SHA512 e418b8f3cccb4716ed44acd0677afb96705f8b40a7714d483f1efe1a9b835f4a823c5a80f8457e72c8004f76d8a07c45d9cca55b699dd2fdaa6fe9f8cc863cbd
 DIST opencl-icd-loader-2023.04.17.tar.gz 93179 BLAKE2B 056213043095029cdc721d87fc9fb5023f6c593e975b4b069037c8db278317e68517227d2ccea444469baf15412e435de3dd8418f1d010c72a6c1dc252742b87 SHA512 55d1f5ac62da1294bfe4814f2370db0a11636f18afa7da06f04b84b9c1e6ef546846420d27094aaa838eb6cc87197cf6e120a38af0b7ce71297be646a58ecb7b
-EBUILD opencl-icd-loader-2023.02.06.ebuild 863 BLAKE2B 4753c9590b0bcc6dd766ad9f1a4007da39328bcbad008ffcc048a41c088b9eda025d5b989f54efb4e9ea7ad9d8bcffd58ee28548b91049d624b35196e107ff50 SHA512 9838eb2a798545ca1993ba44be5817443781fa9828308bcf1d302ce72fb1430a3557b0a6dfcde5c610632f0fc0f9b9df952254768d25583a73920ed07477b6b1
 EBUILD opencl-icd-loader-2023.04.17.ebuild 874 BLAKE2B fda2e93557f870438e891594cec72322db08aec5e7fb1ccf2b2023a987e3899ce429ccf165f1270432ff53fa926eddb69ed687301b32f3d69cbcf4ec9eabb6ff SHA512 b672c9dad2864129601f47e71f1b8475ad0c268b0f1b04868e69fe73d47783eb5db4bc02ff12708270b304fcc1d5067ccfb295afd6b2483f5beed45b1463b1bb
 MISC metadata.xml 341 BLAKE2B b49a18b36fbbf0c978ad2445ee4688f32cafd66001f04e02256a420b9dd1e808f85c32e43adb15e5814957f5273a135f82c5fdfe37baf7e6fa73abe2c8fcd990 SHA512 5dcf111b1e5ec3e7532258ed2e29946cab993051193bec1413096b52148117c935b028e071c501863620c4a51e81aee333b9e4375caa14fdab3701524da99268
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.02.06.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.02.06.ebuild
deleted file mode 100644
index beec3f3cd7ea..000000000000
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.02.06.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-multilib
-
-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}"
-
-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
-}
diff --git a/dev-libs/yyjson/Manifest b/dev-libs/yyjson/Manifest
new file mode 100644
index 000000000000..c755db3150c9
--- /dev/null
+++ b/dev-libs/yyjson/Manifest
@@ -0,0 +1,4 @@
+AUX yyjson-0.7.0-disable-werror.patch 303 BLAKE2B 18a7ed6a7a054be4a89a42597926ff7ed5bd1f0ed0e5cb51287d1e43b507f7d7781f9ba78d4942fc1381b8f2dc0bbeac9ec106a9b8e8a2e461d6a6993af52056 SHA512 59e91c71eb214c0e2579a0c170199ed26f6f9bbce3cf110653fafbfe059743033948108d3d895b11bd4d43d05881d13e446981a6711b22107909e3d4647be739
+DIST yyjson-0.7.0.tar.gz 1511395 BLAKE2B a088ecaf049b4fd5562a15759dfb67e5a1612ca848a658898bf7b9fe2e8bf7df1270d2a4fe477a92df8963065fb60ce5dbf69da5eb7fa1e282f821222329032d SHA512 91a14d2292cebc5d3eb0954511c1d27d6fa45f778febe73bac700acdbeba3bfc485db444d49cab903dc323eacdb74625059465e4a45a1eca5a1e397768f422f5
+EBUILD yyjson-0.7.0.ebuild 862 BLAKE2B 03284da9257936cb3e37686e0cdf22617614848abf20ea11cb2cbd1a6c8c375d842d09b03ccb90e1a98426fb4d788a365a6e6ea5e4914644d74359fc292feeee SHA512 97069b6f7036e0c72b7e4a172521d2aa87ee0527fb8b65679c4923f11cdbdfb030730cedf8a18917717730ba5950f60dcd405468a27e78b4a8d8889c8d72ebf5
+MISC metadata.xml 297 BLAKE2B a5ac4375cfb73215475fbcdc7dcfd5edde21a0696761230679afa8ca7cbd520a684b6b96641d8c61104dc3dbde5d9ac9fd66a24c217aced8a6bcce79fd9926c6 SHA512 2c347d6f55a7e970387ca0e30c2064e53e64eb64ef2e7b615bca747fd83834064fd7ae1566a9353f5eedc32c606aca1f425b13573b8fe5c519c6cca2c4b4e495
diff --git a/dev-libs/yyjson/files/yyjson-0.7.0-disable-werror.patch b/dev-libs/yyjson/files/yyjson-0.7.0-disable-werror.patch
new file mode 100644
index 000000000000..5dd1aacbfca7
--- /dev/null
+++ b/dev-libs/yyjson/files/yyjson-0.7.0-disable-werror.patch
@@ -0,0 +1,12 @@
+Upstream sets -Werror by default, this is not recommended in Gentoo.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -325,7 +325,6 @@
+         set(YYJSON_BASE_FLAGS
+             -pedantic
+             -pedantic-errors
+-            -Werror
+             -Wall
+             -Wextra
+             -Wconversion
diff --git a/dev-libs/yyjson/metadata.xml b/dev-libs/yyjson/metadata.xml
new file mode 100644
index 000000000000..e0e600014091
--- /dev/null
+++ b/dev-libs/yyjson/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ceamac@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ibireme/yyjson</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/yyjson/yyjson-0.7.0.ebuild b/dev-libs/yyjson/yyjson-0.7.0.ebuild
new file mode 100644
index 000000000000..30376e8e222a
--- /dev/null
+++ b/dev-libs/yyjson/yyjson-0.7.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Fast JSON library in C"
+HOMEPAGE="https://github.com/ibireme/yyjson https://ibireme.github.io/yyjson/doc/doxygen/html/"
+SRC_URI="https://github.com/ibireme/yyjson/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT test? ( BSD )"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.7.0-disable-werror.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DYYJSON_BUILD_DOC=$(usex doc)
+		-DYYJSON_BUILD_TESTS=$(usex test)
+	)
+	# TODO: -DYYJSON_ENABLE_VALGRIND=$(usex test)
+	# https://github.com/ibireme/yyjson/issues/134
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && dodoc -r "${BUILD_DIR}"/doxygen/html
+}