gentoo auto-resync : 01:05:2023 - 11:19:44

24 files changed, 423 insertions, 33 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7104219d19bf..e530c7cbfd63 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 9d16889573c5..223932c5b4ee 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,3 +1,4 @@
+AUX efl-1.26.3-libressl.patch 8420 BLAKE2B 637269f26888dd46f2f8faca3e63d3ccf69376f231c7f1b2423a7a1e2293eeeae569dfcb6d98dae77fe4005a74fea60c991ab622c79260f616b6e86442284cbd SHA512 10257eedd85b520b956f7e064bf596d6c31cbb7d6200c7396498b7a3d087a4b4f366a54bff06cfe5aacf8454163e2e5c803b82ed5cdaad01b3d5912773ee4e6c
 DIST efl-1.26.3.tar.xz 168540684 BLAKE2B aeb0215b9cdce9ca10550c698df4985ff9557c3c400c3a300887148d04a8900f04c7200473e5fce1d3021378be1e664e9364d171ec09c4fc488b4ec758722ea5 SHA512 9801ee8bc963786962d87af56d532d3f019bc18a91924d2ef84934dcd0ae30452d858db93c33964f2bff9af2f3c8feb9927f7281ead4a8993ed622cd0cf2c514
-EBUILD efl-1.26.3-r1.ebuild 8325 BLAKE2B 75798e925575880bdcae6a33ced67b2316d1741b6f1608694ac9acc9c5ef66ed703110ca53d7e590a1d60c583744d3c224d97eccdeca256a0d488f807886eef1 SHA512 177483ce55f23c4627ea9200466994fc1031d96917142084e8ca1c7bb48b09bc041064f4bd25824601bdf3b78e61b677617d83ae384f072e4e53eed3b1e7fec4
+EBUILD efl-1.26.3-r1.ebuild 8389 BLAKE2B 8af266631a1ba0b0fbdf1435e4e03f67cd8f0c55963984e20b07a46c568e14f461955ffd8653c9bc2bc69ba500aaf066b63e7af6954b7fdff05f287a6b4606fd SHA512 cedd8de585bbf423756b7d8a96df95a4629d152e3cf06e403aecfe30e35bd2bbe5c0e379bdfc79ec486c561c82a715cdc82868ba084e1aa7d2742b43fe31dcfc
 MISC metadata.xml 1889 BLAKE2B 00d61cd4f80a59696ca2a0b2547d5ac39f93312e35271b6f94ce7aed168d3aa042a05378b1bb2d3874dcab9c166ed5ae53a1c955fadc6b588dc40deec07ccdab SHA512 b852affad80c80834e80da06d33e3c3e42aba404cb5b628bee06f23977d3956225bf38e9897e24d31325cc10efebcd448d4c50ad9d4e8a154e23400a545e2e9f
diff --git a/dev-libs/efl/efl-1.26.3-r1.ebuild b/dev-libs/efl/efl-1.26.3-r1.ebuild
index 8b00eb21d056..fb26d694f9b3 100644
--- a/dev-libs/efl/efl-1.26.3-r1.ebuild
+++ b/dev-libs/efl/efl-1.26.3-r1.ebuild
@@ -131,6 +131,10 @@ BDEPEND="${PYTHON_DEPS}
 	nls? ( sys-devel/gettext )
 	wayland? ( dev-util/wayland-scanner )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.26.3-libressl.patch #903001
