gentoo auto-resync : 13:06:2024 - 00:08:29

10 files changed, 458 insertions, 175 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 429fb949ca8d..d4d43fef5503 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index 402e6226becb..0444f98f7581 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,8 +1,12 @@
+AUX ctags-20230423.0-alignment.patch 3528 BLAKE2B 0b5a2c267067c1203021150f2c093f7538e8c287436121436d13f2f5aef2ef96ba80cabc0bb7ecf0773739c34bbd14267c3ba8b7c2f05c6f8c6f97c296205534 SHA512 619d2dc5e8feee9bef94e0bf75c6db012bf10c14a9f133e5a6c596544f2bc9e9451c4bd7485e16c2184e05371ef50c70e1e324b74791f9782f3dc7df30a49ee7
 DIST ctags-20211017.0.tar.gz 2542128 BLAKE2B cade7149cb2fd0645f9b7ecd37c8b9acdeae7037fde2bb74aa94d67f04963327429b83dcf5cd658f082bd8ce4c407f69f4924da5f768bec029b4075997bbd882 SHA512 85bfb4d40c1d9045b4ba4dc280ee7108ee2fd4572c92794d5bdc854f3511dad1ecf282428e61161773f7bfaca725d774593a0e83fc767a1bb2e12b229a19bec0
 DIST ctags-20220828.0.tar.gz 2952276 BLAKE2B 2ec3a01646cfb89446604af65387bb5cbf17188177505000f5803a9a535f59799961e8144d3ab36b23114fc093cb487589f52e7186b60041ff3bf2a439f77dab SHA512 4c1289dab24edded85c7ae31c06b0cad5b8f08f7f709a0bdacdf5f9d8ccf722c820d6fef6d46298bb06c48256e80f594dbf2456b91d1c50b3509ce4d3fe3ae9c
 DIST ctags-20230423.0.tar.gz 3038197 BLAKE2B 4b6114526e9dc94c95dcf1b27136fe1fde185aadcd3f880459314b6567f4ec935da10f87aaad590f4c16999adea8b15b3a153f4e80b3b9e57d9a04ecee377a09 SHA512 7a4b3ffcc4906765dda381ad637981f5ce8c6fc24d4141b8b0e9997b71767dda307dab4d2c2aa0e5ba003774c100d8f85e494e368cedbef12c8f415a13b85554
+DIST ctags-20240609.0.tar.gz 3158634 BLAKE2B fe662dc0c48a0ac484bf3fc7ba7d0a31285398cd5da111a96f14b3637045fa0b0245119da034ab467e43b776849f47891e829af86a1889548f410070df6395d4 SHA512 60ebc506a04aabd7ada13801ab3ac662a9798960cf2aaa90270e6d5df82850b4e709a15a7523eb2e1e347a08b458ff2b85a99c787ab08b3c2599232492ef0ebc
 EBUILD ctags-20211017.0.ebuild 1925 BLAKE2B cb0a590ebb35343a285c808da2a0c6e917dce94aea867e5a936c9123c6f482181089545702b7c199053fac2c1c051d88edad86b494f64634563da894ba57a03c SHA512 2d0ea70c31becb2b9d4bdbc0d1877434d663c9ee8e04dea7f92693f8804a30219d18aedaecc42cadf591dc314a19e4227494a8f4090d9afd025135b0b059e08b
 EBUILD ctags-20220828.0-r1.ebuild 2241 BLAKE2B 29fbb42b31926b04de114727902259df35f2490421b918d69ffa258d177a0f34532271d79ff117ab73a119a7e402954b8e0f206510f5fc014272df4b243fb672 SHA512 2e520b0a5b1f289142a2eb5335df3828beb13b529a6be37f7df2d77b564ce5ae4b215ff396623e00e34580792a51ddd928aa4fe915ae55420e388a8c10fbb146
