13 files changed, 216 insertions, 14 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 31fc70077336..dbb0efa73a1c 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest
index 492aaf1d3528..2176827037b5 100644
--- a/dev-libs/libucl/Manifest
+++ b/dev-libs/libucl/Manifest
@@ -1,5 +1,8 @@
 AUX libucl-0.8.1-openssl-1.1.1.patch 1595 BLAKE2B 2992f092b1773a1b6ea41354efc9b47aa389635bcf87b503edb3f292062faa1c3f34247e485b806394818b3111cb10741d8e5feab4766011f5d8e9376c797637 SHA512 8cea479cf028ffb68d0449f09d1291f5866664a96b74075297393dd0ac180c700025b3bdd9e5ca7a52b69c897bc075bf9c2ac710d092d0edd4e234252663d65f
+AUX libucl-0.9.0-gchar-compile.patch 1011 BLAKE2B c5aae42dd37d9a52feaf3e01fd49dea19d284d6c9cd2206e796f58a81f590ffc397c13e24a875de3d2a70ef14ec1e8491b9a4d0c4d137daa9cc907727c216e43 SHA512 96e8184d357d35a47b33d41187f885cfb9c4fd7278a945799232975f5d849f5a8e25bca131759a6f9aee66937e4aacad35155a006635d3c56aa81805d5f5af8b
 DIST libucl-0.8.1.tar.gz 2028394 BLAKE2B 18fda317b4b4aed3d6b72c599d191f141bf4722d1c08244deda9c5e77300e2bef7de029889a05d9b4573472928d9d49a797123ac392a4cdd3b690ac277ad673d SHA512 36a059561eadb2dd7253ca22ff56f6a0c6cdd28580e28451c0cf47e1aec321a2e1589fc83ccb2033346f2dbca31a7e6afa9666ea544a0c190b7f80ed0e9f45af
+DIST libucl-0.9.0.tar.gz 2043656 BLAKE2B eb2aeb1a818caffbadee9e351d144cc58d149b88e171750e1edfb679c9a42d1c0e8ef2a2dac763445e215370a359791f65364658d3d138e2262a46eba341c0f1 SHA512 a7bcb03dc3b5e3b8e5c141fb3edee0c749e20d63ad69fba4d3c6ca56ef56b1130287b0f497de37bf9789c2263a46121c662fedc7a870354c2849d2e14d90cab5
 EBUILD libucl-0.8.1-r100.ebuild 1534 BLAKE2B 702ceb04306a8fa6bf6e76da2429fd5348e7eed32c430735c85fe3829341658d3e2695357e1702e799b84475dd8159822a31bd183b3f8edf875d25ddffb8d1bf SHA512 f88801247bd1ace4f9f4b2d9ac48dccc072e26d3e1eca1df33c5f18fff8e27f8b1fea8844547ca9aabe19d84ad6120f58550dd434375c0c409f12beea9443e64
-EBUILD libucl-9999.ebuild 1510 BLAKE2B ee18667e322d4f17ff1ccfa1559f131e0bb601e8a403b00712749b1071f82e2153b226eb5738fd452fb65a6c33ded8c4d2e88fa2b40fccde4755845f34aa6e3a SHA512 a222fffff87d59deca9a7565185da709187a39a14256bc51c88f3c03c8e71569d20a26caf3fbb70ffea19a8452418f766f9471c5bcbfad2fc64ab40fdfbb4f52
+EBUILD libucl-0.9.0.ebuild 1487 BLAKE2B 802ed03701d32cb60e879e3c1bacccc8b6f25944b2f7dd3dbb316a962373d578adedd5cc06f52168320fba3f513c5425c327c801e9801b643d1889f639f342ba SHA512 7f26dc654981218fdf7c26509dfb3476a938f44391d290ddb6fbabc9947b60befe121b995bfbb9b01446bed5f40fe067eacccec343e0d2ce3a1a9b8ed2c15478
+EBUILD libucl-9999.ebuild 1434 BLAKE2B 3501bb88f192a1d3f84cbe42739b2bb9c4ede7ee065052acbc4093e71ee49f23bb5c38b2aec410ffbe205fa72741ab1c63ab98fab9dda9a8aa07020848e1538d SHA512 f3dccdb45e8ad6640fe2c23c5a576af1db3a71ee3ecd3218c5c85582a92d88a5ed150ce88d0cf3e51eb31ee9ef904b144a9086d5af94cda92f7b0a46bd0c0719
 MISC metadata.xml 837 BLAKE2B 5ae3fa47a9bfdd5676f70f7a6d5f0f8be5d6139485775aa04e0e5d5681fdf8363089c7a0699b5faa0bb5502d4d3c5273ca071a7ec3f492e3c787be28da97ae48 SHA512 a1def93d027d9c8eb2dfe116a72916bbab70f6737145c2e3ca82b0c219ca5983ce70b5a9c81248e8f39b7b5840fe81788c2b413103d864738b11fa8d6b2e1731
