gentoo auto-resync : 29:10:2022 - 04:00:35

17 files changed, 99 insertions, 142 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d94bb43043bf..933739c3b999 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index dfcd87191a38..ded37a43b20b 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -1,11 +1,7 @@
-AUX libaio-0.3.111-optional-werror.patch 911 BLAKE2B f6ce9b16bfe7d3fe3fde520c4e6438b534b1ea54561faf94229cbdaa2cae40ee6e6ab0e9a689f08f7e43442d1b863bdf2c42e784774cca89003feb5dbbffd63b SHA512 8315c9ca018578d4b8e81b87ce155d8ebfc586be68f24659a91f027449cd27a9660b2cf33ce47fcf240ce44f2b7f1095e8d5996ad08782d91392f6dd8fafa5a8
 AUX libaio-0.3.112-cppflags.patch 350 BLAKE2B 8c2d0706f92a47dffff6465712588b525b89ff223019cf3ec759beca14ff2ef9515d4b3697ca64931c2d86969a40ad74642aa06544cc2671906e5b49d2e10352 SHA512 7386d741658af265cc4f156d4cc8518a7ec9abc15e8738cb13c2e2c3827b284cf8f8ee07c4a16dd0b7ae424cf87e9aad438389f0a832dac2e49ef945e3829374
-AUX libaio-0.3.112-respect-LDFLAGS.patch 521 BLAKE2B f45b0147202e767385f6816192c0fe8418cd7ed61b6807d9a6d16ec7448f10f4f842c32167f6a2ef82df820c291142cedcd66b610693858aa6ca956de272d2a4 SHA512 c1d8385fc66909168e2ff39d334e9ac37a02527a892ed13a594c1b0b55103a5115d79c32aff756a9ec96117a7001703a3d141319369dc7bcb118eb752860f0ba
 AUX libaio-0.3.113-32-bit-tests.patch 794 BLAKE2B af169fe70e736bcc83bac7394a8c8ac737799a31b23abe1d5a6158f4f118dcdd90378f515279b861f2e5086258f233aa7778062e2e8025788ebbec158dd41993 SHA512 358bab7166887f19c3d64fb8911c4fc9fc0811aabda28838e11013f28f1a6911d5d4ee9b5369e998f01848f1f758cba63644b56ad3b1bd69d0d17f487898e9e1
 AUX libaio-0.3.113-respect-LDFLAGS.patch 537 BLAKE2B 6981fe9a607ddd4f9f803797f91271eaa403d05f65b3c2e778548b30cd486e15245a75a7f201c5f2a573828e20708d77f37d3834e131636228c49d4c697e6ba3 SHA512 726aa73e2d9fd15110acd024312f36293b841aa442a14b77b49cff4dc78961981ba09d406bc1105d31afdb4b96d29906ad4359c23c78a09e0e1d1b26e25ae11a
-DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
 DIST libaio-0.3.113.tar.gz 49980 BLAKE2B 2379c88670310b36942563d10f29dfcba0f49391952ffe7fe18b0c917f33ef610405fe13297d1dbb34b7ad1d3066d4a32587a7fb20babba2f264cfc2ab289e57 SHA512 65c30a102433bf8386581b03fc706d84bd341be249fbdee11a032b237a7b239e8c27413504fef15e2797b1acd67f752526637005889590ecb380e2e120ab0b71