+EBUILD ctags-20230423.0-r1.ebuild 2492 BLAKE2B 39ab6242f64757e94a3739cb42d79c64d1752a0140ac1db73680f5698687ffa30b234b1f916645edaf7b075a50318ca9c73420ba6c12f814712a83923de09647 SHA512 cd021dc36c931e6244c087f667b934af0ec447828fb483599c09da0066f6d9665f03b602c6aa49473a87b045571a2433f512d17b60752705e35393b72a7e55ca
 EBUILD ctags-20230423.0.ebuild 2434 BLAKE2B 60b567b1198818605b0aeda126e2d01bbe082a86c1e86f03a0df581258c6e69e02799d395b06799e755ed820f11fdd0271256e29b571c8ba9cf6f2bf0ac19afb SHA512 e57d07f26d67e7356970b6e867e95daa36cb761c61b7d9fc7644bccd88c61792f4eb82f04ef50afd029a702a3d80f0c4d733c4d6e1892018e1043dd17f6b35bd
-EBUILD ctags-99999999.ebuild 2437 BLAKE2B 87e28bc639470848f68db4ebdb0d95f9a3b628a455caedbd587de6d778b3e28d60719f5aa17c1867cdc5521669e467119758d9ce5c883e0571be08d11e8fc33b SHA512 3dd524c3f097f1e8285f7746a003ec7ae3c4f7e61e4516c968fe7ec65ba125a0fdd3ba61cfc5d20b90db23670bebc9e070ab7151db197c20a60d98c8d27b310d
+EBUILD ctags-20240609.0.ebuild 2437 BLAKE2B 911058bb57d7f692968478f38b532fd21a88e769aa989832f0d8db0d98287ff91e08ccda73e4b97bd88ea82bf21a70b73380cfee45e20f83b26f08429174bdb4 SHA512 c372b618cc0d16c11267fc012fd0bd7659717bc209c8696b0b10910f19e48f51a6eea044989a510419014d9c82ead155ff742be83ba12073b22fd93b337b0445
+EBUILD ctags-99999999.ebuild 2437 BLAKE2B 911058bb57d7f692968478f38b532fd21a88e769aa989832f0d8db0d98287ff91e08ccda73e4b97bd88ea82bf21a70b73380cfee45e20f83b26f08429174bdb4 SHA512 c372b618cc0d16c11267fc012fd0bd7659717bc209c8696b0b10910f19e48f51a6eea044989a510419014d9c82ead155ff742be83ba12073b22fd93b337b0445
 MISC metadata.xml 584 BLAKE2B 13de5ebe8bea2b413552eb85af3d3a42c453ad8d7f808b21a5b016bbd3e7890ceabdb924e817c4d841ed2862b7f9dcecad03f7f22c7b738db1c4f88d784fc80d SHA512 c4930de987c3d846c4761d66a191ae2b2800b32234f63ebafee140920faa408cec1b22032c72da01ade807a4187f482bedad3e22058fdffc0af56aabd1deea8f