diff --git a/dev-libs/libucl/files/libucl-0.9.0-gchar-compile.patch b/dev-libs/libucl/files/libucl-0.9.0-gchar-compile.patch
new file mode 100644
index 000000000000..9ec9105276c1
--- /dev/null
+++ b/dev-libs/libucl/files/libucl-0.9.0-gchar-compile.patch
@@ -0,0 +1,36 @@
+Merged as: https://github.com/vstakhov/libucl/commit/708f5e21e3d85f56cdcbcbc418d8725f53bf390b
+From: Vsevolod Stakhov <vsevolod@rspamd.com>
+Date: Tue, 6 Feb 2024 15:59:48 +0000
+Subject: [PATCH] Fix lua compile issues
+
+Issue: #282
+--- a/lua/lua_ucl.c
++++ b/lua/lua_ucl.c
+@@ -406,7 +406,6 @@ ucl_object_lua_fromtable (lua_State *L, int idx, ucl_string_flags_t flags)
+
+ 	/* Table iterate */
+ 	if (is_array) {
+-		int i;
+
+ 		if (!is_implicit) {
+ 			top = ucl_object_typed_new (UCL_ARRAY);
+@@ -416,7 +415,7 @@ ucl_object_lua_fromtable (lua_State *L, int idx, ucl_string_flags_t flags)
+ 			top = NULL;
+ 		}
+
+-		for (i = 1; i <= max; i ++) {
++		for (size_t i = 1; i <= max; i ++) {
+ 			lua_pushinteger (L, i);
+ 			lua_gettable (L, idx);
+
+@@ -886,8 +885,8 @@ lua_ucl_parser_parse_text (lua_State *L)
+ 		t = lua_touserdata (L, 2);
+ 	}
+ 	else if (lua_type (L, 2) == LUA_TSTRING) {
+-		const gchar *s;
+-		gsize len;
++		const char *s;
++		size_t len;
+ 		static struct _rspamd_lua_text st_t;
+
+ 		s = lua_tolstring (L, 2, &len);
diff --git a/dev-libs/libucl/libucl-0.9.0.ebuild b/dev-libs/libucl/libucl-0.9.0.ebuild
new file mode 100644
index 000000000000..86d714ebb85a
--- /dev/null
+++ b/dev-libs/libucl/libucl-0.9.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..3} )
+inherit lua-single autotools
+
+DESCRIPTION="Universal configuration library parser"
+HOMEPAGE="https://github.com/vstakhov/libucl"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vstakhov/libucl.git"
+else
+	SRC_URI="https://github.com/vstakhov/libucl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0/9"
+IUSE="lua +regex sign urls +utils static-libs test"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+DEPEND="!!dev-libs/ucl
+	lua? ( ${LUA_DEPS} )
+	urls? ( net-misc/curl )
+	sign? ( dev-libs/openssl:0= )
+"
+BDEPEND="${DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md doc/api.md )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gchar-compile.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		"$(use_enable lua)"
+		"$(use_enable regex)"
+		"$(use_enable sign signatures)"
+		"$(use_enable urls)"
+		"$(use_enable utils)"
+	)
+	use lua && myeconfargs+=(
+		LUA_INCLUDE="$(lua_get_CFLAGS)"
+		LIB_LIBS="$(lua_get_LIBS)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	use lua && DOCS+=( "doc/lua_api.md" )
+	einstalldocs
+	if ! use static-libs; then
+		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \
+			die "error while deleting static library"
+	fi
+}
diff --git a/dev-libs/libucl/libucl-9999.ebuild b/dev-libs/libucl/libucl-9999.ebuild
index 8b3e4c0b5cc2..3c35afc0af65 100644
--- a/dev-libs/libucl/libucl-9999.ebuild
+++ b/dev-libs/libucl/libucl-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1..3} )
 inherit lua-single autotools
@@ -18,7 +18,7 @@ else
 fi
 
 LICENSE="BSD-2"