+)
+
 pkg_setup() {
 	# Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so.
 	QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.${PV}
diff --git a/dev-libs/efl/files/efl-1.26.3-libressl.patch b/dev-libs/efl/files/efl-1.26.3-libressl.patch
new file mode 100644
index 000000000000..6bb1b6bb83e3
--- /dev/null
+++ b/dev-libs/efl/files/efl-1.26.3-libressl.patch
@@ -0,0 +1,191 @@
+https://bugs.gentoo.org/903001
+https://git.enlightenment.org/enlightenment/efl/pulls/10
+https://git.enlightenment.org/enlightenment/efl/commit/bdd5b244e6a6161228f4a98210cefd9ef8a12e85
+https://git.enlightenment.org/enlightenment/efl/commit/0e22417f4579333a967fb5ce65ab339dfc066753
+
+From bdd5b244e6a6161228f4a98210cefd9ef8a12e85 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 4 Jul 2022 09:05:38 -0700
+Subject: [PATCH] Support LibreSSL 3.5.x
+
+LibreSSL 3.5.x now works with the standard OpenSSL code paths.
+---
+ src/lib/ecore_con/efl_net_ssl_conn-openssl.c | 12 ++++++------
+ src/lib/eet/eet_cipher.c                     |  8 ++++----
+ src/lib/emile/emile_cipher_openssl.c         | 14 +++++++-------
+ 3 files changed, 17 insertions(+), 17 deletions(-)
+
+From 0e22417f4579333a967fb5ce65ab339dfc066753 Mon Sep 17 00:00:00 2001
+From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
+Date: Mon, 1 Aug 2022 17:35:52 +0100
+Subject: [PATCH] eet emile - cipher - add braces for if defines to be clear on
+ order of op
+
+---
+ src/lib/ecore_con/efl_net_ssl_conn-openssl.c | 12 ++++++------
+ src/lib/eet/eet_cipher.c                     |  8 ++++----
+ src/lib/emile/emile_cipher_openssl.c         | 10 +++++-----
+ 3 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
+index e59c6811c9..56c8a595eb 100644
+--- a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
++++ b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
+@@ -27,7 +27,7 @@
+ static int
+ efl_net_socket_bio_create(BIO *b)
+ {
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    BIO_set_init(b, 1);
+    BIO_set_data(b, NULL);
+    BIO_set_flags(b, 0);
+@@ -44,7 +44,7 @@ static int
+ efl_net_socket_bio_destroy(BIO *b)
+ {
+    if (!b) return 0;
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    BIO_set_init(b, 0);
+    BIO_set_data(b, NULL);
+    BIO_set_flags(b, 0);
+@@ -63,7 +63,7 @@ efl_net_socket_bio_read(BIO *b, char *buf, int len)
+      .mem = buf,
+      .len = len
+    };
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    Eo *sock = BIO_get_data(b);
+ #else
+    Eo *sock = b->ptr;
+@@ -99,7 +99,7 @@ efl_net_socket_bio_write(BIO *b, const char *buf, int len)
+      .mem = buf,
+      .len = len
+    };
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    Eo *sock = BIO_get_data(b);
+ #else
+    Eo *sock = b->ptr;
+@@ -146,7 +146,7 @@ efl_net_socket_bio_puts(BIO *b, const char *str)
+ static BIO_METHOD *
+ __efl_net_socket_bio_get(void)
+ {
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    static BIO_METHOD *efl_net_socket_bio = NULL;
+ 
+    if (efl_net_socket_bio) return efl_net_socket_bio;
+@@ -359,7 +359,7 @@ efl_net_ssl_conn_setup(Efl_Net_Ssl_Conn *conn, Eina_Bool is_dialer, Efl_Net_Sock
+    conn->bio = BIO_new(__efl_net_socket_bio_get());
+    EINA_SAFETY_ON_NULL_GOTO(conn->bio, error_bio);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    BIO_set_data(conn->bio, sock);
+ #else
+    conn->bio->ptr = sock;
+diff --git a/src/lib/eet/eet_cipher.c b/src/lib/eet/eet_cipher.c
+index 025750cc98..30501b99e1 100644
+--- a/src/lib/eet/eet_cipher.c
++++ b/src/lib/eet/eet_cipher.c
+@@ -472,7 +472,7 @@ eet_identity_sign(FILE    *fp,
+    gnutls_datum_t signum = { NULL, 0 };
+    gnutls_privkey_t privkey;
+ # else /* ifdef HAVE_GNUTLS */
+-#  if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#  if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    EVP_MD_CTX *md_ctx;
+ #  else
+    EVP_MD_CTX md_ctx;
+@@ -562,7 +562,7 @@ eet_identity_sign(FILE    *fp,
+      }
+ 
+    /* Do the signature. */
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && (!defined(LIBRESSL_VERSION_NUMBER)))
+    md_ctx = EVP_MD_CTX_new();
+    if (!md_ctx)
+      {
+@@ -756,7 +756,7 @@ eet_identity_check(const void   *data_base,
+    const unsigned char *tmp;
+    EVP_PKEY *pkey;
+    X509 *x509;
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    EVP_MD_CTX *md_ctx;
+ #else
+    EVP_MD_CTX md_ctx;
+@@ -779,7 +779,7 @@ eet_identity_check(const void   *data_base,
+      }
+ 
+    /* Verify the signature */
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    md_ctx = EVP_MD_CTX_new();
+    if (!md_ctx)
+      {
+diff --git a/src/lib/emile/emile_cipher_openssl.c b/src/lib/emile/emile_cipher_openssl.c
+index e5a1ed4135..7fed417d3f 100644
+--- a/src/lib/emile/emile_cipher_openssl.c
++++ b/src/lib/emile/emile_cipher_openssl.c
+@@ -45,12 +45,12 @@ struct _Emile_SSL
+ Eina_Bool
+ _emile_cipher_init(void)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
+    ERR_load_crypto_strings();
+    SSL_library_init();
+    SSL_load_error_strings();
+    OpenSSL_add_all_algorithms();
+-#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
++#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x3050000fL */
+ 
+    return EINA_TRUE;
+ }
+@@ -73,7 +73,7 @@ emile_binbuf_sha1(const Eina_Binbuf * data, unsigned char digest[20])
+ {
+    const EVP_MD *md = EVP_sha1();
+    Eina_Slice slice = eina_binbuf_slice_get(data);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    EVP_MD_CTX *ctx = EVP_MD_CTX_new();
+    if (!ctx) return EINA_FALSE;
+ 
+@@ -196,7 +196,7 @@ on_error:
+    memset(ik, 0, sizeof (ik));
+ 
+    /* Openssl error */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
+    if (ctx)
+      EVP_CIPHER_CTX_cleanup(ctx);
+ #else
+@@ -204,7 +204,7 @@ on_error:
+      EVP_CIPHER_CTX_cleanup(ctx);
+      EVP_CIPHER_CTX_free(ctx);
+    }
+-#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
++#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x3050000fL */
+ 
+ 
+    free(buffer);
+@@ -331,7 +331,7 @@ emile_cipher_server_listen(Emile_Cipher_Type t)
+          SSL_CTX_set_options(r->ssl_ctx,
+                              options | SSL_OP_NO_SSLv2 | SSL_OP_SINGLE_DH_USE);
+          break;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
+       case EMILE_TLSv1:
+          r->ssl_ctx = SSL_CTX_new(TLSv1_server_method());
+          break;
+@@ -780,7 +780,7 @@ emile_cipher_server_connect(Emile_Cipher_Type t)
+                              options | SSL_OP_NO_SSLv2 | SSL_OP_SINGLE_DH_USE);
+          break;
+       case EMILE_TLSv1:
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
+          r->ssl_ctx = SSL_CTX_new(TLSv1_client_method());
+          break;
+ #endif
diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index a0bd0c248eab..06920c9cb7e9 100644
--- a/dev-libs/libcbor/Manifest
+++ b/dev-libs/libcbor/Manifest
@@ -2,6 +2,6 @@ DIST libcbor-0.10.1.tar.gz 284393 BLAKE2B 49b224493b4743fab0352e139ed9e85873238b
 DIST libcbor-0.10.2.tar.gz 289450 BLAKE2B 3ef2d7fd7942ff32acbe59db6a4b68ad72dde3af4675ef2ee3c93666360554d6e9a29392dbc4fb3029f9ff821f536b90bfd1c522c9c9c2298ab511322fb53d37 SHA512 23c6177443778d4b4833ec7ed0d0e639a0d4863372e3a38d772fdce2673eae6d5cb2a31a2a021d1a699082ea53494977c907fd0e94149b97cb23a4b6d039228a
 DIST libcbor-0.9.0.tar.gz 275405 BLAKE2B 7e78722650c702552dda4844615c454989281abe8c45ba3c9168af16e9d440a1b7e4e0c9afd89faa48e74ba85dcbe0c7733eec3e44fdafc0ca340e97574fe274 SHA512 710239f69d770212a82e933e59df1aba0fb3ec516ef6666a366f30a950565a52981b0d46ca7e0eea739f5785d79cc21fc19acd857a4a0b135f4f6aa3ef5fd3b0
 EBUILD libcbor-0.10.1.ebuild 1429 BLAKE2B 6e47e9c385520af1351ba7d562bc2b1e1a00651a4e96395a6cee09815d654c607b0bd257b7be4a2b893acfd00f5505a1ec7949fd86feaced2565db6e98baa9b7 SHA512 ebf51462c4ef40d872f904acf952e4148842375d07e467889a6af84bc6e4b38aacdf9db38352f058ac35713401230a082d2aa8185abe0e69a110954dea3ff51f
-EBUILD libcbor-0.10.2.ebuild 1455 BLAKE2B 2a43d4397b98a5182a6772c644bffa82423e93fbdc0e5f6199dcbf7a72432663c172434714e138f5f57afc1c8dbeb4e50448f2ae0d94452ad0cb5a863e0d5e16 SHA512 8ef50d006f165a9fc9d2a481d5df2be0fdab80114b1a2b4f4c5c884d9ca263b19b7e08cc8c3e9d4d7dad855875a43427c1d91c3a179bdc65a610e4c188431ad9
+EBUILD libcbor-0.10.2.ebuild 1454 BLAKE2B 7a91188362e145202149e994455f0e9c781c4c92083d80022309164e45b68faef0b9059faa777245c964b4c27fc4326dde4be590d965335aad6dc9f107398ecb SHA512 b4001431f1c7aa81d6d92527601b1b895a45e9452ec369e49c98550b2f90e0c549b071ee99e80c1baf812936f86ebad9524c27abed269d61e710a37b4730f07c
 EBUILD libcbor-0.9.0.ebuild 1455 BLAKE2B f651cd08439fbd3fff20396b5292656845955ecb85c070873b0ca9535f2b0282c6b4521e9f0cc7928ad76fc6a55c2ea67073748096e90cfad78029e89efd2d4a SHA512 9a078bf458ba5cc775571314ada0b5d20d13164596fda951b9e001b9d4f05bbd8496d034d68575acae549d63b0a4865aed79815a80e598789966c3f44635ca59
 MISC metadata.xml 430 BLAKE2B f478d98c9495fbb0946ec5d193e489f8f8a3c0a4ecbbac58ed2e3a79124d65741a54dfdc1a73f41dad39c596511aa0873ea38d2ba22d45b75a9600a122886f1d SHA512 ae7788a8a66d6f5333ee22601ff1ac202d279a7dd2aa245231440bb8a48e83d64361d4c105e331c217b8be096d9cc6d76f3878d4132e8060bc1fdcb7e8a64b18
diff --git a/dev-libs/libcbor/libcbor-0.10.2.ebuild b/dev-libs/libcbor/libcbor-0.10.2.ebuild
index 878bf8dd79be..b7c6aff0849d 100644
--- a/dev-libs/libcbor/libcbor-0.10.2.ebuild
+++ b/dev-libs/libcbor/libcbor-0.10.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+custom-alloc doc test"
 
 BDEPEND="
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 458ff691dbb9..3652606f1a07 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -2,6 +2,6 @@ AUX libfmt-8.1.1-fix-static-assert.patch 2670 BLAKE2B 781ccf10647dede937f38f2743
 DIST libfmt-8.1.1.tar.gz 826254 BLAKE2B 8f3eafd72c0eff62cfcf26a8a37e4d89c8f4a2cec6e427e3ea8d0de3010dd6e5e45ce4486335d3b433308a967915b38ca4d422d789ceda4196153329128056b9 SHA512 794a47d7cb352a2a9f2c050a60a46b002e4157e5ad23e15a5afc668e852b1e1847aeee3cda79e266c789ff79310d792060c94976ceef6352e322d60b94e23189
 DIST libfmt-9.1.0.tar.gz 837901 BLAKE2B ff1daa43140615b63aeb1ecd0aa1c32d24decfd5006805080293ef3db04d544c0445a30e8da0d985a6f5a25ad48ce4f6ae61e52da5ea4a4d3b031c212da38b18 SHA512 a18442042722dd48e20714ec034a12fcc0576c9af7be5188586970e2edf47529825bdc99af366b1d5891630c8dbf6f63bfa9f012e77ab3d3ed80d1a118e3b2be
 EBUILD libfmt-8.1.1-r1.ebuild 816 BLAKE2B f2012a5435e3d0f901b4a50ec64b20658120dec8193d9f9d1543df6574a0d1f066f0982d4cde2d47b1c3617563922336116bec97d25e91eaa5334b92b2ae0416 SHA512 0fd7f2f39dc951b623836eb8eb82609840d13112a210aad66f689ec9b1e8a79a281cbdb440662a53c4d30807a3faa0248b9f5f7a5d70579ce7a0486d4eac14fe
-EBUILD libfmt-9.1.0-r1.ebuild 726 BLAKE2B b0eda4c38676b2367d8a7c2490076844f32d1d78275046f1347fd2d243aaf4f77c8614ed9c857563fa08ff8d83366e37d42c0a3b5efb8e3a5aab10382c5720ac SHA512 b62ab9473d45607b8c82584a50fb4bcc0d8960367857f3f9615f31e23783a114bea61fa547d029257354331fbba8387e56f33e9c2a92a21a5320fd3bf689edd5
+EBUILD libfmt-9.1.0-r1.ebuild 732 BLAKE2B f8889001e89c870af690ae05b02654668cdd7cd56af5a3547f8310672ea7a32c36d155e5cab0c8ab196df83d20932040c562c6277ee110fb0522d77b043d7a64 SHA512 c7b6ae6d22d09da7df0656b7d6621af04bc5748c671583b5ebc2dccb8c52f9f77adc9c9834c0d8073f22868914797e2a1280d04e8f62495ad1f76826aa254781
 EBUILD libfmt-9999.ebuild 732 BLAKE2B 221727734038f14c302a9be166a4ae8133302357f223c7cb81fb2ff66b79fe27b69bd72d20e989c2609b0f28cb5375126ef57f18cddacc6317559e8381fa73d3 SHA512 6adc37f69eeadebc02c67642a2743999fadde4787e3affc047aedf32a7032dc77723d9cf26c50ae2571d381fe5e805cfd9e2b47873fd9de2839f95abdb949eb9
 MISC metadata.xml 382 BLAKE2B e67d9bbfe9721b994b68130e570826f819088bf0c891073ecf1451a4fb54611e2ed1465588314cf6d1b69be91d7ac2c082da8aa4e2ed5b4d531a40fce7143bac SHA512 21bd1200ee00e4f664b5d992281492c1c4a61229aa408c387280db08a9438f75b2215ef0c0ee1aa9db0d7537bfff074fba54176d44f1f105db611ebe1e45e742
diff --git a/dev-libs/libfmt/libfmt-9.1.0-r1.ebuild b/dev-libs/libfmt/libfmt-9.1.0-r1.ebuild
index 942c623654db..332185c45236 100644
--- a/dev-libs/libfmt/libfmt-9.1.0-r1.ebuild
+++ b/dev-libs/libfmt/libfmt-9.1.0-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index c0f5ea900dc5..0e5bcb8504eb 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -3,5 +3,5 @@ AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c17
 DIST libical-3.0.14.tar.gz 887795 BLAKE2B 8c073b77b5e4e6b24e3dfae7ac7a5f88da874bdfa53489cd04afd4d458d2fc963d39c2816691e777003ca9af510ceaf7bab9d7e1021942aa9c3adaad32ca8341 SHA512 36da5516672976c71b049a12af36164d91f9b655f81f1884766558149f25e80c30e64d15da848842f8a629295d708f39ce6fa63a3b0da39b5cbeb91911a4e6d8
 DIST libical-3.0.16.tar.gz 921245 BLAKE2B d6afe96abf32ece87393d85b4e5b0c1c10330ac64bca52bbaef96af45fbc06242cbbb4274fa350cc9a56655de238a85dea6111f381674b7cff44ab67a470e89e SHA512 72659c98f6c98b3e0fa15849df7f80993403100fb5c237e452df714a7be2d1d27f4547c81b399fe7bc6b1fb10c8c7cf9a23f5b969d588d7b05d7fe2e29c86bd4
 EBUILD libical-3.0.14-r1.ebuild 2440 BLAKE2B da31d0afef20d9b9d6c9b5ff12cd550953f23f9d00f7fa898c64c1a84917ce3be2a65d80e44ea3e9495d31f14ac9174f434a1fbcb9305bb9d9d34e9bfe2aed13 SHA512 ea6494ceb319e5e9de079f1b97b3bc395e6466d73f9c1d7dba040a0ed181263d897e7dd9b2258e06c49c01bef3e9e62baccb6998f6787e1c13b0b0c2f7b3aefc
-EBUILD libical-3.0.16.ebuild 2449 BLAKE2B 7ff68a0edcead3b460ea6fed6ac9e903c011ed5d7af1a7d146f4f27a503c193cfa129d683d0ce48ec25689518e547a15c316a540b14891f739f4b5e232cdaaec SHA512 98250e2fff38893fddee80355cacfeec48801850e048ccccde5f48faf8d0889517d70dfcaf8c6146bc458232c909004bec20d35f7fe7cb41524f4b6bad4bfd69
+EBUILD libical-3.0.16.ebuild 2447 BLAKE2B dac5bccc6a00edc60160baf9bf4c0f9678f5945e82e9da8ab4e572af347fcf16f8df6a7d051e864900eb1510b4fe6d7796ad56858c17ba2c80ca1877ab0cfcd5 SHA512 d51b9ba1eb9c5edd4b95ca816959824b3263f81685d09312ca5aa5a9f0a710555008945ad95586396515926ed79370eafe3d2feb7e116ee9aa977fb5697390dc
 MISC metadata.xml 426 BLAKE2B bdc616f3bedfa391b56edde0bd0f350b171c1f9afa2a8a9e0166e71ecf1177946aae064bea9f48fb9933d24cb94fd784a299bd97b12ad7236b3483641a5dd763 SHA512 663bef7814dfd66077f1046094879c0ec1eb0165d616e85c08eb0ff9cecd3557afd31e7d8dda8f1e95aca6955d94818f3253c8b763ff135195d41b1b1e871d5c
diff --git a/dev-libs/libical/libical-3.0.16.ebuild b/dev-libs/libical/libical-3.0.16.ebuild
index 9cc39a86fe66..d7f06d70e229 100644
--- a/dev-libs/libical/libical-3.0.16.ebuild
+++ b/dev-libs/libical/libical-3.0.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc examples +glib +introspection static-libs test vala"
 
 REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 5f9d9e5fbfdf..70ffd24f4e9f 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -3,5 +3,5 @@ DIST libpqxx-7.7.4.tar.gz 745900 BLAKE2B 2306ca1481cb36d32a5911452944404d9076089
 DIST libpqxx-7.7.5.tar.gz 745921 BLAKE2B 0ca9b36aecc96a436023621a1fcfcac2732443fe9d85507a64b511914a606a05f1a1d7e569dbf893d47412fb4040d02c0af2c8de280335d1f7a43240464df59d SHA512 78f1f17f5083347cfce607349d4f62be2878c41150c4afd1f26844dc796d0fe190b387b295e1b6bf9d81a26a0ebe1d82597fa651227c3a1cfe3acbd02ea7246c
 EBUILD libpqxx-7.4.1.ebuild 2034 BLAKE2B e75b11b7430d4a5511ebf3d13d9aca155af89d453dd4ba4375d605611addcf736a1788d33b44b69058b6655d57da4587d9d12ed05a66b37399b59c14cbc509bd SHA512 10adb26f5f26afabd0aad13f2c17a31d4345bc608ad39b3ceded97d0895d680f5708b097660180ef716340e9ec7fb65f5526791a09db0e7bacae1c27f8e7182f
 EBUILD libpqxx-7.7.4.ebuild 2084 BLAKE2B be397ebfbfd0ecdefa5652bc633a61fc69f150536b8a488dbee2a39bb0b02d2764821d59bd73a7ff907864f37dd569e72378198dbe123da92a11a63b64e0fffb SHA512 6eb04deda962611922d1107732f2dcfa1533b3b5f629e9aa79ca0eafddd26d71457af550bd9d4ac701d68ad740df9d2667da5e18ab950793ec4589ef167251b3
-EBUILD libpqxx-7.7.5.ebuild 2088 BLAKE2B c8c272b570e20b1f0fc6e3fbc16439adfa093437cbe4808147a99e8c7f5ddadc9540a17a6d9a4b3536141578bc8ed893655755343271f51f1b6a5a55adc4192a SHA512 956e83c67ca2f585fe7fd525e1d2f87d32346bafe24b8aa650c90aab098768f03f790d6c946c897d4ba4dc7440e06af935e4bb2ccc8ab7a209b15c26769a7bb3
+EBUILD libpqxx-7.7.5.ebuild 2086 BLAKE2B b4f1be7e892f4695622a13be692162721d6506dd369b197044a8dbfccd8357a9bd97c3480f4da20f9df671ab7616aa222a3ea764ce8bb1833f8e8bd25722424a SHA512 a2a2365bf30cedf337fd4c3c2c93fda2812da83da59b4c1c8f2677b1ed3dff36b3da2ef037c4e52725dc6446c7863c9bb2aeba49a454498da8191b3086490bda
 MISC metadata.xml 692 BLAKE2B d1308456fb80ef7563f3e644e26cc4c65fcf6c52c7ace01133558e19471dfb85a51e91b1ea26c74cf9e4acc902b29c33e8391e3a3006da0cfc74038ddbe4430d SHA512 061b6fa59d3b6314ab85de5ba8bf7d5548f3e8dac25f1c6ad3a43526df3d60a32b5b5e9aa040f8b8eb4d1f8c008c479b45763c7f09427fb0f2a0dfbf4320bf43
diff --git a/dev-libs/libpqxx/libpqxx-7.7.5.ebuild b/dev-libs/libpqxx/libpqxx-7.7.5.ebuild
index ec06b7f56679..c8e11d38610b 100644
--- a/dev-libs/libpqxx/libpqxx-7.7.5.ebuild
+++ b/dev-libs/libpqxx/libpqxx-7.7.5.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 inherit python-any-r1
 
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
 SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index b403635eb5a4..3f9039249c6c 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,10 +1,12 @@
 AUX libxml2-2.10.3-python3-unicode-errors.patch 1208 BLAKE2B 8515db0c9d79c4397c3ef4147660ddf395b863de3658a8db27db20d2274949962172a42637bf9555d3d7bf63ead8f695d19f28ddb5e957b5302c8aed466058c7 SHA512 f2ab7934687ba14bf7541a381317d88c20d9912b424d1b206f8feb60224482f12e03c79ff4e8637025ee8d1bddd870183db932380990eafca833eea1c1373a06
 DIST libxml2-2.10.3.tar.xz 2639908 BLAKE2B aef2cc87e4632ddc478ff719155fdcb17601a8af37ecc1145ca05e01340935b57f07722e016ca2b27e4b269d47bd2fe97db09119a47849e8745e077e42b8bb66 SHA512 33bb87ae9a45c475c3de09477e5d94840d8f687f893ef7839408bc7267e57611c4f2b863ed8ec819a4b5f1ebd6a122db9f6054c73bceed427d37f3e67f62620c
 DIST libxml2-2.10.4.tar.xz 2643600 BLAKE2B 5bbb63c6e58accf434513aeb974fed7349e5458de642ef89db77768c8d1383532614254e0e3f1d9471e2274c6b81a04a0a3afcb602707ce79550c2bd8e9028d9 SHA512 792c1dceb098cd353a7eca4c46d31cce6310b2553d97fd3918cf0b94d93b2480759202036511bde36c24166236bd4616f57e79959eea9afe3f60614bdfe13094
+DIST libxml2-2.11.1.tar.xz 2627948 BLAKE2B 4ae2c8583ff2fb590b29ffc250baae8d4d3978c6cb9d1d7fadbd3d9aa1d38a69ed0aeb0c9036efb060f869154e6f6d6ea6464ecbb05c7e788b7d93b1c2fa932d SHA512 cdcc06b7f8f8c2bd05ce3272dfd317b49cb52842bbf4bd6b50cd93c6f0b1bb6f57698b20369f6afeb110338b950633babfb8e9858b29f8c7d8b710fcbbec679d
 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733
 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.3-r1.ebuild 5694 BLAKE2B 1ade1ac63d537f8b10e0f37d7e62d8f72c86bcd01bb2ace42d4c58126c62751fe7e39304354332e84992b3ebe400055cc26ebe3c7e9d02fdf128bb20353a118f SHA512 887700ecb155ac2da033b717f4118054bc0e874902269fd9d22eda771c8df2b0d0b8889a331a01f6527d13a80b0b07a35c2f4fa91666c289102e3f784a0796d3
-EBUILD libxml2-2.10.4.ebuild 5702 BLAKE2B b77c495a92d9c57f7cb579cd39ed16ea315a9729478da660ca08ba9e9379dadbebe20115a837c8e2799e89902f61ff42ac8a4878035caf782cd477c105a3380f SHA512 dd8b918c3e5139f1b9e5295b4fc06358e7afda1cfb01a790383921ad9d96020bb7dcc9f0d6e7dd029f72e9b7f502394dc9eba92cde2910fcbaa17957002161b5
-EBUILD libxml2-9999.ebuild 5633 BLAKE2B 09b27b32f4d5ad12ad1e7175209822d1e5b87a7c4c4dde808ed5bb2c5c8b42b4d865ec2ddcce3ffc8878e14c75f196a1d9accc8642534ac04f0fa29868d3998f SHA512 46d6a65619696877e6bd46cf3f05a6e8fc0856a24ca0b66a34a41abb5a06ba98896ce0fbc39f9b3d2d30e3f239240d0878eaa55139aae658737efcaffde2025c
+EBUILD libxml2-2.10.4.ebuild 5696 BLAKE2B 1d5eef76d04f883193a1153a4db9c1cad4645d30f7d2b999d7ed60f08704123d83e877d5c09f2b9cee5545eef929977586af858234fa73cfeb32ca9804ac14dd SHA512 3309e4929895ff9e9509b1246810b0966e8c5403843f23292cbe061f4c185c994e659a683fe5cfefb46fac03c129c480dbe760618952f5ebd101d65d286ad5f5
+EBUILD libxml2-2.11.1.ebuild 5449 BLAKE2B 6ba3a0f2a4f9999048a6216679a599f7ee4dd314d4b4b70c4bbcbf8df143722e6aa0a18e7191b8ddfd49912a29f702a4247f7faea002f11f60b8868ec45e1c69 SHA512 e55897c65b3b251a60f6e7b006ac0879527470bf5f7e602b29758b9ae035ef31c318fd52c0abf63c6ff51a00106b0bf84c8150e9f06eb5a6456ca2b6048f2eb4
+EBUILD libxml2-9999.ebuild 5305 BLAKE2B 04465b5565f9f0a6ca7cfee5631764e9abb6caee3f58ca74ffac6f52088698e4d004b8aee005c2296b3292856e1ffe962fdb85bd261db4552da9e56e219d1b09 SHA512 01ed955947a4e17cf0c2a12bd9513bd7c34c5086e40f3e562b015a995620f550c959a7998f92c1f1569a7a3a76c3c4ab9c45c56549afd44cd8466b2e4efcf866
 MISC metadata.xml 519 BLAKE2B 528be4ec79b54eaed229c84c96656266acffaa2ab68c7b1e6daecdee77bb1109ea56babceff0459125e04326425be28f436a78f697c363920102b94aca25179d SHA512 85804c662dd019e6c4cad05bb691b2058c9b93c190c57a7b4cc2674bee71a805da41159184c1bae9954700e52b41bb104a2d1e66ea4d1799463626befb691d11
diff --git a/dev-libs/libxml2/libxml2-2.10.4.ebuild b/dev-libs/libxml2/libxml2-2.10.4.ebuild
index ee48fb701f31..f793a86d16d3 100644
--- a/dev-libs/libxml2/libxml2-2.10.4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.10.4.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 ~arm64-macos ~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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 SRC_URI+="
diff --git a/dev-libs/libxml2/libxml2-2.11.1.ebuild b/dev-libs/libxml2/libxml2-2.11.1.ebuild
new file mode 100644
index 000000000000..bce83228cbc6
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.11.1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: Please bump in sync with dev-libs/libxslt
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit flag-o-matic python-r1 multilib-minimal
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20130923.tar.gz"
+
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
+	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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+SRC_URI+="
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
+	)
+"
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+LICENSE="MIT"
+SLOT="2"
+IUSE="debug examples +ftp icu lzma +python readline static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+if [[ ${PV} == 9999 ]] ; then
+	BDEPEND+=" dev-util/gtk-doc-am"
+fi
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+# Needs testing to see if still relevant (bug #745162) and rebasing if so
+#PATCHES=( "${FILESDIR}"/${PN}-2.10.3-python3-unicode-errors.patch )
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		local tarname=${P/_rc/-rc}.tar.xz
+
+		# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
+		# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+		unpack ${tarname}
+
+		if [[ -n ${PATCHSET_VERSION} ]] ; then
+			unpack ${PN}-${PATCHSET_VERSION}.tar.bz2
+		fi
+	fi
+
+	cd "${S}" || die
+
+	if use test ; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	else
+		# Please do not remove, as else we get references to PORTAGE_TMPDIR
+		# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+		elibtoolize
+	fi
+}
+
+multilib_src_configure() {
+	# Filter seemingly problematic CFLAGS (bug #26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# Notes:
+	# The meaning of the 'debug' USE flag does not apply to the --with-debug
+	# switch (enabling the libxml2 debug module). See bug #100898.
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--enable-ipv6 \
+			$(use_with ftp) \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	# Build python bindings separately
+	libxml2_configure --without-python
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_configure --with-python
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}"/python >/dev/null || die
+
+	emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
+
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		NATIVE_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl run_in_build_dir libxml2_py_emake all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+
+	emake check
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install
+
+	# Hack until automake release is made for the optimise fix
+	# https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097
+	multilib_is_native_abi && use python && python_foreach_impl python_optimize
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use examples ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
+	fi
+
+	rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ -n "${ROOT}" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# Need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}/etc/xml/catalog"
+
+		# We don't want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e "${CATALOG}" ]]; then
+			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
diff --git a/dev-libs/libxml2/libxml2-9999.ebuild b/dev-libs/libxml2/libxml2-9999.ebuild
index 007c90de1cfa..b31269fea30e 100644
--- a/dev-libs/libxml2/libxml2-9999.ebuild
+++ b/dev-libs/libxml2/libxml2-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="xml(+)"
-inherit flag-o-matic python-r1 multilib-minimal toolchain-funcs
+inherit flag-o-matic python-r1 multilib-minimal
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
 XSTS_NAME_1="xmlschema2002-01-16"
@@ -31,7 +31,8 @@ SRC_URI+="
 		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
 		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
 		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
-	)"
+	)
+"
 S="${WORKDIR}/${PN}-${PV%_rc*}"
 
 LICENSE="MIT"