diff --git a/dev-util/ctags/ctags-20230423.0-r1.ebuild b/dev-util/ctags/ctags-20230423.0-r1.ebuild
new file mode 100644
index 000000000000..06278216a755
--- /dev/null
+++ b/dev-util/ctags/ctags-20230423.0-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit autotools python-any-r1
+
+DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
+HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
+
+if [[ ${PV} == *99999999* ]] ; then
+	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p6.0.${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-p6.0.${PV}
+
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="json pcre seccomp test xml yaml"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	json? ( dev-libs/jansson:= )
+	pcre? ( dev-libs/libpcre2 )
+	seccomp? ( sys-libs/libseccomp )
+	xml? ( dev-libs/libxml2:2 )
+	yaml? ( dev-libs/libyaml )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-python/docutils
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+IDEPEND="app-eselect/eselect-ctags"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# manual check for function in a library that doesn't exist, passes -liconv
+	# which either fails to link anyway (glibc) or passes this check (musl)
+	libiconv_open
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20230423.0-alignment.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Ignore check-genfile test (calls git which errors out)
+	sed -i 's/man-test check-genfile/man-test/' makefiles/testing.mak || die
+
+	default
+
+	#./misc/dist-test-cases > makefiles/test-cases.mak || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable json) \
+		$(use_enable pcre pcre2) \
+		$(use_enable seccomp) \
+		$(use_enable xml) \
+		$(use_enable yaml) \
+		--disable-etags \
+		--enable-tmpdir="${EPREFIX}"/tmp
+}
+
+src_install() {
+	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
+
+	# Namepace collision with X/Emacs-provided /usr/bin/ctags -- we
+	# rename ctags to exuberant-ctags (Mandrake does this also).
+	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
+	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
+}
+
+pkg_postinst() {
+	eselect ctags update
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "You can set the version to be started by ${EROOT}/usr/bin/ctags through"
+		elog "the ctags eselect module. \"man ctags.eselect\" for details."
+	fi
+}
+
+pkg_postrm() {
+	eselect ctags update
+}
diff --git a/dev-util/ctags/ctags-20240609.0.ebuild b/dev-util/ctags/ctags-20240609.0.ebuild
new file mode 100644
index 000000000000..4d1c75a03103
--- /dev/null
+++ b/dev-util/ctags/ctags-20240609.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit autotools python-any-r1
+
+DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
+HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
+
+if [[ ${PV} == *99999999* ]] ; then
+	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p6.1.${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-p6.1.${PV}
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="json pcre seccomp test xml yaml"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	json? ( dev-libs/jansson:= )
+	pcre? ( dev-libs/libpcre2 )
+	seccomp? ( sys-libs/libseccomp )
+	xml? ( dev-libs/libxml2:2 )
+	yaml? ( dev-libs/libyaml )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-python/docutils
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+IDEPEND="app-eselect/eselect-ctags"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# manual check for function in a library that doesn't exist, passes -liconv
+	# which either fails to link anyway (glibc) or passes this check (musl)
+	libiconv_open
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Ignore check-genfile test (calls git which errors out)
+	sed -i 's/man-test check-genfile/man-test/' makefiles/testing.mak || die
+
+	default
+
+	#./misc/dist-test-cases > makefiles/test-cases.mak || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable json) \
+		$(use_enable pcre pcre2) \
+		$(use_enable seccomp) \
+		$(use_enable xml) \
+		$(use_enable yaml) \
+		--disable-etags \
+		--enable-tmpdir="${EPREFIX}"/tmp
+}
+
+src_install() {
+	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
+
+	# Namepace collision with X/Emacs-provided /usr/bin/ctags -- we
+	# rename ctags to exuberant-ctags (Mandrake does this also).
+	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
+	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
+}
+
+pkg_postinst() {
+	eselect ctags update
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "You can set the version to be started by ${EROOT}/usr/bin/ctags through"
+		elog "the ctags eselect module. \"man ctags.eselect\" for details."
+	fi
+}
+
+pkg_postrm() {
+	eselect ctags update
+}
diff --git a/dev-util/ctags/ctags-99999999.ebuild b/dev-util/ctags/ctags-99999999.ebuild
index 2780d6573854..4d1c75a03103 100644
--- a/dev-util/ctags/ctags-99999999.ebuild
+++ b/dev-util/ctags/ctags-99999999.ebuild
@@ -13,8 +13,8 @@ if [[ ${PV} == *99999999* ]] ; then
 	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p6.0.${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-p6.0.${PV}
+	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p6.1.${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-p6.1.${PV}
 
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
diff --git a/dev-util/ctags/files/ctags-20230423.0-alignment.patch b/dev-util/ctags/files/ctags-20230423.0-alignment.patch
new file mode 100644
index 000000000000..89544cb516bf
--- /dev/null
+++ b/dev-util/ctags/files/ctags-20230423.0-alignment.patch
@@ -0,0 +1,88 @@
+https://bugs.gentoo.org/920066
+https://github.com/universal-ctags/ctags/issues/3881
+https://github.com/universal-ctags/ctags/pull/3883
+
+From e6bc697502fcf582ea52e7098becf01ca0b00fc8 Mon Sep 17 00:00:00 2001
+From: Colomban Wendling <ban@herbesfolles.org>
+Date: Sat, 16 Dec 2023 19:20:32 +0100
+Subject: [PATCH] nestlevel: Fix user data alignment
+
+We need to align the user data properly not to trigger undefined
+behavior, which even apparently crashes on SPARC.
+
+As `NestingLevels::levels` is actually a single allocation for all
+levels and their user data mapped as `[NL0|UD0|NL1|UD1|...]` (where NL
+is a NestingLevel, and UD a user data), we need to align twice, as we
+need every `NL*` and every `UD*` to align properly.
+
+Here we align everything to `2*sizeof(size_t)`, which is a logic
+borrowed from GLib, which seems to have borrowed the value from glibc.
+This is pretty conservative in our case, because actually `NL*`s only
+need aligning to `int`'s requirements currently, which on some
+architectures is 4, not 16; but it's trickier to implement (and
+actually impossible with the current API) as we'd need to compute the
+actual alignment for each level taking into account it's position in
+the overall memory region to still align `UD*`s to a conservative
+value.
+Also, having all NL+UD group at the same size makes things a bit
+simpler for debugging, I guess.
+
+We make sure to only add alignment padding manually for cases where
+there's actually some user data, not to waste memory needlessly for the
+common case where `sizeof(UD)` is 0, and thus where we can merely
+align to `sizeof(NL)` -- which C does for us already.
+
+Note that currently only the Ruby parser is affected, as it's the only
+current consumer of nesting level user data.
+
+Fixes #3881.
+--- a/main/nestlevel.c
++++ b/main/nestlevel.c
+@@ -20,8 +20,16 @@
+ 
+ #include <string.h>
+ 
+-/* TODO: Alignment */
+-#define NL_SIZE(nls) (sizeof(NestingLevel) + (nls)->userDataSize)
++/* struct alignment trick, copied from GObject's gtype.c, which borrows
++ * 2*szieof(size_t) from glibc */
++#define STRUCT_ALIGNMENT (2 * sizeof (size_t))
++#define ALIGN_STRUCT(offset) ((offset + (STRUCT_ALIGNMENT - 1)) & -STRUCT_ALIGNMENT)
++
++/* account for the user data alignment if we have user data, otherwise allocate
++ * exactly what's needed not to waste memory for unneeded alignment */
++#define NL_SIZE(nls) ((nls)->userDataSize ? (ALIGN_STRUCT (sizeof (NestingLevel)) + ALIGN_STRUCT ((nls)->userDataSize)) : sizeof (NestingLevel))
++#define NL_USER_DATA(nl) ((void *)(((char *) nl) + ALIGN_STRUCT (sizeof (NestingLevel))))
++
+ #define NL_NTH(nls,n) (NestingLevel *)(((char *)((nls)->levels)) + ((n) * NL_SIZE (nls)))
+ 
+ /*
+@@ -73,7 +81,7 @@ extern NestingLevel * nestingLevelsPush(NestingLevels *nls, int corkIndex)
+ 
+ 	nl->corkIndex = corkIndex;
+ 	if (nls->userDataSize > 0)
+-		memset (nl->userData, 0, nls->userDataSize);
++		memset (NL_USER_DATA (nl), 0, ALIGN_STRUCT (nls->userDataSize));
+ 
+ 	return nl;
+ }
+@@ -117,5 +125,5 @@ extern NestingLevel *nestingLevelsGetNthParent (const NestingLevels *nls, int n)
+ 
+ extern void *nestingLevelGetUserData (const NestingLevel *nl)
+ {
+-	return (void *)nl->userData;
++	return NL_USER_DATA (nl);
+ }
+--- a/main/nestlevel.h
++++ b/main/nestlevel.h
+@@ -26,7 +26,8 @@ typedef struct NestingLevels NestingLevels;
+ struct NestingLevel
+ {
+ 	int corkIndex;
+-	char userData [];
++	/* user data is allocated at the end of this struct (possibly with some
++	 * offset for alignment), get it with nestingLevelGetUserData() */
+ };
+ 
+ struct NestingLevels
+
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index 0a2674d3339a..9d4a0456f4c4 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,5 +1,5 @@
-DIST opencl-headers-2023.04.17.tar.gz 73963 BLAKE2B 93b792559bb9dca0a2b62a113dd91f81297f86aabd1ca613f3770f02ff70b77276f02d13e0b8eb203495f520005fdd66da37e00fb49a2322f65b86671bb13271 SHA512 55945cdbd79b8a70b074dd09dd9cb6a560c454ce98c16341c75ac197cc85e57314f0e8fafd25aa51d4c4b4f7f8cf401a144d52aebfc8893bbbd1f28ec2850625
 DIST opencl-headers-2023.12.14.tar.gz 75698 BLAKE2B 2ff040112bf8a9be7bc8c8ecbf29cec1c9c718574582e7e065f3391856d3cb70d6c46b5e770d3d2e3aabb2a0040855e2b3f73cda8c9b547d4faaeedafca0bc3c SHA512 71a21f32cc2d956ef52ea197a95f21a3df5cf4e6888b533eb8cc66be0025fafe9b6477d3de813cb1ae6303032c80bc10b5e5ab1c71074f1662a6b5296fffd3d3
