11 files changed, 19 insertions, 28 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ef8f740a0a20..2ce14ed434cf 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/babeltrace/Manifest b/dev-util/babeltrace/Manifest
index e02c523b236f..879b60fdb0d1 100644
--- a/dev-util/babeltrace/Manifest
+++ b/dev-util/babeltrace/Manifest
@@ -1,4 +1,4 @@
 AUX babeltrace-1.5.8-slibtool.patch 4148 BLAKE2B e086dd6aee512a0d2cd3db63a33275dcabb129def9bbaff6cd1b081bed3dc7fcc99d3f645fe009f55db72b72e86b420c9c12757544f85bfe253b55e7940f4c81 SHA512 3a43c19309297838752181c1c4f1957b7fe93900e932410dc237c8d11b4cfa7a5044826e2f60e192dbfeb1fee46185508ed2fa093d62a200dd86ffd78e24a553
 DIST babeltrace-1.5.8.tar.bz2 992610 BLAKE2B 3d47f9ba40b406271a0b35e441968718c93e8744f95b56f79acf8359001ebffb4966931f2860d48ced4f0d98261b37156564a0d798bf8d9e0ed465c05355cc5d SHA512 827749ae8507efd433bb97ef668628837a3ff15b5be5097af5621d46055c6f10401da0be1f9d9f843a96c8c307b33745e04284d166e275e03b7ddb0a7dd57e96
 EBUILD babeltrace-1.5.8.ebuild 795 BLAKE2B ed86a7ec023ed5553b60359ed1d547c34711607d300fee95e1028c40117b31c9d92b81aad019f22c7a8c30a9ec96b9c88748b60e58fd053e2d25346d11391262 SHA512 b99ee491b62e70be6c93e92e2cf7d1f777912815cb19b002df70909168e3402d1e2eb69af2e25c01778a58b982b3e04b6e4509735d1a0c1d1a966c7381a2713e
-MISC metadata.xml 464 BLAKE2B d4bef73cb09891c097caa7406df51a41fc2a32c8c5e88309858a41aaaeb863c41ccf1329f5915ad08831fdea621edcb2bfa6ea1b9a9af5d333364edf43607c9d SHA512 399d6e2343ef12310a982b17a2a9e45543b023da54aac23f077b9999358e280e186937aac6753b53b6830be991a0ed6c6bc349841f135e7675b1f546931cb77d
+MISC metadata.xml 391 BLAKE2B bcebbce1ba6b23ead6210c63ac3b62ddbede04417ec75359d1e18eee66a73abfe5a32d3af731246f2be7ed016d085f2787c4d5ff4892fa8acc724418d49531c0 SHA512 373361a5de42d71175b3358918c66d10e9ef5de64326ee60710d3db1853149d8b3b577c00d65262404e1e5ccf5a12d8c849a1e87e1f7726245ca1e70912fe6cb
diff --git a/dev-util/babeltrace/metadata.xml b/dev-util/babeltrace/metadata.xml
index dd93d24962cc..e19173f54746 100644
--- a/dev-util/babeltrace/metadata.xml
+++ b/dev-util/babeltrace/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dlan@gentoo.org</email>
-		<name>Yixun Lan</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Babeltrace is a command-line tool and library to read and convert trace files to and from different formats. It supports the CTF format, which is outputted by the LTTng 2.0 tracers.
 	</longdescription>
diff --git a/dev-util/lttng-modules/Manifest b/dev-util/lttng-modules/Manifest
index 3dd9a06e6373..95dacad51d75 100644
--- a/dev-util/lttng-modules/Manifest
+++ b/dev-util/lttng-modules/Manifest
@@ -6,4 +6,4 @@ EBUILD lttng-modules-2.12.5.ebuild 1003 BLAKE2B f832e877110422709d9b00c3b0dfdecf
 EBUILD lttng-modules-2.12.6.ebuild 1005 BLAKE2B b6b3c2a093735bddfbf64de28ce391138e8fc6c69d0e6176a8d818b3f34a6d9a4b14c8e146b59f1c023cbf5dc66eeed33fe41c7aadb905ace3e9884fbe4d2075 SHA512 7b18dafcaead0710c05183c5211ff107effa1da1d054042a065d13478fb9936700d3eb421a070be7d92be7174a58bc6256d69b1627848aae2ca40ac74560487d
 EBUILD lttng-modules-2.12.8.ebuild 1005 BLAKE2B a8e08c5a03b608ef3797e7311b25a0a240a4b488122bf6e7687b948d426b110028ba697b6768931e79832cc4c3cbe559211e90f8255854e9b683552f6ae13249 SHA512 99a879768a3be075681fe53e4654b0cca58176179e89ae23f68010c4b762583cd0983d5141ffc19db8bbeed631bb5d887354e28230cb4846209fefcbd1131009
 EBUILD lttng-modules-2.13.3.ebuild 1000 BLAKE2B f3b0dafe272ece335909f92613a35d0cf59eeab008ca73ecc3a0be36f791b141bdebc768e73e86deec90567d22ae34638238de5d96e54b38456dc61e8001f175 SHA512 ed1931c8e6c899ff09125858380b05975f58a72e161d88a0a7351df8aabec44a86d3b80e52956205c61c13a3f4ff33cf7f59b8146d5744b4d60a6b476d999ed1