-EBUILD libaio-0.3.112.ebuild 2184 BLAKE2B 9af25ed8c5c41bb07f93f6139ba91ae70bac4131fa5171328b527842169bf68bf6c49a2becfc2539e1fc13a16ffc2026b8e208c6f2817d060c534ba5f8b49576 SHA512 695bd6ae41e784f76c16cf1a094f9d9282e8e9918d0612628ae587a669fbbc7bcd1d7276aeb1b421712b278333b33020e3ca1ac22e8be8e06676aff2e8970b28
 EBUILD libaio-0.3.113.ebuild 2288 BLAKE2B 3ff24b4cd6bbd9f515ef5611a789c37e90c059a13fd3c618a3627d070bf01a441b89ec218c1470e86d7b7db31097c706697b76ff75091ef83322e6e78d1ff53c SHA512 96f6aa57a82077de291b7246c1c945b6efe3c0be6bb53bef7a63f0c343cbfe24a5ea842e192d1646b799afd3e85bde4fa5cf9573225eea4f0bcd29a609513c0b
 EBUILD libaio-9999.ebuild 2248 BLAKE2B b9df5b16af67563434bc1297eb3d5b4ca767db287f57f457152e9f41d20f5f56cdb2fd0f2588667d197e0c5ecb4402774c2ecbc226ba0d9cf403933148c603db SHA512 82e56ce625dce6d15a6061897ed7d710c06692c326befc8f6b5310c4826716cfaf9a7b71d411d9dac6e6ee8033dbbc166e85f6ce60cbb3601e841208a33ef572
 MISC metadata.xml 505 BLAKE2B dd6fdcca9f3876cd5e33eefe891b4e0fd87d8bf21417b36c0e3a0e8b248a2191143037970bb1ce9ed4cc59f3da399e8057c73db1a5b194f265c7940bcb4bdb9f SHA512 5edfc92d534ac0b1526d010cc43dc33da62db6575ebba6e0edcb3b063eec7053dc18d496f0bb02b5f6a8568197d198be309a5fce57f538dc9906b788f46d0d6f