-EBUILD opencl-headers-2023.04.17.ebuild 616 BLAKE2B 357a31bfbeca35b3a4900345fa617ef7f8d38b254eb0f20a9e36e51ac773df6eec09f5950a89d6762b0b444096c43bd025c7aebf8c37cd94b0671c54e8737d6b SHA512 ffa2378293a4ba70da1a9edc30fe1da4f7b9543d3c385c7d8b8a5985592dbdbfbedddc98a406e34a98cc02111266835331bc60ccf37065ac6636ea4375c898df
+DIST opencl-headers-2024.05.08.tar.gz 76977 BLAKE2B cd4e0464e2613912134946b43b8b69ccd61f0ba850825c8182e46dcb042478338fda5d993e9e48612ba42152a007be172e6da9afcfda3eb51c71e52dd2f15793 SHA512 2f1a46d58a5a9329470bab4c3662f17e81aab9558bfd9e1aafa14d3e1ab129513ab9493eeeb3cc48f0f91f0bc6b61bd54e28d7083eed58af9f34cd973cc93de1
 EBUILD opencl-headers-2023.12.14.ebuild 623 BLAKE2B b046a23507a50a83e6154d7f8608041f7a4c95d8d95621b550d992c0fba7326789891a8e1d6e71a576d1331299134a04726bf5b6f0878345a562db23a7f9fc91 SHA512 29c724b7c2e7aefdb0c507f6a15d4a56e031ed1e7c1019295b2e1abef08a5f94c0ac7528e13bddb3ad8d62e2cc5dbf0826a5f813f619eb6d3fe5f3a60c822498