@@ -40,11 +41,13 @@ IUSE="debug examples +ftp icu lzma +python readline static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
 	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )"
+	readline? ( sys-libs/readline:= )
+"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
@@ -56,8 +59,6 @@ MULTILIB_CHOST_TOOLS=(
 	/usr/bin/xml2-config
 )
 
-DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO )
-
 src_unpack() {
 	if [[ ${PV} == 9999 ]] ; then
 		git-r3_src_unpack
@@ -100,13 +101,6 @@ multilib_src_configure() {
 	# Filter seemingly problematic CFLAGS (bug #26320)
 	filter-flags -fprefetch-loop-arrays -funroll-loops
 
-	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
-	# https://github.com/gentoo/gentoo/pull/28355
-	# mold needs this too but right now tc-ld-is-mold is also not available
-	if tc-ld-is-lld; then
-		append-ldflags -Wl,--undefined-version
-	fi
-
 	# Notes:
 	# The meaning of the 'debug' USE flag does not apply to the --with-debug
 	# switch (enabling the libxml2 debug module). See bug #100898.
diff --git a/dev-libs/log4cxx/Manifest b/dev-libs/log4cxx/Manifest
index 46bc648c68db..ef2895dea868 100644
--- a/dev-libs/log4cxx/Manifest
+++ b/dev-libs/log4cxx/Manifest
@@ -1,5 +1,5 @@
 DIST apache-log4cxx-0.11.0.tar.gz 1145075 BLAKE2B 786f3374923a5d47172bdaba7edb1725bedc766cb310b7b1237cfcc2fdd84cf2e390b47d55284ad0ce65631798e545523723090f4c0f7ab262f6cbe41a03e327 SHA512 f8aa37c9c094e7a4d6ca92dff13c032f69f1e078c51ea55e284fcb931c13256b08950af3ea6eaf7a12282240f6073e9acab19bfe217f88dbd62a5d2360f3fbdd
 DIST apache-log4cxx-1.0.0.tar.gz 554344 BLAKE2B 2664cdcb84c298cd9be49e98ee767f16665614435ad44e79fa4d10219f42373ba8bb3f6cfe698bd65c0565ba120b6f6e1ab7a8de8ce9a1f43e977dde80596c3a SHA512 a6b928d7b5b4fb60a67504be082f436a6d1a750b752a89df51d0660670b6c008e7376cf56c1749fd5fc17777ae8a2d957f72879c9a89487ecb0f179999dc1283
 EBUILD log4cxx-0.11.0.ebuild 1266 BLAKE2B fe4becd93c715d6b2c43ce49402e1b1b72d81e0768beb0b868a86dfef8b619ff499c5faeeee683d4c61eef293808064f199321333fa7ad67cb356f1a0d7b2634 SHA512 8ccff6eaa7058b7127a1f75b9e6d20b2f3853fc53cba4a482d2dfd57b21663d05b515ff7014de42f37f58efd6213eb42ff858b00b7437e9b24c11c008fa30321
-EBUILD log4cxx-1.0.0.ebuild 1278 BLAKE2B b541b9ae3815732cbb46cdbc1f474810ef293b218ce9fd3dba2954fb9ed302e8205183c43fb08f77dce65762ed08654a24236a041848b797c248993a16751365 SHA512 7ef5f6fc8bb318cea90a9a508f2e67fcbe6e5e722714ea0955f2b6de1ef80167709bcc0689a7e0cc56a9a07c8404c9c46b392116e1b2cc35a396949a9b6e3957
+EBUILD log4cxx-1.0.0.ebuild 1289 BLAKE2B 10476f6a7dcd93a249e2bf82f4cc8326574079e9d7c3e2311614446d2be9fb307d93d661592ef1e6779a822f0873b74f118570349058741ee5acc59a4eb64db9 SHA512 0922a7bfd563ee0318db21199722e0fbf9742572ed7aa1fb10313cee9f3a2408e6883bf4cd9334aac7c40e3dedc88bdb593b382c5fe88d39895103f415f3fac1
 MISC metadata.xml 349 BLAKE2B 16623880a591924cd9c0fb6371a9d99fe9b3e520e84e84517f1588d74dcc4e2e0d2d4d296c585a381e3000d991e790d2005d62cb262276a0a6175f216fe97552 SHA512 08113b1261b2a74088e8d1dcf2351707adab4b30868b57bf9c478e7f26a1015196191fcb9d938ca446a7f63e6fd79771a4a88706a7fceeac9c2dfc4f56099b50
diff --git a/dev-libs/log4cxx/log4cxx-1.0.0.ebuild b/dev-libs/log4cxx/log4cxx-1.0.0.ebuild
index 9c3e5526f562..a84ed0eb82f7 100644
--- a/dev-libs/log4cxx/log4cxx-1.0.0.ebuild
+++ b/dev-libs/log4cxx/log4cxx-1.0.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0/15"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm ~hppa"
 IUSE="odbc smtp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 5b9016978546..87ca8d42a359 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -5,5 +5,5 @@ DIST xapian-bindings-1.4.21.tar.xz 1151620 BLAKE2B 5596d0784110b6b73efce4b330ad7
 DIST xapian-bindings-1.4.22.tar.xz 1074840 BLAKE2B 49c71ece1a159a21b95ff8b6d30c5786e6fd2d1744f0a2e27427b83a85ebced6106ab57655715f6e2089bc3e56da32d6f2ad3d71303a1b75316c7d1a61f84cd0 SHA512 0d1b615646d1bdf383e4e32ae152c1493a23ad173232929c8153bb311b3f5b6c6728f29f46f703854c9249ffb35cb620eda1d68cf742c2150f628c19ed55c10f
 EBUILD xapian-bindings-1.4.19.ebuild 7115 BLAKE2B 9c93d9f8b020813a6b997a957b10592c3d7564e9ad01410d72beb676d8d48237c7419bdbd44ccccac3581b5b885933ab1b5a2282aadd75bbe83a86892e6cdc79 SHA512 68370978c0ba23e83304613663d387a6cf2ef4b6c6677975702382c76539b069f4c52772e13fbde9aed442fca432ce94b108eb715ee769e46a4036d8e74a322b
 EBUILD xapian-bindings-1.4.21.ebuild 7119 BLAKE2B 28da79127ce839b22daea81505f3d7523209238be7747d4fac27cbedd676fb332f758dc1ccde95eb5fc72217e9d0e97556518f8b743905e7aa19e8c32a6a0cab SHA512 0ab987f1757ccae25087b9b44d62ae8c37cff59f350ee72bc03186ca58a4fea8f91313c3a531b90556e0d622f74fae06f4a36005bc7887d2e0a1ea609204c8ed
-EBUILD xapian-bindings-1.4.22.ebuild 6987 BLAKE2B bf0907f498759f06ac6a03d37ff884e4e280cb4d003f35c9d59ff97f5ca8c5a8fc2efe42aa631ca1bb4c007126ea9e85b5f85ec41cc2ca29dc6ad35af52800dd SHA512 45eb92f381017121f6a99e1ca58b59d23884e4a45b88d48a1ed2eeafbc23e266edf7bc843d444bb443988f80e463c09d24972c695b15b4aa1937a26e72e12e51
+EBUILD xapian-bindings-1.4.22.ebuild 6984 BLAKE2B a6280b0ae1db920890b65c87c7a71ff9e9282f797aa2b52e44265c1eea23b123574aadb5ef3ff7069feeec4086a16cf8e92d7800b056e88864ed452019d79efe SHA512 3dbc72a4ded0c18ea77875aefa1786adfd4c952adba923695f242054a77950402de6ae303962b0a40a68fb94d4aa905c0c55e8777f3a9b67f9be8e6bfc8453d7
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild
index 1c2bf28fe943..b7368965d5e8 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}/${P}"	# need this here, some inherited eclasses change it
 
 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 )
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index fe3195f92146..40384261218b 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -4,5 +4,5 @@ DIST xapian-core-1.4.22.tar.xz 3019608 BLAKE2B f4aec86cd5f63f6f1825a4f8f427ea23b
 EBUILD xapian-1.4.19.ebuild 1881 BLAKE2B c35cd8b3aeccab24d62187fb405ed78a83d073ccfcda27caccc29461a2f1f16f7122ad462c796c9ca3527d26f2f7d72805be83dc1cc8a40c49ea5ef574e6cf33 SHA512 58770b49391f37da0322b208d6fdc21478138deb978aa7032625b82a34c43613aec973666466e7175ad0e8e739c573767600d0ca2aa4c0b882cad70386d2644d
 EBUILD xapian-1.4.21-r1.ebuild 1431 BLAKE2B 18eb02c6338b248bc4d6c3cf0a5cdafcbcf711a3c1167396506e3593f0b03c1094bf7811e3c89c2be57fff9b94d02659b621dff89822a891642366897808f396 SHA512 9efb6374e9e3ba334c768706dfebedecebfaba3c7f46327b40d336205d4894d2d2a9c5b9457359133279411e3745f55ca692755445310f6bacc26ccf7efc09a5
 EBUILD xapian-1.4.21.ebuild 1881 BLAKE2B c54cf9d37454b61dc8c8c3716439461d76884651cd68746404d6697c148895848cf01b86b864508687b7be9f689a3d4af0204f44704de073184d9168b0888b15 SHA512 a60e6628a3dfdd1a92a638f88716b8822b3b1bc66cdcb588ce86da516ced52f78640343af4333f55b90b8781a52a61393b64fc547e85e76633020f288ede7975