-MISC metadata.xml 696 BLAKE2B eb719232f619166590ba6b585d512446c7ed89440090552860291c6fb9099f1c059d7a2728be6321ebeac3e549b725d6cadde1856047f064662faf93a3323124 SHA512 76e2fea1f51216138f2afa826107c520ec8a33a17e529ec9682c7c1ceca52e506acdbaa7fe48654da1561a217205a66918b16c86107b387e2c886dfa36006692
+MISC metadata.xml 622 BLAKE2B 5af58e945c1131e978e2336484bec05007622690cdfee3500480f423b3c75105c09480d645c1e3e08b1420cc511cbb924935cc17573d5c5244c9fe2f66f46c9b SHA512 5ff2a41f81ac774d93c573abb300e7166518fccbf3cec827af6da1b97d8360fd41a30ed54286c862a8977187ed50957833ecdb0c478e7245ea124dddf3dc4b56
diff --git a/dev-util/lttng-modules/metadata.xml b/dev-util/lttng-modules/metadata.xml
index 0c489e16ba24..a559bf3a7dcd 100644
--- a/dev-util/lttng-modules/metadata.xml
+++ b/dev-util/lttng-modules/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dlan@gentoo.org</email>
-		<name>Yixun Lan</name>
-	</maintainer>
-
+	<!-- maintainer-needed -->
 	<longdescription>
 		Use the kernel tracer if you are debugging a system-wide performance problem or a kernel problem. This tracer comes with an instrumentation patch for most kernel subsystems, which is enough to debug many problems. This includes system calls, IRQs, traps, memory management, softIRQs, scheduling and many others. Of course, the kernel tracer allows you to add your own instrumentation anywhere in the kernel code.
 	</longdescription>
diff --git a/dev-util/lttng-tools/Manifest b/dev-util/lttng-tools/Manifest
index 8af194ae0392..5defdd5745e1 100644
--- a/dev-util/lttng-tools/Manifest
+++ b/dev-util/lttng-tools/Manifest
@@ -6,4 +6,4 @@ EBUILD lttng-tools-2.12.11.ebuild 671 BLAKE2B 2befc82d0f4bb0e6c030a0103bc483e719
 EBUILD lttng-tools-2.12.3.ebuild 689 BLAKE2B 110357264437ff12de6160bc7f4800231adc9a62701a128d5af6852749f4b3c12cb2b6edd598817fe3a483c58cbca83ee52a26229358348b6a007ad1ae54488a SHA512 02ca8f2f6dea11adfbbe849627e23df3ca814ea5f7c145e7c0ce5e0f30b2f6314fec319e7de8bc32ceaba97dcc9dd83873e006c4e1a24b2a7fafacb88371aec7
 EBUILD lttng-tools-2.12.5.ebuild 671 BLAKE2B 544cb8bdece997a6f78d8bd1d13e99b2fdc4d9029b3b156d70c2fb88fc09bd9004b3a055e44ca059cdd8fb3fc455ef44103fd86e628061d3c17ce34ab1dd4e20 SHA512 e21a2fc213c655490db1fb661a38c85b1915169ca1132f1ca9dcc44d7bff582cf2d5e81300f4d1c529144c1f85bee705dd6e6e3804d90f0b36d711ace3fd7d49
 EBUILD lttng-tools-2.13.7.ebuild 671 BLAKE2B 5e0e4944b3a81521f065cd07dcbc379810120837bdcc7d4eb1745ec9771ddaa7437696a92aefda7af10035871072bcbc9b9402c26efb7393470f387afda5362f SHA512 ae900ce78a4fcb8506d6ea6fd14317cdffb1266f8bc1316097fee0b8f56df5abd3105d02f5c53ab535f799216c8eae72ad0743f352169fd4be44119e63fc7805