+EBUILD opencl-headers-2024.05.08.ebuild 626 BLAKE2B dd52a23187e3201d30467d6e408d762d17df05bb5d40f1153ae3e1b20f9e40d787fe261d2243c2eb2eb3220d81ccaffa5807f2e3984bf0c7b60e1993ed656e12 SHA512 1b07eacfcd868a5d1d7b50c47549b03893b10ba6c0a14827d959dc043f258aec010f88ee5a1efbee726e8a9b6c5848b69d1281ee0f5d50364ba091ef637dfd03
 MISC metadata.xml 1055 BLAKE2B ac96e1bf07e353236170d3678541555b7d901984266dfd1356456db90effe430e6a042afc0b9b5a7f51d0e9cfbcef0fbf66fb46de82fdc8cc1cfa29c6cfd61d0 SHA512 6233610591851e415ab0354ca900dfdfa14fa2442e56094d547420ce710942be86c701820c3a63e2c6f070b74c0801f92bbe9ed6c7f2a5cae406f74b81acd86a
diff --git a/dev-util/opencl-headers/opencl-headers-2023.04.17.ebuild b/dev-util/opencl-headers/opencl-headers-2024.05.08.ebuild
index 6790780253a5..6de067f80ad5 100644
--- a/dev-util/opencl-headers/opencl-headers-2023.04.17.ebuild
+++ b/dev-util/opencl-headers/opencl-headers-2024.05.08.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,15 +12,15 @@ DESCRIPTION="Unified C language headers for the OpenCL API"
 HOMEPAGE="https://github.com/KhronosGroup/OpenCL-Headers"
 SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}"/${MY_P}
+
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
 