-EBUILD xapian-1.4.22.ebuild 1402 BLAKE2B 47d4d55f734075e31cd768086d811cc6199e9e52965bd8cab7f2668f1e4a6b5a87024c0c545b91480cbfcbe96e7aab26893727e1c91dc63bf0f35f983f9a1a19 SHA512 d9f02878bd719b8c64797d549362798d236a814d0261a4731e86569bf8f9888291a6357d3ad17df579f6d7904bf851f3e5f5e316d292ea42dbc8192c57632363
+EBUILD xapian-1.4.22.ebuild 1399 BLAKE2B 11ab41a45b05a6dcc510281de49e4aa47c710fbf884a43d2b70b9808f4f6423869693dd0913c19f9dc4290f0a05eb68a13c93c3bfbf0f5fd1b38e9d6688c7a49 SHA512 5f4f7e9d9a673718acc6e2889fcde814530115780c5efb07bde7248a4a5cb0dcc52104085a496482c0e60caf9f2570ee2d53adcae6a1f5418675e9617a40e3ae
 MISC metadata.xml 728 BLAKE2B 7873e39dfb724c6f3268a7de74226d86dea77e6dd53b21aa0df104db1d30efa5c24c18b8e6597acc45b4b6bb39f1f069b7944ef0ebc2906e75a2b5efeed02ebc SHA512 5f582793cee9b74f5b36f57d6997120cf61c4f4204c49694d07b9ace813a9821710a812df2db315e9effa4913fa3b62ab069be96399369f46cc7c811b6d728ba