-MISC metadata.xml 494 BLAKE2B e3d5a99fabe22b2076098cb3bdf18847afd9132695734e2060d2570acd5ded08684fca3d6655f8c05fc55c85def6d0de205ebd98c069247ed7303cb042a5978b SHA512 76a37a5dfc757933f077af076fda1105874bde77ab73366ca272303e5e8d16fc324f9eb0158ee1103d2a06221dc8267bb286dee4de80eff4b09dfc340c46dc59
+MISC metadata.xml 420 BLAKE2B 9166f321bf2b93501d3aa50c4cbce76c7521c31550a97e7f6bf30b61fd8a1b80b7019568b26411479d90a3e1fe344bd53daeba9e0392b3dc34edd18e912f7941 SHA512 50ef1a26b26d0d8b18b206119abdf3f738b0f542d51c0de3a5c41e42c2bdad6a2bba9a30e7ce08a363116b2639da567da17a513dcfabfe1a844b7fa673590102
diff --git a/dev-util/lttng-tools/metadata.xml b/dev-util/lttng-tools/metadata.xml
index be75e6034bf1..1eb9a06b1909 100644
--- a/dev-util/lttng-tools/metadata.xml
+++ b/dev-util/lttng-tools/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dlan@gentoo.org</email>
-		<name>Yixun Lan</name>
-	</maintainer>
-
+	<!-- maintainer-needed -->
 	<longdescription>
 		LTTng, the Linux Trace Toolkit Next Generation, is a project that aims at producing a highly efficient full system tracing solution
 	</longdescription>
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index 884615cf5a46..15d794153833 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -8,4 +8,4 @@ EBUILD lttng-ust-2.12.1.ebuild 805 BLAKE2B d17d93ce40c9bc6371528c2e49b5d9628d69f
 EBUILD lttng-ust-2.12.2.ebuild 807 BLAKE2B acdc598a8ece8bbfc7ea782fb10a4fb8986f59ded7428be8fbd9a11580ce0d1b5be0a046b1493d294320818d1d71c5af370c6d22ba720a1e4228859ef7fac6ee SHA512 df7e6a17c879366b5efc0c1b7a1a957ac78f07a4302a6a8c5f67d7269a94577765f6955692a28b8a36e65d5c75536d503e34a404de4dcb7faee230c2e855eda9
 EBUILD lttng-ust-2.12.4.ebuild 807 BLAKE2B de1a5a71db40f0b49d75205dd05f4ea404a8a983c90e25aa488da31bc71f7d296d97469e8f5b5d1fc832591c586c98a6990d7a7847389d0d98d13ff2666f2bf0 SHA512 bf58535651ac42457f7efbefff8d9d5a70d461604742a0b78fa4df5dccc9b78f193be3be4197f2a4115df0144a407d9213b968b399f870b296aa9297d08db05e
 EBUILD lttng-ust-2.13.2.ebuild 807 BLAKE2B de1a5a71db40f0b49d75205dd05f4ea404a8a983c90e25aa488da31bc71f7d296d97469e8f5b5d1fc832591c586c98a6990d7a7847389d0d98d13ff2666f2bf0 SHA512 bf58535651ac42457f7efbefff8d9d5a70d461604742a0b78fa4df5dccc9b78f193be3be4197f2a4115df0144a407d9213b968b399f870b296aa9297d08db05e