-S="${WORKDIR}"/${MY_P}
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)
diff --git a/dev-util/wasmer/Manifest b/dev-util/wasmer/Manifest
index fd2ce3676fc8..26b9fe4baea3 100644
--- a/dev-util/wasmer/Manifest
+++ b/dev-util/wasmer/Manifest
@@ -161,5 +161,5 @@ DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD wasmer-0.11.0.ebuild 3362 BLAKE2B d193797866bc8bea082d11658b98c02095d2024937a03deefce99ccfc2179aee599fecef7bf2ea1885913a1fd08c38fe68a6c30bf48ca8fbca753b195e910e54 SHA512 91a71277b7dbfa19ba83d3019630f35384477afc7f6c03214f3685002afb720f221a737028abdd677aab758aabad831919bb0b9c28ace78bad34d7d2590eb99f
+EBUILD wasmer-0.11.0.ebuild 3505 BLAKE2B 6ad93f752d61962088243767090697df11a738683f51a8e76255a48a2ea244e04f72214db9a214eff3bce45263cca7ca9d24932cfbadf26b06470a550877f013 SHA512 e756cf6841ae546dc461219c50467a388a2dc0633a21e987a852c7945b4d82fb9138d462b8f6dabf23914d001733dd69a340c6f0e644b245a01c6a8bd11ad894
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/dev-util/wasmer/wasmer-0.11.0.ebuild b/dev-util/wasmer/wasmer-0.11.0.ebuild
index abbcc40ab8bf..1f3d09da84f3 100644
--- a/dev-util/wasmer/wasmer-0.11.0.ebuild
+++ b/dev-util/wasmer/wasmer-0.11.0.ebuild
@@ -1,184 +1,183 @@
 # Copyright 2017-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CRATES="