diff --git a/dev-libs/xapian/xapian-1.4.22.ebuild b/dev-libs/xapian/xapian-1.4.22.ebuild
index c4fdfd3e38ad..d0ee7efb1aca 100644
--- a/dev-libs/xapian/xapian-1.4.22.ebuild
+++ b/dev-libs/xapian/xapian-1.4.22.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 
 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="
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index e1a57e4d1228..3dd6d45227b2 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -3,6 +3,6 @@ AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aa
 DIST xerces-c-3.2.3.tar.xz 4184368 BLAKE2B e582ecfa13d521061d0a0ba2e53b595047b325b53d5b634eadc0ed1967410733142e11951d907edf96386b1417adc938bf2f2f4eab760dcb81c0e718a48cf300 SHA512 8b8ac9a8377788753a918af2bd4437af5bb94b275e50fe1ab7cc6af88a8531248518705bc794da702a3e06a82a064cbd25e4149c2526aff7f61cf49ded4fdfab
 DIST xerces-c-3.2.4.tar.xz 4260560 BLAKE2B 5d9fed1e9a461f8b348f3259216c5181bd03d2b5d8790cad88621d601065d0d79f8766ae70ed0aa7afe05005e2bcaf37a88da25b17f0e028bf074a31cea5fe71 SHA512 4d58d25b59b4528ad1f2d60681ddd6d2a4dba945613cee9ce978605f006da03703ea85a1bd89f781eeb3ad4dbdadf485a310f29d4c07036b0322f0755f87fddf
 EBUILD xerces-c-3.2.3-r2.ebuild 2872 BLAKE2B bf39e3fb49aada949ee01b9faee806838e47a205fa18d03734bea89ebeb0031c20f58a1170b88fcb2210cd1ebfe3971d3732031aec20539a94f596c66f240224 SHA512 f99f2163b4da20192268cf4bc6cef91ee2c95bfff479a3278ed0c4b2b6f7d47a946eb3e65ce9fe46960e0d435758b3a7d34760b88b798ba499eb583c4864d81f