-MISC metadata.xml 701 BLAKE2B 2bd57c9e2b0d8e24eba3ae0767e22d911ff7d4e9c86035fd2c2a10f3e011e7e98fe4d17fbbf99419477652f4a56425cc242a8947fca314486d858145ca992db4 SHA512 87721cee084407a7565d2f0da06d588b5de039349769901102b6833571a53bbfd95d3986a0d7e74a3fd4d285c68c3942f776e813793f0a30d2d83f0a9243628b
+MISC metadata.xml 628 BLAKE2B 332d5443d35ada104f3cfc784a90b8c6bf827f2a0ef2f03684181f2a2510f94b6183024292ffc0af2271fbc8cd50f99d894b2130605e9454dd84bafea14a17cb SHA512 51879acb9efdb734f56c83b6f8646edae9b1279b8089b6b9272203efe8032fc098fa566bcb8a9695ffde816783768f4fa5f35461e2e69f1f49745b95a9564d65
diff --git a/dev-util/lttng-ust/metadata.xml b/dev-util/lttng-ust/metadata.xml
index 77a054b1ba66..6d1b6a6bf421 100644
--- a/dev-util/lttng-ust/metadata.xml
+++ b/dev-util/lttng-ust/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dlan@gentoo.org</email>
-		<name>Yixun Lan</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="numa">Enable numa support</flag>
 	</use>
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index 6c4c96181737..eb344516b617 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -3,5 +3,5 @@ DIST opencl-headers-2022.01.04.tar.gz 62719 BLAKE2B 6791a679a09248746dd6b23d4600
 DIST opencl-headers-2022.05.18.tar.gz 64518 BLAKE2B c1e0c3011e4ef226a5fc4601a65c78dfae20e86f9327e7cbda23bb16fbd95a450a28d5dbe3b90332ce9ebdbc3b108dbae3433b8e79883f777f8d5e9e6add375c SHA512 36a8637d22379eb7f83d44152cb34ff955134b9efb66a2d0973596b4cc38e1690a53972bee86f460350e80f13dbc775d24708960bf9e828f8e2c6e3d6358946e
 EBUILD opencl-headers-2021.06.30.ebuild 502 BLAKE2B dbc937549550a6ccba57cc73ef86aea42fdc941aa5e0d24c4c0c3c94cbded49bfdc79765684330053156bcc36807043d51916c4e16ddb1e64f3e6b36d811f581 SHA512 1390696b1c4251cd94d6235897843433f4f3ef6966f6a0ea711b475f499d9933bc4a02ee96d177b28d681fa66404e984789d3cbb05524129fcf43a3a7758a886
 EBUILD opencl-headers-2022.01.04.ebuild 533 BLAKE2B 4746bf5e79327fcac1800dedf670adabc4f0fa632fdb82a539099e189e3189b215b05089551353c9b058a0ba5c8a73c506805d115a103d9a5332ffeeb06a8ab2 SHA512 6f3988e78a6956532e5555321c1aff2aa2cca3e7db79107d9295bb9a97501f46955326a55d665cfb32dac8c20d178b8abfee9b4b4064a3470f3b63a7106714fd
-EBUILD opencl-headers-2022.05.18.ebuild 536 BLAKE2B 2a8c49eadfc3664ab3709a39a8118d2dabf86f76c0a93b414bc5be1c3f68f2056cd15d8b5a91657fd57a125a68ffafdb97314c4809996a01211c72877d27e212 SHA512 021fa8a44fce60e3990447bde813f58a2bd9b7e437e172a1976801d3b1dbaa9231b4538e9eeaa7a9b3dbfe44edd3d7f48aee402b0e5f27666caae3a04e4500d7
+EBUILD opencl-headers-2022.05.18-r1.ebuild 612 BLAKE2B 4b244d57ce703f199807a38fb294d067d7adb515ae7694164c0d7c84c32bd1258f7fcb029d228503c5500a3b0b85638696149533d4323652c5d5c6a866210b44 SHA512 0ce7e1888259d6d217b26de88a7224b48f0114336d885dfa1ff841a70f5769c09b143dcad67c8b3c4f9681faa937c14ea5a9c8f1643f0d5d0ee0130e3c83d1e8
 MISC metadata.xml 1055 BLAKE2B ac96e1bf07e353236170d3678541555b7d901984266dfd1356456db90effe430e6a042afc0b9b5a7f51d0e9cfbcef0fbf66fb46de82fdc8cc1cfa29c6cfd61d0 SHA512 6233610591851e415ab0354ca900dfdfa14fa2442e56094d547420ce710942be86c701820c3a63e2c6f070b74c0801f92bbe9ed6c7f2a5cae406f74b81acd86a
diff --git a/dev-util/opencl-headers/opencl-headers-2022.05.18.ebuild b/dev-util/opencl-headers/opencl-headers-2022.05.18-r1.ebuild
index 1a6a9ed81af1..245fefd3e4c0 100644
--- a/dev-util/opencl-headers/opencl-headers-2022.05.18.ebuild
+++ b/dev-util/opencl-headers/opencl-headers-2022.05.18-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit cmake
+
 MY_PN="OpenCL-Headers"
 MY_P="${MY_PN}-${PV}"
 
@@ -13,12 +15,15 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.g
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
 
-S="${WORKDIR}"/${MY_P}
+RESTRICT="!test? ( test )"
 
-src_install() {
-	insinto /usr/include
-	doins -r "${S}"/CL
+S="${WORKDIR}"/${MY_P}
 
-	einstalldocs
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
 }