-aho-corasick-0.7.6
-ansi_term-0.11.0
-arrayref-0.3.5
-arrayvec-0.5.1
-atty-0.2.13
-autocfg-0.1.7
-bincode-1.2.0
-bitflags-1.2.1
-blake2b_simd-0.5.9
-bstr-0.2.8
-byteorder-1.3.2
-c2-chacha-0.2.3
-cargo_toml-0.6.4
-cast-0.2.2
-cbindgen-0.9.1
-cc-1.0.47
-cfg-if-0.1.10
-clap-2.33.0
-cloudabi-0.0.3
-cmake-0.1.42
-constant_time_eq-0.1.4
-cranelift-bforest-0.44.0
-cranelift-codegen-0.44.0
-cranelift-codegen-meta-0.44.0
-cranelift-codegen-shared-0.44.0
-cranelift-entity-0.44.0
-cranelift-native-0.44.0
-criterion-0.2.11
-criterion-plot-0.3.1
-crossbeam-deque-0.7.2
-crossbeam-epoch-0.8.0
-crossbeam-queue-0.1.2
-crossbeam-utils-0.6.6
-crossbeam-utils-0.7.0
-csv-1.1.1
-csv-core-0.1.6
-ctor-0.1.12
-digest-0.8.1
-dynasm-0.5.1
-dynasmrt-0.5.1
-either-1.5.3
-enum-methods-0.0.8
-erased-serde-0.3.9
-errno-0.2.4
-errno-dragonfly-0.1.1
-failure-0.1.6
-failure_derive-0.1.6
-fuchsia-cprng-0.1.1
-gcc-0.3.55
-generational-arena-0.2.4
-generic-array-0.12.3
-getrandom-0.1.13
-ghost-0.1.1
-glob-0.2.11
-glob-0.3.0
-goblin-0.0.24
-heck-0.3.1
-hermit-abi-0.1.3
-hex-0.3.2
-indexmap-1.3.0
-inventory-0.1.4
-inventory-impl-0.1.4
-itertools-0.8.1
-itoa-0.4.4
-kernel32-sys-0.2.2
-lazy_static-1.4.0
-libc-0.2.65
-llvm-sys-80.1.1
-lock_api-0.3.1
-log-0.4.8
-maybe-uninit-2.0.0
-md5-0.6.1
-memchr-2.2.1
-memmap-0.7.0
-memoffset-0.5.3
-nix-0.15.0
-num_cpus-1.11.0
-num-traits-0.2.8
-owning_ref-0.4.0
-page_size-0.4.1
-parking_lot-0.9.0
-parking_lot_core-0.6.2
-plain-0.2.3
-ppv-lite86-0.2.6
-proc-macro2-0.4.30
-proc-macro2-1.0.6
-proc-macro-error-0.2.6
-quote-0.3.15
-quote-0.6.13
-quote-1.0.2
-rand-0.7.2
-rand_chacha-0.2.1
-rand_core-0.3.1
-rand_core-0.4.2
-rand_core-0.5.1
-rand_hc-0.2.0
-rand_os-0.1.3
-rand_xoshiro-0.1.0
-raw-cpuid-6.1.0
-rayon-1.2.0
-rayon-core-1.6.0
-rdrand-0.4.0
-redox_syscall-0.1.56
-regex-1.3.1
-regex-automata-0.1.8
-regex-syntax-0.6.12
-remove_dir_all-0.5.2
-rustc_version-0.2.3
-ryu-1.0.2
-same-file-1.0.5
-scopeguard-1.0.0
-scroll-0.9.2
-scroll_derive-0.9.5
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.102
-serde-bench-0.0.7
-serde_bytes-0.11.2
-serde_derive-1.0.102
-serde_json-1.0.41
-smallvec-0.6.13
-stable_deref_trait-1.1.1
-strsim-0.8.0
-structopt-0.3.4
-structopt-derive-0.3.4
-syn-0.11.11
-syn-0.15.44
-syn-1.0.8
-synom-0.11.3
-synstructure-0.12.2
-target-lexicon-0.8.1
-tempfile-3.1.0
-textwrap-0.11.0
-thread_local-0.3.6
-time-0.1.42
-tinytemplate-1.0.2
-toml-0.4.10
-toml-0.5.5
-typenum-1.11.2
-typetag-0.1.4
-typetag-impl-0.1.4
-unicode-segmentation-1.6.0
-unicode-width-0.1.6
-unicode-xid-0.0.4
-unicode-xid-0.1.0
-unicode-xid-0.2.0
-vec_map-0.8.1
-void-1.0.2
-wabt-0.9.2
-wabt-sys-0.7.0
-walkdir-2.2.9
-wasi-0.7.0
-wasmer-clif-fork-frontend-0.44.0
-wasmer-clif-fork-wasm-0.44.0
-wasmparser-0.39.2
-winapi-0.2.8
-winapi-0.3.8
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.2
-winapi-x86_64-pc-windows-gnu-0.4.0
+	aho-corasick@0.7.6
+	ansi_term@0.11.0
+	arrayref@0.3.5
+	arrayvec@0.5.1
+	atty@0.2.13
+	autocfg@0.1.7
+	bincode@1.2.0
+	bitflags@1.2.1
+	blake2b_simd@0.5.9
+	bstr@0.2.8
+	byteorder@1.3.2
+	c2-chacha@0.2.3
+	cargo_toml@0.6.4
+	cast@0.2.2
+	cbindgen@0.9.1
+	cc@1.0.47
+	cfg-if@0.1.10
+	clap@2.33.0
+	cloudabi@0.0.3
+	cmake@0.1.42
+	constant_time_eq@0.1.4
+	cranelift-bforest@0.44.0
+	cranelift-codegen@0.44.0
+	cranelift-codegen-meta@0.44.0
+	cranelift-codegen-shared@0.44.0
+	cranelift-entity@0.44.0
+	cranelift-native@0.44.0
+	criterion@0.2.11
+	criterion-plot@0.3.1
+	crossbeam-deque@0.7.2
+	crossbeam-epoch@0.8.0
+	crossbeam-queue@0.1.2
+	crossbeam-utils@0.6.6
+	crossbeam-utils@0.7.0
+	csv@1.1.1
+	csv-core@0.1.6
+	ctor@0.1.12
+	digest@0.8.1
+	dynasm@0.5.1
+	dynasmrt@0.5.1
+	either@1.5.3
+	enum-methods@0.0.8
+	erased-serde@0.3.9
+	errno@0.2.4
+	errno-dragonfly@0.1.1
+	failure@0.1.6
+	failure_derive@0.1.6
+	fuchsia-cprng@0.1.1
+	gcc@0.3.55
+	generational-arena@0.2.4
+	generic-array@0.12.3
+	getrandom@0.1.13
+	ghost@0.1.1
+	glob@0.2.11
+	glob@0.3.0
+	goblin@0.0.24
+	heck@0.3.1
+	hermit-abi@0.1.3
+	hex@0.3.2
+	indexmap@1.3.0
+	inventory@0.1.4
+	inventory-impl@0.1.4
+	itertools@0.8.1
+	itoa@0.4.4
+	kernel32-sys@0.2.2
+	lazy_static@1.4.0
+	libc@0.2.65
+	llvm-sys@80.1.1
+	lock_api@0.3.1
+	log@0.4.8
+	maybe-uninit@2.0.0
+	md5@0.6.1
+	memchr@2.2.1
+	memmap@0.7.0
+	memoffset@0.5.3
+	nix@0.15.0
+	num_cpus@1.11.0
+	num-traits@0.2.8
+	owning_ref@0.4.0
+	page_size@0.4.1
+	parking_lot@0.9.0
+	parking_lot_core@0.6.2
+	plain@0.2.3
+	ppv-lite86@0.2.6
+	proc-macro2@0.4.30
+	proc-macro2@1.0.6
+	proc-macro-error@0.2.6
+	quote@0.3.15
+	quote@0.6.13
+	quote@1.0.2
+	rand@0.7.2
+	rand_chacha@0.2.1
+	rand_core@0.3.1
+	rand_core@0.4.2
+	rand_core@0.5.1
+	rand_hc@0.2.0
+	rand_os@0.1.3
+	rand_xoshiro@0.1.0
+	raw-cpuid@6.1.0
+	rayon@1.2.0
+	rayon-core@1.6.0
+	rdrand@0.4.0
+	redox_syscall@0.1.56
+	regex@1.3.1
+	regex-automata@0.1.8
+	regex-syntax@0.6.12
+	remove_dir_all@0.5.2
+	rustc_version@0.2.3
+	ryu@1.0.2
+	same-file@1.0.5
+	scopeguard@1.0.0
+	scroll@0.9.2
+	scroll_derive@0.9.5
+	semver@0.9.0
+	semver-parser@0.7.0
+	serde@1.0.102
+	serde-bench@0.0.7
+	serde_bytes@0.11.2
+	serde_derive@1.0.102
+	serde_json@1.0.41
+	smallvec@0.6.13
+	stable_deref_trait@1.1.1
+	strsim@0.8.0
+	structopt@0.3.4
+	structopt-derive@0.3.4
+	syn@0.11.11
+	syn@0.15.44
+	syn@1.0.8
+	synom@0.11.3
+	synstructure@0.12.2
+	target-lexicon@0.8.1
+	tempfile@3.1.0
+	textwrap@0.11.0
+	thread_local@0.3.6
+	time@0.1.42
+	tinytemplate@1.0.2
+	toml@0.4.10
+	toml@0.5.5
+	typenum@1.11.2
+	typetag@0.1.4
+	typetag-impl@0.1.4
+	unicode-segmentation@1.6.0
+	unicode-width@0.1.6
+	unicode-xid@0.0.4
+	unicode-xid@0.1.0
+	unicode-xid@0.2.0
+	vec_map@0.8.1
+	void@1.0.2
+	wabt@0.9.2
+	wabt-sys@0.7.0
+	walkdir@2.2.9
+	wasi@0.7.0
+	wasmer-clif-fork-frontend@0.44.0
+	wasmer-clif-fork-wasm@0.44.0
+	wasmparser@0.39.2
+	winapi@0.2.8
+	winapi@0.3.8
+	winapi-build@0.1.1
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.2
+	winapi-x86_64-pc-windows-gnu@0.4.0
 "
 
 inherit cargo
 
-DESCRIPTION="universal web assembly runtime"
+DESCRIPTION="Universal web assembly runtime"
 HOMEPAGE="https://wasmer.io"
 SRC_URI="https://github.com/wasmerio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 https://dev.gentoo.org/~williamh/dist/${P}-git-deps.tar.xz
-	$(cargo_crate_uris ${CRATES})"
+	${CARGO_CRATE_URIS}"
 
 LICENSE="MIT Apache-2.0 BSD-2 ISC"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 BDEPEND="
 	dev-build/cmake