-EBUILD xerces-c-3.2.4.ebuild 2811 BLAKE2B 78a131e7b44b66e61f3b4474ac3362afed86b5f24362896de532d6bb8671b0ceebc8900adf8520572c7a275d7c5eb413f0b6add91a75cfff24060e7edf1c1de9 SHA512 9338d693f85f888d6b83fb0de4ead66bbf6787d85830582ebafd8977117c82e4e89f7def8b0c2b3974cde4c8a939147ec384d27b2f27882c6c0dacc54820add1
+EBUILD xerces-c-3.2.4.ebuild 2810 BLAKE2B ecfee6948c03007ba9e0257e54e781265a3e02a9d12b22bb85e1b57af8fa0a9d54ca3459a599b96253e9120ad791a300e45fe9e24b9f0be2218d0589a6372992 SHA512 937c2f8df46d8e7089af70dba8bd3f9b745d3f75aa5a0b4b39d617a0063be0f7f1ae39da4678b53bfb05a29641aa03ce49a838d153ea99cd10196df76fc4ea22
 EBUILD xerces-c-9999.ebuild 2817 BLAKE2B d55076252e84b3b273e4997f740ca0845043cd44c6a5c1cc47cf991f3c8fb115d65892a1d3ccfd8e30fc04f267b85894a7b2df16072ddab360a0d92da7c4df3c SHA512 1d163062122cab95d114561d68e40e3385a14c0a13fc17fa1675b39c501bfcd754aafc23bd7991f0e7e6503ec2f6b6e28692cae37b3df23c8db884e397bf7776
 MISC metadata.xml 639 BLAKE2B 478311dd96d2a5938161f66cbcd3e0bbdb51bc5680c2bc9aaddcfef3921d356bb568fcf3047d181d54f3cf2560b547dcca3e964e064506c8bfccad9291c6d0da SHA512 8c8fd2d5a525000a06fb08b0cd20c4aefd6c9fb6554e7e8586bfc7a58be2884a629417035e0863950246bf12b756466c0453e2768a31678da002d029dceacb73
diff --git a/dev-libs/xerces-c/xerces-c-3.2.4.ebuild b/dev-libs/xerces-c/xerces-c-3.2.4.ebuild
index 2ff533cc8d36..dd3b781f5317 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.4.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 LICENSE="Apache-2.0"