-SLOT="0"
+SLOT="0/9"
 IUSE="lua +regex sign urls +utils static-libs test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
@@ -36,12 +36,11 @@ RDEPEND="${DEPEND}"
 DOCS=( README.md doc/api.md )
 
 pkg_setup() {
-	use lua && lua_pkg_setup
+	use lua && lua-single_pkg_setup
 }
 
 src_prepare() {
 	default
-	rm tests/schema/{definitions,ref{,Remote}}.json || die
 	eautoreconf
 }
 
@@ -60,10 +59,6 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
-src_test() {
-	emake check
-}
-
 src_install() {
 	default
 	use lua && DOCS+=( "doc/lua_api.md" )
diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest
index 017c85d8afb1..39eceaa37212 100644
--- a/dev-libs/log4cpp/Manifest
+++ b/dev-libs/log4cpp/Manifest
@@ -6,7 +6,11 @@ AUX log4cpp-1.1-cmath-fix.patch 206 BLAKE2B 7caa58dcb66cc184b1f88a99ea6c6c0d2123
 AUX log4cpp-1.1-glibc-2.31.patch 647 BLAKE2B 80d59c50d322531258f79a8a90385e1565ac0c5658071682dd13ee22b0fba22f1f4b799c4c08a59f07a57eeea2cafa7ffa76902951870854a1dafbf7805abdf2 SHA512 b27fe0c8218dd48c5b72ffc0ba0eb103c610b665777e643929b18b52e23ddf9f6e87bb4c9798f077aaedfcbe1d9ca44342499b15b4c209e5097e7b07269f0fcf
 AUX log4cpp-1.1.3-fix-implicit-func-in-configure.patch 801 BLAKE2B 735f8dc4d64f13ebae58826be3fbc695b089ea8882d93cb0276849b758ba09e42de6b0aee18386e3b9cd232c757f95345f5d390e0da568e9d395d01a21bf36b0 SHA512 a4310f44d6a694f81730cd8295590c496ed3c00c316cb13edc0c51a6bbc8db8516241a2022f16d0d0aa9e877e8cbccdb0d12a5602d210b95026a88a04b113c7d
 AUX log4cpp-1.1.3-fix-version.patch 314 BLAKE2B 27dabdf67a2c3a53ff1f10b1c4b2b1796e144213b2ba545ffd800d21bcae22e8248cf53da73d951a3e712b45e2fcac97f4c5d131bf260ca9680699df8ba527ae SHA512 1ecba987f5295d507babff49f3d0d37d7e998ac2014ee430a981f7c64c35f1d10f2a3810bcfd7e8ca037a0fdadac61972ff93bf37cf6f543d7cedc6b836edb49
+AUX log4cpp-1.1.4-fix-implicit-func-in-configure.patch 801 BLAKE2B e3613e90707bb7ff43f58bf461a2af6d7774dbb018358fe0812bd7c9fb6482b3e59f333be4c36f51ac903e4e1ff77a1d8bc96f526dfab58b5a2c9638c36f37a4 SHA512 93d2c364deb9e776fb7614e8d47e1c6b74e1a4aa8913e1ff7007871ec19efc159e05ab261c5f3d0646084ff42dc8512b95dfb1f8405256c7329144a1795be364
+AUX log4cpp-1.1.4-gcc43.patch 578 BLAKE2B d585766584cb688dffa0016d1afd1d236554223f6abceffc2da5aa361944b77d10005f3d2b792bbb51c06340debb721338570d8822a478f2688f76bc49348860 SHA512 85d15e1ccf6ff50bed0aa95ba501273a88350b24702b1fa3f6d3d34d96ec14db87a78823d748f4d8fd94dcc7fa413814cb143a67cb5ce5b7f6c3c717eaaa1602
 DIST log4cpp-1.1.3.tar.gz 595639 BLAKE2B fc7d643aa70d739e38ec5aba127b4e760a47a064f4032690586c4698ec83a2b7f219d8476650d3bfc5e25563de0852869429ec45171233c6bd5c08b69476b169 SHA512 88e5e10bce8d7d6421c3dcf14aa25385159c4ae52becdc1f3666ab86e1ad3f633786d82afe398c517d4faaa57b3e7b7c0b524361d81c6b9040dbded5cecc19de
+DIST log4cpp-1.1.4.tar.gz 637440 BLAKE2B fe7d3cf5ea8ff8f9bdd86691195c02473bd21a90ebfe2d9cd7a32c2fa30e17b5a104c6181601cf2dce19b703496bb6038e7b0a782a24dfd55415ecd462e49841 SHA512 0cdbd46ccd048d70bea3c35d22080dc5dd21fc3b9c415fe464847e60775954f57e9c8344506f0f94f16e90e8bdaa9cc6d84d3aa65191501e52ee8dfc639f0398
 EBUILD log4cpp-1.1.3-r2.ebuild 1334 BLAKE2B f4a3010b356f0a1d0589a1916e308ab9f6879f8408424d6774edd17dfabe93bfb8ec4d901fb18e0b2f318eca652e172cdc88f7a639960ee3b2eda4c5eb5187db SHA512 ee970399fb654af53f1a5da9d5e0f43f48cf5e5cc1f37de5b85c387160461b1330ed050cc829a7f22b4d34d53f4f984cf2125e9836cdb0a357785aec64a73065
 EBUILD log4cpp-1.1.3-r3.ebuild 1476 BLAKE2B 6e62531c11b94b6c583e1ab6cc536a4124923fe1f4c781c1f77864dbf0a4d65616890071434f4eff0f916ccbabed92f301097bd2e931144d628c3e5d68c4caa8 SHA512 8975d6898ae9f94ccac5bf760d3afe1fbeb1cb6c0251171597b6ea6438491f5fcba54edb038adb78999fbd62d1801e743c9fa4ffd5a94cdfd051e588be874cab
+EBUILD log4cpp-1.1.4.ebuild 1445 BLAKE2B 72e52cc7784fa66b50dac38fd618c4970a66a409eee113708a9dce4629283433563f800edd9522d4f7f593a7530ea537a4dc32ce777155488585a17454021d36 SHA512 def866efa29aa72bd6b41331c3e362d9853958c2f7b4e5929f3d642a446b05f25db7004f20055a0bc8414e87124f8d24efcb32493ba35bbf560842f76f010fd3
 MISC metadata.xml 245 BLAKE2B fc64c325a442c85782c437edf7e7835b640d7d42d6161da3d4e803c0e81c7e1df99baa33c812e6da007a7286084aa97678109e21c72f684a4b7ab5903f1d281a SHA512 8ae4a6eeb33b2013ef7200430fbd5e9e24c72b8c1f02a7b36d7c62a122c5a10a184e4b86645f1e5ad3ee0b384fd786b2d7d063cdd1befb911f6d4bad7506862a
diff --git a/dev-libs/log4cpp/files/log4cpp-1.1.4-fix-implicit-func-in-configure.patch b/dev-libs/log4cpp/files/log4cpp-1.1.4-fix-implicit-func-in-configure.patch
new file mode 100644
index 000000000000..78a5dd4c8e54
--- /dev/null
+++ b/dev-libs/log4cpp/files/log4cpp-1.1.4-fix-implicit-func-in-configure.patch
@@ -0,0 +1,20 @@
+clang16 throws an error because of the implicit function declaration of exit().
+This leads to the wrong assumption that snprintf is not present on the system.
+
+Bug: https://bugs.gentoo.org/906535
+Upstream PR: https://sourceforge.net/p/log4cpp/codegit/merge-requests/10/
+
+#  Pascal Jäger <pascal.jaeger@leimstift.de> (2023-09-22)
+
+--- a/m4/AC_FUNC_SNPRINTF.m4
++++ b/m4/AC_FUNC_SNPRINTF.m4
+@@ -12,7 +12,8 @@ dnl @author Caolan McNamara <caolan@skynet.ie>
+ dnl
+ AC_DEFUN([AC_FUNC_SNPRINTF],
+ [AC_CACHE_CHECK(for working snprintf, ac_cv_func_snprintf,
+-[AC_TRY_RUN([#include <stdio.h>
++[AC_TRY_RUN([#include <stdlib.h>
++#include <stdio.h>
+ int main () { int l = snprintf(NULL,0,"%d",100); return !((3 <= l) || (-1 == l)); }
+ ], ac_cv_func_snprintf=yes, ac_cv_func_snprintf=no,
+ ac_cv_func_snprintf=no)])
diff --git a/dev-libs/log4cpp/files/log4cpp-1.1.4-gcc43.patch b/dev-libs/log4cpp/files/log4cpp-1.1.4-gcc43.patch
new file mode 100644
index 000000000000..9a1fd466c274
--- /dev/null
+++ b/dev-libs/log4cpp/files/log4cpp-1.1.4-gcc43.patch
@@ -0,0 +1,11 @@
+--- a/src/PatternLayout.cpp
++++ b/src/PatternLayout.cpp
+@@ -373,7 +373,7 @@
+                         literal = "";
+                     }
+                     if ((minWidth != 0) || (maxWidth != 0)) {
+-                        component = new FormatModifierComponent(component, std::abs(minWidth), maxWidth, minWidth < 0);
++                        component = new FormatModifierComponent(component, std::abs((float)minWidth), maxWidth, minWidth < 0);
+                         minWidth = maxWidth = 0;
+                     }
+                     _components.push_back(component);
diff --git a/dev-libs/log4cpp/log4cpp-1.1.4.ebuild b/dev-libs/log4cpp/log4cpp-1.1.4.ebuild
new file mode 100644
index 000000000000..3b679658a0e5
--- /dev/null
+++ b/dev-libs/log4cpp/log4cpp-1.1.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations"
+HOMEPAGE="https://log4cpp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~s390 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-text/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/1.0-doc_install_path.patch
+	"${FILESDIR}"/1.0-asneeded.patch
+	"${FILESDIR}"/${PN}-1.1-cmath-fix.patch
+	"${FILESDIR}"/${PN}-1.1-automake-1.13.patch
+	"${FILESDIR}"/${PN}-1.1.3-fix-version.patch
+	"${FILESDIR}"/${PN}-1.1.4-fix-implicit-func-in-configure.patch
+	"${FILESDIR}"/${PN}-1.1.4-gcc43.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
+	# Build tests conditionally
+	if ! use test; then
+		sed -i -e '/^SUBDIRS/s/ tests//' Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -Wno-register # https://bugs.gentoo.org/895054
+	# Bashisms call configure tests to malfunction / config.h to be misgenerated
+	# which then causes a build failure later on in the package (w/ GCC 12,
+	# anyway).
+	CONFIG_SHELL="${BROOT}"/bin/bash econf \
+		--without-idsa \
+		$(use_enable doc doxygen)
+}
+
+src_install() {
+	default
+
+	# Package installs .pc files
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/pcl/Manifest b/dev-libs/pcl/Manifest
index e7ba4015771e..392163f07fa4 100644
--- a/dev-libs/pcl/Manifest
+++ b/dev-libs/pcl/Manifest
@@ -1,5 +1,5 @@
 AUX pcl-1.12-musl.patch 348 BLAKE2B 73d2842e33b1b36a66d0de427e47e46cb9534e6375d9360f596cf047247bd5fa1ab340cd2efd7026ea78da59baacdcc9801ef214ccb81eae5dcc6736ee7b0eb5 SHA512 a7f655e5e6859cd4ca6a4c0fd4b5ed13a8f3e96f3d2d1f12eec1823dfdfadfdd27756e6a64cf10987fb0a70b758f61dc6f8b9a7983892a5f207d998f0ab7d7e6
 DIST pcl-1.12.tar.gz 384986 BLAKE2B f549dd9205ad12a8bd157b4e04e94e156f056e2190c25afcf3c9a0d4488d3e442f9cd3159c6ba68570bff61998b5d6b058c0cec5c57bfe00046379f09bf741ce SHA512 bf0168d8bb3bef8edc36085f6157661cc15f6587c847ed236983612e08955cd1fddcf2b95bbf6c04d275201aecc3842c2ab3679e7ebedb4f5fa9691c73771279
 EBUILD pcl-1.12-r1.ebuild 439 BLAKE2B aa5e1f7c385450d113e018d5596ad9c7b83a12927ac033f4b9364e84bc20438ed222a46f41a572c726c07732cc51efa08e4cd8b541ddf0babc322a9a37caf39e SHA512 eff345f87724c9e4b82dffbe87b8e881b85aa32a6a05ee240809783dd511edbf191eca0092aa43eabd76cd10f8ea86146247a8342f53c9d38cc375e2b10112df
-EBUILD pcl-1.12-r2.ebuild 495 BLAKE2B e2004e155d4eaa0e2046d3e26e0ef7e657540fa2cad7b6f0cddbfa366615fd5c75f949e0a54a1460a77b66dc377df0049b6a0ba4f4018c4ffbb674c65c4ae838 SHA512 7a27c0c6eb2a33cf5945911765f9c2a21ae5eac239153bbbd30ef9a3b17ee62e0f3732f01801a64e6c7a60e7d74ef35b359db5452aff9fce9abdd1fb020a1237
+EBUILD pcl-1.12-r2.ebuild 494 BLAKE2B 37262196a5db011c21cec9f111995deb0ae075b262722d12caaccc017d02bef4f5cb0eb243506de37aa9ede9dcf6ab119a23be1efc586481bfb43d857cf80213 SHA512 48632489084a682e2d692fcabf4cf35a63abfdcfed79f5e387f0780ee46954444ecd6f0cc949a679ecbcb374758c23399999a1be1dd3b16410ba93682e29cb0c
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/pcl/pcl-1.12-r2.ebuild b/dev-libs/pcl/pcl-1.12-r2.ebuild
index 87b7a22e8cba..bf62ba0bc326 100644
--- a/dev-libs/pcl/pcl-1.12-r2.ebuild
+++ b/dev-libs/pcl/pcl-1.12-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.xmailserver.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ppc64 ~riscv ~x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-musl.patch"
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index acdc92fe98a4..22fd1afdd2c2 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,5 +1,5 @@
 DIST serd-0.32.0.tar.xz 168028 BLAKE2B 839440f197a7b9b4082c7a39a7f63ddcc9129aed8968ab5a52780d0b8072743c78d7ccd9d6fc0e810944e3f55661cbd11969ea0f0242d4133d1883098ca4215c SHA512 eefd5e4b371213cc77cff3ca6e67c0c460d7cd1a70e55dbac64948ab77703679ee24a446f51d6bfc229fe0cd8089d32eeaa236136cbd1162f7d2100ed2946cbc
 DIST serd-0.32.2.tar.xz 168840 BLAKE2B 5b2ad72ddced2edcb948d75e795c95dccc50ad5be4bf3100c34ead4ec43944647c4f8ff419cda2b7a005b9b69dbd6fa9a0733b2810ad95a9051df3d4253ddfe9 SHA512 052f0765a9af6883a7ef1a31bd90eea3c57d93747dfb989eeda8c4dabbf2ae7d2e868d437aa2a510243f3a535e366739fe266cf82ef0d280472868c87055d50a
 EBUILD serd-0.32.0.ebuild 1032 BLAKE2B 594a05891ccdfd99af528da3328ace5320dd61c142ffac5d7e6a14c4faa52af9f31cf545d77ae920f79c5db1a5bb306c697b130fb2aff6534362db66cc948948 SHA512 d57aea928f462c9e13903e3887a583c32400a9313fcf28851b5fc090c7a918c36f9751c855decdcc6aa90df514a172cd9d0593c4446b5a56166210d17cab6c68
-EBUILD serd-0.32.2.ebuild 1039 BLAKE2B 1c6beb0efef859b7c7570d789907264723777397121a4ddb5a7c03c8b8e672190028a6940635d03cf48bfc97c9e57cf7d38ec26b09ccce21b6ee865342332a45 SHA512 d23ed850b50cfa60453b03bfd39a9ed4be2c5c3a3f9289a0ae4ca6f42964d6eb3d44cf281f077a1457a9df7002f7ec2d59c2fc3c91bce4f5b8e7668a6de5f2b1
+EBUILD serd-0.32.2.ebuild 1037 BLAKE2B 23b714f90b8b21f4497300e54715a30a1c25205050894f041e7294150b0f705245f6b7db12bac6ecbdecda12d3287f44657b4b5eed97a319c8cfd594a6bc54b4 SHA512 a284fb6e329ae3cd80e57c18431e8f46b1de957b96e7760dcaf4cec7d4736a1733cb0a9c89ea4db01850f0be7833684a6fbf9fd6d59d63c6ced28f26b3c17beb
 MISC metadata.xml 817 BLAKE2B 227ff475b019a065d0f3078357e44acb5726b9ff2de63d1ea8cd7335b2601c552a7ff8943b1f25deeef78091c598fccd4771c2fbdddb4040993941669041cb33 SHA512 62e4e41d9b854e1d7b01173099289dd1ddf33923565b23766201f82282d1ef15a23985f677f515fa68ffa9dda67064bc92b9f432846a5e4ea98c82c5b481b192
diff --git a/dev-libs/serd/serd-0.32.2.ebuild b/dev-libs/serd/serd-0.32.2.ebuild
index f612b9721a49..5a3421ef8eaf 100644
--- a/dev-libs/serd/serd-0.32.2.ebuild
+++ b/dev-libs/serd/serd-0.32.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.drobilla.net/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="doc test +tools"
 RESTRICT="!test? ( test )"