diff --git a/dev-libs/libaio/files/libaio-0.3.111-optional-werror.patch b/dev-libs/libaio/files/libaio-0.3.111-optional-werror.patch
deleted file mode 100644
index 5b6f91e56d98..000000000000
--- a/dev-libs/libaio/files/libaio-0.3.111-optional-werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ebe62b178f3e5fcde8a311e64aaffe62099204a5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 21 Apr 2019 12:44:26 +0200
-Subject: [PATCH] make -Werror into an optional flag
-
-This lets distros disable the flag as random errors might come up with
-different compiler flags and older/newer toolchain versions.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- harness/Makefile | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/harness/Makefile b/harness/Makefile
-index f477737..a155c4b 100644
---- a/harness/Makefile
-+++ b/harness/Makefile
-@@ -6,7 +6,8 @@ PROGS:=$(PARTPROGS) $(EXTRAPROGS)
- HARNESS_SRCS:=main.c
- # io_queue.c
- 
--CFLAGS+=-Wall -Werror -I../src -g -O2 -DPAGE_SIZE=$(shell getconf PAGESIZE)
-+CFLAGS_WERROR?=-Werror
-+CFLAGS+=-Wall $(CFLAGS_WERROR) -I../src -g -O2 -DPAGE_SIZE=$(shell getconf PAGESIZE)
- #-lpthread -lrt
- 
- all: $(PROGS)
--- 
-2.21.0
-
diff --git a/dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch b/dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch
deleted file mode 100644
index 20e23874fb6b..000000000000
--- a/dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-We need to place LDFLAGS earlier to ensure e.g. as-needed works correctly.
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -56,7 +56,7 @@ libaio.a: $(libaio_objs)
- 	$(RANLIB) libaio.a
- 
- $(libname): $(libaio_sobjs) libaio.map
--	$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
-+	$(CC) $(SO_CFLAGS) $(LINK_FLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs)
- 
- install: $(all_targets)
- 	install -D -m 644 libaio.h $(includedir)/libaio.h
-
diff --git a/dev-libs/libaio/libaio-0.3.112.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild
deleted file mode 100644
index dd90b717f5d9..000000000000
--- a/dev-libs/libaio/libaio-0.3.112.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal toolchain-funcs flag-o-matic usr-ldscript
-
-DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
-HOMEPAGE="https://pagure.io/libaio"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://pagure.io/libaio.git"
-else
-	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
-	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
-	"${FILESDIR}"/${PN}-0.3.112-respect-LDFLAGS.patch
-)
-
-src_prepare() {
-	default
-
-	local sed_args=(
-		-e "/^prefix=/s:/usr:${EPREFIX}/usr:"
-		-e '/^libdir=/s:lib$:$(ABI_LIBDIR):'
-	)
-	if ! use static-libs; then
-		sed_args+=( -e '/\tinstall .*\/libaio.a/d' )
-		# Tests require the static library to be built.
-		use test || sed_args+=( -e '/^all_targets +=/s/ libaio.a//' )
-	fi
-	sed -i "${sed_args[@]}" src/Makefile Makefile || die
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	if use arm ; then
-		# When building for thumb, we can't allow frame pointers.
-		# http://crbug.com/464517
-		if $(tc-getCPP) ${CFLAGS} ${CPPFLAGS} - <<<$'#ifndef __thumb__\n#error\n#endif' >&/dev/null ; then
-			append-flags -fomit-frame-pointer
-		fi
-	fi
-}
-
-_emake() {
-	CC="$(tc-getCC)" \
-	AR="$(tc-getAR)" \
-	RANLIB="$(tc-getRANLIB)" \
-	ABI_LIBDIR="$(get_libdir)" \
-	CFLAGS_WERROR= \
-	emake "$@"
-}
-
-multilib_src_compile() {
-	_emake
-}
-
-multilib_src_test() {
-	mkdir -p testdir || die
-	# 'make check' breaks with sandbox, 'make partcheck' works
-	_emake partcheck prefix="${S}/src" libdir="${S}/src"
-}
-
-multilib_src_install() {
-	_emake install DESTDIR="${D}"
-}
-
-multilib_src_install_all() {
-	doman man/*
-	dodoc ChangeLog TODO
-
-	# move crap to / for multipath-tools #325355
-	gen_usr_ldscript -a aio
-
-	# This lib is a bare minimal shim on top of kernel syscalls.
-	export QA_DT_NEEDED=$(find "${ED}" -type f -name 'libaio.so.*' -printf '/%P\n')
-}
diff --git a/dev-libs/libmcrypt/Manifest b/dev-libs/libmcrypt/Manifest
index 7469eca9031c..a717f860ba2c 100644
--- a/dev-libs/libmcrypt/Manifest
+++ b/dev-libs/libmcrypt/Manifest
@@ -1,5 +1,8 @@
 AUX libmcrypt-2.5.8-autoconf-2.70.patch 561 BLAKE2B 7781b257c87eb1f6d793fd5a0a2f017190728731f95dec00b25986fd97c36590db38f3670af6ef29c480ebab90405a1b2638601536102a6b62363226011c1199 SHA512 5aec87f49632a4e9d7cddabd5f661b813caa8558cb304374fda331a490a9f9f7a0bb753b2d4c81a17ca605246c18b9aaf24ee4d437af7f5e7a293e2fc9e37b79
+AUX libmcrypt-2.5.8-prototypes.patch 1435 BLAKE2B 6b4e85df1432e7766d5e678595b08b75a1592993d79f18373d28868566b4cbe271552d7e899719530677e4f2ad2b34d4308f01ff7808a0527507f23dc74dbf70 SHA512 c821c8c6bb42e50bb377c85042ff3127375b195ffa075d17a6ead6cedd01ff66dfe6e1fdf049a48d12b5285ee26e0a2208a86ab333294055c2df7723857c70d7
 AUX libmcrypt-2.5.8-rotate-mask.patch 1060 BLAKE2B 1bce08c2fee92ddb2038b6de67d8ccc1c2d630506f4298926edf44147dcf9596d636204fb1d009f4affb00a1e84c503b162a41b5b02d5596996a8a1768ea2d96 SHA512 975d75e7b41ba18012a09ebf0bddec794ab8597d2515995ec55498437f237d8de917a2766e31da32e92ddbd40de6fe9ca78814eb55ff68da746037e064aaede8
+AUX libmcrypt-2.5.8-uninitialized.patch 624 BLAKE2B d6c55091d0c159b5b04fb7cb68a239e45020de177271da7ac6b15c20f6d791399f5fb9c48970e66e6f43168408ce83c347fc8c1387308fee9d273726f268ed91 SHA512 d5bf3520f101a5edae1e165358c075be763ec1a76d721301b562476fe6495f4cfb0b991c71c24fe182885bf86903ef796b934fd9f5b2f026ad8a433579d70791
 DIST libmcrypt-2.5.8.tar.gz 1335178 BLAKE2B caa970107382c1485267e68feebebe3ed1e2981d879b2bfaaa37f296528b77bf5e57e73e380f5ab02a1212fae1be5caeb376142920353fabdd8600746634780e SHA512 471a4e0dcbede836c975697a4edd5c3a53d555dde122a045d702e619d7e9768c7abc1ab541c79829f644b70241ac2e0cd274cf22499e47862983401566ca1fd1
 EBUILD libmcrypt-2.5.8-r4.ebuild 997 BLAKE2B 09eabad4327b46c88a5930322f77bebf3035c09ff5d53cc9a2cafff485326b7c7f6d02c6e70695e308ec856fa7bd2a9d4014413133214ffa31e049eca3b70e15 SHA512 db16aa64a129a6feadbc8831712b7e0b95163c6c1a6459aa35075e60839e76022c2361a73db80d57b333717ea4dfcb82399c2b7abd3c2e9641e3ef47294bff47
+EBUILD libmcrypt-2.5.8-r5.ebuild 1254 BLAKE2B 46f964ee310decd45d39f409a5d890da2f4ade958f4f079a1776576a7a498f94416b63a2d6719c0d732d63c4e918262fbc9b8b0a94012e23b3f6285949b1ab63 SHA512 196d42be134d5a7ab32cbd7f798c39e65a50d02108d78581b06faffde4b9f99f2c3b58909402a4d33ad9184419e848bb330e86d05a38be77f0f8f12df7a774be
 MISC metadata.xml 249 BLAKE2B d6e11cf35a40f525ea7e1f78e0eb43ebde085e8f3a9ee2bd869a5acb43040d3490b84f7b916e5580163b217ca8e36910016199223a0d7f958d8d32e77fd6c92f SHA512 3976fd063b92b20de47f9a45410cf467b778d186a58eb13cd1dd6f46bbbd4fa1d0b8665e0a37f07e0f6b7a44343594d95bfa616c384be151982f0342ecdda7f3
diff --git a/dev-libs/libmcrypt/files/libmcrypt-2.5.8-prototypes.patch b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-prototypes.patch
new file mode 100644
index 000000000000..eca6e7793161
--- /dev/null
+++ b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-prototypes.patch
@@ -0,0 +1,35 @@
+diff -up libmcrypt-2.5.8/modules/algorithms/des.c.BAD libmcrypt-2.5.8/modules/algorithms/des.c
+--- libmcrypt-2.5.8/modules/algorithms/des.c.BAD	2008-08-25 17:40:29.000000000 -0400
++++ libmcrypt-2.5.8/modules/algorithms/des.c	2008-08-25 17:40:51.000000000 -0400
+@@ -35,9 +35,12 @@
+ 
+ /* #define	NULL	0 */
+ 
+-static void permute_ip(), permute_fp(), perminit_ip(), spinit(),
+-perminit_fp();
+-static word32 f();
++static void permute_ip(char *, DES_KEY *, char *);
++static void permute_fp(char *, DES_KEY *, char *);
++static void perminit_ip(DES_KEY *);
++static void spinit(DES_KEY *);
++static void perminit_fp(DES_KEY *);
++static word32 f(DES_KEY *, register word32, register char *);
+ 
+ 
+ /* Tables defined in the Data Encryption Standard documents */
+diff -up libmcrypt-2.5.8/modules/algorithms/tripledes.c.BAD libmcrypt-2.5.8/modules/algorithms/tripledes.c
+--- libmcrypt-2.5.8/modules/algorithms/tripledes.c.BAD	2008-08-25 17:40:56.000000000 -0400
++++ libmcrypt-2.5.8/modules/algorithms/tripledes.c	2008-08-25 17:41:13.000000000 -0400
+@@ -36,8 +36,10 @@
+ 
+ /* #define	NULL	0 */
+ 
+-static void permute(), perminit(), spinit();
+-static word32 f();
++static void permute(char *, char[16][16][8], char *);
++static void perminit(char[16][16][8], char[64]);
++static void spinit(TRIPLEDES_KEY *, int);
++static word32 f(TRIPLEDES_KEY *, int, register word32, register char *);
+ 
+ 
+ /* Tables defined in the Data Encryption Standard documents */
diff --git a/dev-libs/libmcrypt/files/libmcrypt-2.5.8-uninitialized.patch b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-uninitialized.patch
new file mode 100644
index 000000000000..f52dc9334b40
--- /dev/null
+++ b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-uninitialized.patch
@@ -0,0 +1,12 @@
+diff -up libmcrypt-2.5.8/modules/algorithms/twofish.c.BAD libmcrypt-2.5.8/modules/algorithms/twofish.c
+--- libmcrypt-2.5.8/modules/algorithms/twofish.c.BAD	2008-08-25 17:38:21.000000000 -0400
++++ libmcrypt-2.5.8/modules/algorithms/twofish.c	2008-08-25 17:38:30.000000000 -0400
+@@ -499,7 +499,7 @@ static void f_rnd(int i, word32* blk, TW
+ /* encrypt a block of text  */
+ WIN32DLL_DEFINE void _mcrypt_encrypt(TWI * pkey, word32 * in_blk)
+ {
+-	word32 t0, t1, blk[4];
++	word32 t0 = 0, t1 = 0, blk[4];
+ #ifdef WORDS_BIGENDIAN
+ 	blk[0] = byteswap32(in_blk[0]) ^ pkey->l_key[0];
+ 	blk[1] = byteswap32(in_blk[1]) ^ pkey->l_key[1];
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r5.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r5.ebuild
new file mode 100644
index 000000000000..cf8ea98d268d
--- /dev/null
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="libmcrypt provides uniform interface to access several encryption algorithms"
+HOMEPAGE="http://mcrypt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+
+DOCS=(
+	AUTHORS NEWS README THANKS TODO ChangeLog
+	doc/README.config doc/README.key doc/README.xtea
+	doc/example.c
+)
+
+PATCHES=(
+	"${FILESDIR}/${P}-rotate-mask.patch"
+	"${FILESDIR}/${P}-autoconf-2.70.patch" #775113
+	# http://sourceforge.net/tracker/index.php?func=detail&aid=1872801&group_id=87941&atid=584895
+	"${FILESDIR}/${P}-uninitialized.patch"
+	"${FILESDIR}/${P}-prototypes.patch"
+)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac
+	mv libltdl/configure.in libltdl/configure.ac
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac libltdl/configure.ac || die
+	eautoreconf # need new libtool for interix (elibtoolize would suffice for freebsd)
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libslz/Manifest b/dev-libs/libslz/Manifest
index 7de0241c8aef..dd6970a6a2a7 100644
--- a/dev-libs/libslz/Manifest
+++ b/dev-libs/libslz/Manifest
@@ -1,5 +1,5 @@
 DIST libslz-1.1.0.tar.bz2 229577 BLAKE2B d05b619d0b7b76c2777285ecaf976b75565b50c77e00a1ce042f5a28ab8d527788a75d28d70357a32ea9a98267ae621d5a6e4613e4a7e4f52767e68c77765bb3 SHA512 064e2e8e7091adf863653981e5b677bdb9e64901f61cf3b68f098cf7957a4c32e19cec7d41b8dab61098017119d6ea562350c7fbfa10b5e922f52ac0d6066948
 DIST libslz-1.2.0.tar.bz2 230567 BLAKE2B cf8a21fe0c23ae003830bfae3bd5ae172df4e88f63b0d5c1394c316e9d69c570b544d2c2db76cddd1e320d68119d7ae39352f9932673fb41e06ded030ebc5078 SHA512 811876f3893c0a0c273518fcf6d5a827a86513033e2048dbb541ca32286171c408f124495c4454ce7811e3c52ffb6a7bfcbb08af5b7f56a670c2c1cb2c5cd496
 EBUILD libslz-1.1.0.ebuild 1171 BLAKE2B 198e5fca5067778136ff7a2b50b990879186b073095906e4ac134922386780822f5d6a6d52b8f9122f3a793944c19ce560ac77c24b429f50be1f28607b7d89fb SHA512 4d2e6f3c7b54edd926e9bbe275e999314fb3e7ab577abad77126ae88fbf477b6c2d98a0282d00cdc435228271cd8928eece3cb56a069fccd3d7fd69636a9feb4
-EBUILD libslz-1.2.0-r1.ebuild 826 BLAKE2B 3425b3b0e38e2a70a67489195faa6bfb0172f9939653a79b9f97c73d85eacf3e804e76c7889d42d247fa7216b40ebe2a55f716b3633fa71b4f99bf63e7694ab9 SHA512 1b3f89147d86c97c04abb458677440d16ccba65ef4210486daccdf9031c9c977337e3cbc273b212a1f2c23dfbd4d62c1adf3dc7e30f81196162633bf5b048f4e
+EBUILD libslz-1.2.0-r1.ebuild 824 BLAKE2B fae5deac8b237f795b42d304e34c791a6477b64927c0bd8cb0b446ff55f196051dff2f7cea5170b98a6b1e51554a701d603708381645dffda0f1d3df99fecd96 SHA512 3ff0f544fa0e64d9ba17d58b35a57bd69645414c097a7962eb2f0a8fc763510890e0b0cc3b43f1c22cdded13d16089bb8ce35971f15a27672bec52fcc0d8e93e
 MISC metadata.xml 1191 BLAKE2B 98101432b70c26facdf54b28710ec27afe7ede00aa69840d29d9e0ce0e78b915656d8e9b4dba0fb7eb0332535e2a53fc142d90df1d6a79ca1df7a23a9ca60d44 SHA512 3696dabd8230d673f7077109ff791dab7415c6d7b5466ff0a59633a06ab8415592903232d50832cc9ba64d2bc38bddcbd542a82aaa88384e2277475c406f0adf
diff --git a/dev-libs/libslz/libslz-1.2.0-r1.ebuild b/dev-libs/libslz/libslz-1.2.0-r1.ebuild
index 633d4804c308..e9a2001ccec7 100644
--- a/dev-libs/libslz/libslz-1.2.0-r1.ebuild
+++ b/dev-libs/libslz/libslz-1.2.0-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~amd64 arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc x86"
 IUSE="tools"
 
 src_compile() {
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 5a8b7b8590cc..0b16bfeb6a08 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -4,6 +4,6 @@ DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e3
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
 EBUILD libxml2-2.10.2.ebuild 5335 BLAKE2B 46ade566ce046d0cf524741064b8e4f365f3df13c709cf6897feb91c3d71197a98f1a26ee41081dc92a79ec13cdbca57e948ac5a18bf8207d91ee307e3b07dc9 SHA512 7ea53bd001bb838007665254d02cdd1ba7ab5ab7ee6d5c056d7406dd799d215a3bcfcbc6a053a5e0e7a7f5552d74189ff66bacbc0e65d9bdbfabf953b5dbcd51
-EBUILD libxml2-2.10.3.ebuild 5343 BLAKE2B 64d792ad51b340afdba62613c4e565ac6c8b2557dc16a0843df4bef23573d28c4ea41e212c72dbaebac82ed2b3bc494689f98800c6e56e949b5f436c51924193 SHA512 b4ea90b16cdd78a46ba4f1591416c7ddd100cd97d2e4f2a0296812581a38db33de922c7a9793bfb81ad286830b416dcb071dc216826fa1b375e102cbe0fa6760
+EBUILD libxml2-2.10.3.ebuild 5337 BLAKE2B 5e7b8edd844bfcfc5090ab19bc63af84644eb4419b98201cad35e0cb64cf9159705e407cf99c2423070b442d98f469591790f6b2f4be65e6ec14cc0e83fd1bb8 SHA512 25f5afecf19552c80daeffc1cf891bacf15c9816300d2fb4ede0b7e7397ca7f56808fb26ecb223c2c333c3e7924de564722469cbd80027a94df30057ffa327ab
 EBUILD libxml2-9999.ebuild 5343 BLAKE2B 64d792ad51b340afdba62613c4e565ac6c8b2557dc16a0843df4bef23573d28c4ea41e212c72dbaebac82ed2b3bc494689f98800c6e56e949b5f436c51924193 SHA512 b4ea90b16cdd78a46ba4f1591416c7ddd100cd97d2e4f2a0296812581a38db33de922c7a9793bfb81ad286830b416dcb071dc216826fa1b375e102cbe0fa6760
 MISC metadata.xml 458 BLAKE2B 318644d7202e85490c0b2f7a6fd36744cce5e4fa8929534149823d679a7fd01d118b9653ea5039c9e82b7cdcd423bf4541313cf550027ccfab8393f0b9b8ceca SHA512 b173246c3ec8351343bbe16f5572728ce6c6740056a0cf96e9eb4d975c181d54213d06c41ada9c38ac11727359d14d453cd1e824b29a52f7291a7ee50bfa5ed0
diff --git a/dev-libs/libxml2/libxml2-2.10.3.ebuild b/dev-libs/libxml2/libxml2-2.10.3.ebuild
index b8f7fa168857..b30e9b92afbc 100644
--- a/dev-libs/libxml2/libxml2-2.10.3.ebuild
+++ b/dev-libs/libxml2/libxml2-2.10.3.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	inherit gnome.org libtool
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 SRC_URI+="
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 7d28f7c95b85..cce81b2b3775 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,5 +1,5 @@
 DIST xapian-bindings-1.4.19.tar.xz 1137596 BLAKE2B 46004a3449a3137db42164a8b4c5b8684d2eaf0edfa60fe7ca41d5565d1cc16b110ca8204100c9e654baa323a4c73536f80550b17989ce3ee4a132315c31a50e SHA512 c3e353a192822be5d86d448b9d5e4c5eb15d5eb2d079560f7c457f8f7ca85d42e2b933891e784d384c188577f427ca1929c2b47732b9d637e36543e8b5b704d6
 DIST xapian-bindings-1.4.21.tar.xz 1151620 BLAKE2B 5596d0784110b6b73efce4b330ad7c0750a7173c94c37d80b4c75865b949b16f32957ff7ca0d67c08592b85874a5b19e57a11d32ef26976fb3cae38f542f5ba0 SHA512 86cbdc8ba73be8aa947e209106dd49d111d264f0b00b5831356e19ba3299eb8f87f2c57ab051ea54c54fb5f1b8cc6a1175ee18f89094f5c7345b820ea805ad33
 EBUILD xapian-bindings-1.4.19.ebuild 7119 BLAKE2B 94c1604be122be96515ccceaf6ae9c380771a3ccda47ffbf522fadf094c132e8b1052d171afa2b55a812831ba674667c5f11c618d6c9d270f8df1fd67d28d1aa SHA512 59a412af6c10d7624aadaf9b59dfc499f9e97f1da5d710c0f6c435b9a057e19eacd3362c39e663a35e8086a6a7a7b04f40db4cce6f0de7be7dcc0c321a02b415
-EBUILD xapian-bindings-1.4.21.ebuild 7129 BLAKE2B 8944d678da73648ef5d629c10e01786c273a541e373a30961c2ec3e85804a05798412d0f77af8ceb50f0b4e896412805fb9851c2930c210e11bae870a90afc54 SHA512 65771b8c107e0d6048bfa268c3faacafb9ca729e79cc6f0e5e87c56a5a9fe28f096481006ac6fb47f4052efa4c0101c976f2879f115fff1afbef872f92f967d0
+EBUILD xapian-bindings-1.4.21.ebuild 7128 BLAKE2B e6cb918415ade766d831f0fb2e2242b0f7bd1e1d35ed4a1375d4a179e827ea0be2ac75c30db7496393e1139fda1c7117c011c259a791b81b87d79a32b7607181 SHA512 c7419d868d7b4f6817b504f3a784859c503169fcd3e1e66378bc204710cd88b34101fa0939f72468c6338ea9146306707adee4b7e754e0a8b0d56b151fc7c6d2
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.21.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.21.ebuild
index cd70cb26aeb5..2c547fb7dbc2 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.21.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.21.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	lua? ( ${LUA_REQUIRED_USE} )
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index f6b4f28ae14b..d58c00dda7f6 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -2,5 +2,5 @@ DIST xapian-core-1.4.19.tar.xz 2994860 BLAKE2B 9566df1646192370e346c1b0d1e1cda68
 DIST xapian-core-1.4.21.tar.xz 3018384 BLAKE2B 61a25ee381c84e0a9f20650d94aa097225f2e947dafad7f6b5497db74f383f5b0fcf277a35ea27ff461b34cd2a9a0b6333f88264c5817cff09a2caf42fa3b398 SHA512 4071791daf47f5ae77f32f358c6020fcfa9aa81c15c8da25489b055eef30383695e449ab1cb73670f2f5db2b2a5f78056da0e8eea89d83aaad91dfe340a6b13a
 EBUILD xapian-1.4.19.ebuild 1885 BLAKE2B 564a230f9ab784c55be59808404b631b9653ddec0befcc396bd71bbf23fec1c3de92a66d40dbfa6805701c659c48b8ef511958e9d42e12767dde12e586292ffe SHA512 9eafa08e04443a43e3d3346fd2d46fcba30c624cda8b84404cc5bd098dc6186b612545bcfbf34952e419ef1029efecbc1e27a66539de7f628cd5455121b5aa66
 EBUILD xapian-1.4.21-r1.ebuild 1442 BLAKE2B 11616926e8253292615ac885cafb21cf4f7a51e5bcc1300ba9b82be07948f3a3ed91271077a80c27311a907b69d832bfa561d6345a9867b446bf0abca3fbfd24 SHA512 a56e927607f735a0036bc637fb8f11cef8d9e9d29205324f190fd6c2071e8c3deea848eeb69f0936db687665014f411763abe8f814949fdf14b258c4c96453f4
-EBUILD xapian-1.4.21.ebuild 1892 BLAKE2B d0c9720409ff3d3d7d03e6c284834ce94497dec98669b7fe4b93e184199c1c738b5042339de63221661e73f85eb40560a2278883a8f05627e464ec2c9f557698 SHA512 559b923784ff7d5e5c5ee1b66c4b2d5d362d89e54a4aeba42036b26445ea73d4b5daefdf63913665e84fffc2ca82ed955bda593ada74805a886a75a883d741ee
+EBUILD xapian-1.4.21.ebuild 1890 BLAKE2B bd063977d6ba078d3f74882f6a951f1198bc2e1ac02e075a39d2c4f3d72cedb47596f7adb12716e252555c28534614748e436a4f13e9a97fcbcaf357a35d84f2 SHA512 17be2d5b6982f780b5637f1ae70069782eb1cbd2f1184505cfdc418c85e0dc1c303ea9aec0b9dd13b8fa90ea84f1c2a5959a60dc92bc6aa8e616e038642f56b9
 MISC metadata.xml 813 BLAKE2B b365d558fc9e5c1c86d9dfb90624fb27f4c502303fb602c7f21c9b392f729160cb1e7f56120d276d4fadeb88c616fca81912e5473b5273cc5841693d507f51d7 SHA512 0a40218154223a4ac13301ef324d925fd56d74749fa289c9a6d19cee7348f781430491fa65991bedc89aaaef9b0a0dd725eda49edcc993df506884b9cf3289d2
diff --git a/dev-libs/xapian/xapian-1.4.21.ebuild b/dev-libs/xapian/xapian-1.4.21.ebuild
index d50c34543512..fe771fc628c3 100644
--- a/dev-libs/xapian/xapian-1.4.21.ebuild
+++ b/dev-libs/xapian/xapian-1.4.21.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
 
 DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}]