15 files changed, 148 insertions, 105 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 58edd2df6f76..907e001aff86 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index 197126fc6fc5..adfffbbfe051 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -1,6 +1,6 @@
 AUX confuse-3.3-fix-CVE-2022-40320.patch 1137 BLAKE2B 6fb44768b35dee93ecf03859cc0c925072ef7e8506e91869d9436b7627d9c8d5c9e4608e47479e6ba67ccf98db9b29c1563511b2186ed6ac89563a03c9a75f0c SHA512 0fc8484484ea04906f9196df59bafc9739ed99b785fb001847b9d2d13a6055029debc793b28a0fea67be10534d1dc0d1c3c6bc8c7d28bf0eada8a0aa2bc15226
 DIST confuse-3.3.tar.xz 485140 BLAKE2B 41f426544341966e4a4148c40951dd7f6771b70b182e9ab9f19ce9be781c3ca42c86615f48e91f3997c8e0654111de2360a09c070afc21047b6edb4a8187755f SHA512 93cc62d98166199315f65a2f6f540a9c0d33592b69a2c6a57fd17f132aecc6ece39b9813b96c9a49ae2b66a99b7eba1188a9ce9e360e1c5fb4b973619e7088a0
 EBUILD confuse-3.3-r1.ebuild 1247 BLAKE2B a30d67299d61093a3863dc48e414b2e833bef615674191939d111633bae67c348b101fb5eac00fa48f25d94c34567acfdf60bbc520a8e3b3f63e3c8610ba8f33 SHA512 15f301f21c9e40285cd7a3252c1d761e1fb637f428210139456722ef37d44674da9d2f794ee95552196829dcfcbb4c23be4a59761f5fedeaf26ee28cc8b2c260
-EBUILD confuse-3.3-r2.ebuild 1453 BLAKE2B d623811b160e20e650a679b0b57c2c20dcb68164b0a9ad430a0ccdba586a41c0638b1b8ee4793e82fc920392f7bf1a7e90297edca2df1dae7730c3b1eb9abe53 SHA512 a6c40e6bd845dcf66b2f212b0dd96fff019c379214227dc2eb733b80a5665df082f30cfa810284e128989ffffffec923a5edf5a1378038e64d88801850519c48
+EBUILD confuse-3.3-r2.ebuild 1446 BLAKE2B 4435be0fdc5401e8d0fcff7d2cbd7a95131a9f86b6d132e76cb64f6b5f9f9feab6f1b5eecf1fd5c99bf0d654a9cf16715801444f4278e1d767c388de844b5880 SHA512 ac7e5cb80abe6caa3ad848905f2112ca395cbed7a9a19d5015e573f4a8b3a572500a299d3fdd041a563bd6998c37dd0f1b9d10b7d08780900f4d2ba2fde6f97b
 EBUILD confuse-3.3.ebuild 1162 BLAKE2B 867decdf55291a7acf6bf2cc5b557adcd5b2d18e50b116193aaa93532820e07212bf694dbcc4c42d42edbe00cc718b6f50cbd46f0153a4614c44b08828e6aa6c SHA512 6824fbbd39fef2b209d76e92dc4ab35947e4af35d82bef885e8717a4724d36ba634a7c3e7819aa78292f098f0c536a85773c2a4dd5bfc37b5c3fe78d65d1a8ca
 MISC metadata.xml 324 BLAKE2B 4b07d6e5ec2bd4a458f3441b4da7653d4d92b2a3d9ddf451976baac0e0631de0d66fd2fd3812447bf18c91c752e0ae84cd82a476a54af2c57999b92934d52fba SHA512 bd23cabb445578fab14d5eed7d112cf8f75c6be6b3879b56edbeeef69070beef42a6a2f6cf40f0406fdeaf38e46dcd3a4f27ef4bc14e09fc1c95c48492724854
diff --git a/dev-libs/confuse/confuse-3.3-r2.ebuild b/dev-libs/confuse/confuse-3.3-r2.ebuild
index 57c0210569c8..2b8a99699efb 100644
--- a/dev-libs/confuse/confuse-3.3-r2.ebuild
+++ b/dev-libs/confuse/confuse-3.3-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar
 
 LICENSE="ISC"
 SLOT="0/2.1.0"
-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="nls static-libs"
 
diff --git a/dev-libs/libchdr/Manifest b/dev-libs/libchdr/Manifest
index 3059b0d03549..6769e43da51d 100644
--- a/dev-libs/libchdr/Manifest
+++ b/dev-libs/libchdr/Manifest
@@ -1,3 +1,5 @@
 DIST libchdr-0_p20221129.tar.gz 1748187 BLAKE2B bc2f03d558e0f208ae3c51a53b2bbf630fb4cc502c18d83b31f184cf2c2f59e06dbb88c5399e01fb5f2436643a5095256bd31501a1531a043537a05c45c27be3 SHA512 4a72dcb376c451b74389650e121de06daae7cf0b293d7d66a8f7acf1b4f83355a2467a2d77e0953331ee5fffa243f713efb0878bb509384715e9c42a567a9b90
+DIST libchdr-0_p20230230.tar.gz 1748513 BLAKE2B 03fc5507b7f598995fede477f26c8ab41cd16c658e4ca5c193e581840f14ead0db4ab8da3b888a2e03fb4c78c19af0f08cbab9feefe488dc230ec0fbd3941a91 SHA512 c25084b2257083c4bddd84d13e3dc0d30fea548a4e50a6beefd5282383480eaaa293c044647e2aff339d087dae87c3ef871137a43db766e08a1dffd8801c3367
 EBUILD libchdr-0_p20221129.ebuild 601 BLAKE2B 001f0c6be7d3a791170039f596fee04db2fea5d6e70e9688890ec5ed096affb1e7bcb1dd10e14a1689b3595441773696ba1aa024106f6ea3106e2df9a279ee77 SHA512 3aa39756cc6cfa74f739b4d7c5f5b5ea71c2ddedde8d69bc737ef25612459256ee02182da3067e31b58a27a0d3d5195d5918c864664933d846552854819cf58b
+EBUILD libchdr-0_p20230230.ebuild 606 BLAKE2B 6a3bd39078d52da00a1f97e4f7af42c64e23101062ef6336f19efa26b5ebc098b7f8b98ad504afcddb9f90399ebc58d215026287669d6d098bbfb1ec907ace7d SHA512 68e28e766360f69e2535e53f43f512fa17e032c8e2a13c78fbb5a1475eca05a754b56606874d96ae021a47be2641c63d35d6416582af9088490a69572e3eafbf
 MISC metadata.xml 327 BLAKE2B 20c6d3bc61e288afbfd5b0d7d6bb641dc2214d9221b1c2b69a69de676042994bca2878c855b92fea7b5aca60e6dc687c55f0e79f4db13d579332a3d15991e211 SHA512 31e8175f36df91d1bc81a2351a99deba53cb57cb08e6e0e5ad65e17c53cd1cb1b1565b943f2c881bd3e11df45c6ea518f3eaf86335e10d816078161bb23d284b
diff --git a/dev-libs/libchdr/libchdr-0_p20230230.ebuild b/dev-libs/libchdr/libchdr-0_p20230230.ebuild
new file mode 100644
index 000000000000..45f61ac9698f
--- /dev/null
+++ b/dev-libs/libchdr/libchdr-0_p20230230.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+HASH_CHDR=fec8ab94212cc65d9d9a62cb3da924f5830c04b0
+
+DESCRIPTION="Standalone library for reading MAME's CHDv1-v5 formats"
+HOMEPAGE="https://github.com/rtissera/libchdr/"
+SRC_URI="https://github.com/rtissera/libchdr/archive/${HASH_CHDR}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${HASH_CHDR}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SYSTEM_ZLIB=yes
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index cce4d3ff5ccb..1db9fda5aaaa 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -1,9 +1,5 @@
 AUX libtpms-0.9.0-Remove-WError.patch 508 BLAKE2B 33178598a1fef1189039c30814996f00ec37215b3f10a0ff9df521a866147b2a6844d86c3b372e450f701e6e2ae3e587443765c39848076536861342e5b42d63 SHA512 e0d55045bcb667278dc1ae1c509b7be466f23421683f8b0b7c830d724f83b1923b09a61f2a8e649e08150d1d313f0456cfc5f5a1b5fe3bf168565e443595dd12
 AUX libtpms-0.9.5-slibtool.patch 1981 BLAKE2B fa4adf1c063d24a2550f964dcaae1ea2e2d93f7d2704bc00e29ef22ceecaaf214860e82e668e1358854482fcf3ba1af89745422657763b7683a232f7e286ac7e SHA512 4b8eebc895ce6941a3ad5995ee0d5f1b1537861700878fa1ce0a95ec37ee1d51354782da4bb2feeedc1c5871aa62ec248484b409c6109bed95cf73962ff8b206
-DIST libtpms-0.9.4.tar.gz 1264030 BLAKE2B 56731b913145afcd49fae13f0fcbe4fc147edf206a44849cef45ed34a7644f0894bb6ab5dcb72d620eb1ab121bf4e821fe7893557508af394585171133d659e2 SHA512 ae3e2613bc31d98c10def546c70d0c25bd1246af5090268afa0411502bfd0e454967046ebcd9025350976817441e595fa4e21562f800285db98331e4c2743505
-DIST libtpms-0.9.5.tar.gz 1264086 BLAKE2B 3e6da08dd31414bdf19260f47fce6ba7ace0ae72b152b681f1c1fbc9d75b7708238e5c2a161827c7a6e2b9a6ae4786dfbf921ec37b9f0b7c044835c974a111a3 SHA512 96b8d6dd66a6c4bc7b72d172d0b75444c7725a7fb5b0f792cd1cff9d8f7ec894c51e94493816f033198cc8adf2f95cf473629431dadb70b423068d834de09e21
 DIST libtpms-0.9.6.tar.gz 1264338 BLAKE2B 7b127ef370a48214814bb9ad0e8461ed0af21f32ab84f243945980c5e36ba5e374b4de7a83bf9c67c29264609063d48eae2dae83832daed70170bb1ed39eafea SHA512 35f26e4849eb98cd73461aff439c19f77bbbcde9b7661402e3d419354c4dcddd057349c4f7178573f1ceea2e95326498eb9afea3bd48064bbff534fc7f6939c3
-EBUILD libtpms-0.9.4.ebuild 1299 BLAKE2B 6c78609afdc5385a842da2f415ef918475baab3da737cb2e43c72cf5d2aaa382dd84b4157e4b52aa7fa5f44de6db48b37f680897baabb006d923589d4ca39552 SHA512 f54857978f2f4d021055406f2f2f480f3df97ca57cf29b1967389107079cbe37551ac8717c03fdbf38cb4aa64b5567a87f27bd2ed46edd0243d076c06689f3b1
-EBUILD libtpms-0.9.5.ebuild 1357 BLAKE2B 21ecc3c6e03111c24c5b06f2698d980c1f22e69de41f42998ea655bafc48a8975feb32ad7b85973216fa444b7dd193bcbd9d7dc0f8cc0f7f526fab011cfa8f23 SHA512 d8a48b47cb8ca9cb13b2d8dba29692d2ad14109355a063216febd81b256f88bea5c007e9f9fa9d07d6c562fba3bb27d9d63a313e8ccba7bb78f8df1a9be5f995
 EBUILD libtpms-0.9.6.ebuild 1357 BLAKE2B 21ecc3c6e03111c24c5b06f2698d980c1f22e69de41f42998ea655bafc48a8975feb32ad7b85973216fa444b7dd193bcbd9d7dc0f8cc0f7f526fab011cfa8f23 SHA512 d8a48b47cb8ca9cb13b2d8dba29692d2ad14109355a063216febd81b256f88bea5c007e9f9fa9d07d6c562fba3bb27d9d63a313e8ccba7bb78f8df1a9be5f995
 MISC metadata.xml 621 BLAKE2B 5431a08a57b654746f41820560912e2bac4fc0c5cd2eb5f44c77e4eda65c1a160845205c3ae76392c4a6f9aa33562999576c055ee6d1b89579a9e2a49c59e4f6 SHA512 5e9fff7be647a2e9e8eb71dadcc6b8cc8577ade658fd4ab8ba20cfd64f1b5ba129fc7e5f8fcfb52e69a646681741079c0bc85b06a92f9086ce66a28770c1a9da
diff --git a/dev-libs/libtpms/libtpms-0.9.4.ebuild b/dev-libs/libtpms/libtpms-0.9.4.ebuild
deleted file mode 100644
index 3b5f046772a9..000000000000
--- a/dev-libs/libtpms/libtpms-0.9.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Library providing software emultion of a TPM"
-HOMEPAGE="https://github.com/stefanberger/libtpms"
-SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-
-DEPEND="dev-libs/openssl:="
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.0-Remove-WError.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-openssl
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 0.8.0; then
-		elog "Versions of libtpms prior to 0.8.0 generate weaker than expected TPM 2.0 RSA"
-		elog "keys due to a flawed key creation algorithm. Because fixing this would render"
-		elog "existing sealed data inaccessible, to use the corrected algorithm, the old"
-		elog "TPM state file must be deleted and a new TPM state file created. Data still"
-		elog "sealed using the old state file will be permanently inaccessible. For the"
-		elog "details see https://github.com/stefanberger/libtpms/issues/183"
-	fi
-}
diff --git a/dev-libs/libtpms/libtpms-0.9.5.ebuild b/dev-libs/libtpms/libtpms-0.9.5.ebuild
deleted file mode 100644
index b78b99d4a24a..000000000000
--- a/dev-libs/libtpms/libtpms-0.9.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Library providing software emultion of a TPM"
-HOMEPAGE="https://github.com/stefanberger/libtpms"
-SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-
-DEPEND="dev-libs/openssl:="
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.0-Remove-WError.patch"
-	"${FILESDIR}/${PN}-0.9.5-slibtool.patch" # 858671
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-openssl
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 0.8.0; then
-		elog "Versions of libtpms prior to 0.8.0 generate weaker than expected TPM 2.0 RSA"
-		elog "keys due to a flawed key creation algorithm. Because fixing this would render"
-		elog "existing sealed data inaccessible, to use the corrected algorithm, the old"
-		elog "TPM state file must be deleted and a new TPM state file created. Data still"
-		elog "sealed using the old state file will be permanently inaccessible. For the"
-		elog "details see https://github.com/stefanberger/libtpms/issues/183"
-	fi
-}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 3a4e85c6d3f8..3aed749126bd 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -27,7 +27,7 @@ EBUILD openssl-1.0.2u-r1.ebuild 9980 BLAKE2B 0017b72acb2eb86f2927845903c93aacfc9
 EBUILD openssl-1.1.1s.ebuild 10244 BLAKE2B d82db58beebd3eba272016b0484a148591c9d273b520dabd27c80e2f078a8a86beb0374ac2a19a6237fecd0e3e8d2a6d2a387edad4344865ead73869ae8f198b SHA512 3705eb236ead5c896ccb0e0165b48027bf6bd6bedcee148dc7d1ad53e2a787bad4e430c1d3868c05fb866628fb40675bef8bcf64e377e81ae601f3fa7ca4956b
 EBUILD openssl-1.1.1t-r1.ebuild 7974 BLAKE2B 1323ae4f56c9facb31f4487dced3c22c7c3f31dad6e420892dc6c5d21cc2d059f4ac5e6a4bf1e924b754bbf0e17dff96bb1ec3cf6a7f8e6992baed7a5c98ef05 SHA512 6b49ca3c7efeaa0230640bfea56eb1f038aaa0ed86b9e91bc7f67cee683e80d6bd6bf1016ad465e5720247056c8b1150d1aeb879f1485e1f0964b5ec5fd105a0
 EBUILD openssl-1.1.1t-r2.ebuild 8032 BLAKE2B 78af8d673a7ac80ca9ce186496f44b662696b72171888643ddd3cd7fdea94a9658f541c79cb26863207da395db9276a6bcbaa838867e20da5ea0602712b4edcd SHA512 085963d07dd99c4a10539b10cd212d39f2438c81a3337f10803094907c4f7197591e67eeb5962c54ab6055f5f3a6aecd90bd292b4965bd143bc1b242121c4d82
-EBUILD openssl-1.1.1t-r3.ebuild 8391 BLAKE2B e33ab4145cf96365cfe489a2674f91367c5da7362d348336625c9b3e3178657e419c41306b92614d0162baf343d9cc79934e573c3c9f1ae94527396710697bbe SHA512 8db9136855b12f5a84000b2d5eb1184d63deaa433e5367463a6c90ccb773816004a2b99872367218665407b20bda6f9a012ee485b4428c4bc3f1e949b4490c64
+EBUILD openssl-1.1.1t-r3.ebuild 8386 BLAKE2B e444fd4f56d0954a6e4a8896f7834c9b67b1c904e48b1fd3f00db8ded0116e7dd707b623f4e27ffa8c2b94ccb36bdc68aac2e79aed40078d4119f7c86d909b09 SHA512 ac077c6f0cc9dffdbe9bb020c1822b5738aebcea9c3b48f79d6388cd2993c69cc8f1155a97cfdb0c809ddd077e96d02d4115f8eb52bda29ae63af181eb9bce15
 EBUILD openssl-3.0.8-r1.ebuild 7789 BLAKE2B a5a3eed08b0c4196e38849abd2f37c90f177f7c350f83064632934c379038e977e7519da2aadb62b7d15dc634cf26c8cf5bdae9aab0a4ddb6f4d1f0dbd693025 SHA512 b5e20150d2b93214303d70f73f7593f098bda3876e21d46e49c72000bd7161a29c3166908ae9f0e8af8efb4e127801dc0c7c962391499f9d46e74370ead17d2a
 EBUILD openssl-3.0.8-r2.ebuild 7838 BLAKE2B 437496ddf1bf7d36c83e40f86e41d5ba5d0ce210f0162521c3df5d2011ccefb94c42021ba7d326824fc64f1b30fe0edc569f586552f43ce054a57aa82b9d4290 SHA512 2dc102202843d437fda0f2121ddfac2b15504129878bb40e2354638ad0b1b8c7e1fa81800491147961af6237022672f9ee47457cae0da0e62da3a6802f709398
 EBUILD openssl-3.0.8-r3.ebuild 8195 BLAKE2B e8510784cf26533644b19638eb112d4a9e9b54ef8b2c4e80673d85d7c750281e1449b263f428da7f080909355d017149a1920eaf1cfac15aa101f42ec4eeded4 SHA512 0b37b8ab4f25a1b846b87d825412c327a9fa08244325f8ee96567c366a004784cfb27764b3ffc06b5947c74416840263ea28a9f66bb095d376755ffdbac2afad
diff --git a/dev-libs/openssl/openssl-1.1.1t-r3.ebuild b/dev-libs/openssl/openssl-1.1.1t-r3.ebuild
index a25fd43760eb..b68a78a6b738 100644
--- a/dev-libs/openssl/openssl-1.1.1t-r3.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1t-r3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 if [[ ${PV} != *_pre* ]] ; then
-	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 ~x86-winnt"
+	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 ~x86-winnt"
 fi
 IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index a0add3b5b01b..9a4619cc0ea3 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 1405 BLAKE2B 09494d14f4d2655ac5c159ec16c5e5bd3b4bb1e044037f434c1205e511108b4159eb22a77b0624a7145dceceab89225f70a73577089f98609c426c252db0e25c SHA512 d39ede4bc59862166324c994c01af32a17731619b85ca4da832c40b1262fb1c971c321702015e9b4b08f16dc4446856bd3e20b1392a3814a2883a1ba0f6c0904
+EBUILD xapian-1.4.22.ebuild 1404 BLAKE2B 131bafca4fc9eee6df12483edcbd6c9f054e85fbdbd6f6c45d8cf6b0204745fecde8e784c1dbf02ae3444b6429e27290cc3ac2de65b6fe93e3d7cb2a8fad4053 SHA512 c597831aae52d79dfe460009351d3f6b333788fc8c813c2e43ae11c4514cb5966378d0efdefbde3a69a50e7d29f75c7e480bb61fe0e7b2dc300fe8e99d215b3c
 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 40a621af6000..c6147f565f5d 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/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index c11c990b703d..60d0dfe47838 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -1,5 +1,8 @@
 AUX xmlrpc-c-1.51.06-pkg-config-libxml2.patch 7240 BLAKE2B 472b313f8b815c1235cc72b56e9081d855277de21e066a1f2db5acb650d4fc4daedca2e82c05116b353b340c1359bfd8e480b19bd1cc5f4f36627f7ccf66760a SHA512 478af29becba5ee415f0b92f15af1cd8273daf14bc4b5fee4deca83197f11a975a40c94c9400050eac5030eb840d55a54282aaed403f105ab0752b1eec398c08
 AUX xmlrpc-c-1.51.06-pkg-config-openssl.patch 1244 BLAKE2B be5e48daa409cb67ae5f75fec54c25ee160e476ef03e5814917f81c887622e8acb5456af29e976ffec761ce4e16c3d5c5b14b75151c594afdc6e8dd48b4dd596 SHA512 73b983c6e0fa97ba0dbceb8bbc7699a51f4e625c05cdfc5a27bf973bf039e9224eb1ec7f21e94ae70d8e32b4f9a1b1dbb04959f639e558b32270a467a72a87e3
+AUX xmlrpc-c-1.54.06-wformat-security.patch 1107 BLAKE2B 4572a031c01f018af7fe8281429d8a43c93a07f9af0cae47d1f5c2e1b4cf0aac98c0a3d00bce7ff4964b61d9f1c4b2a265379f5efcf49ccb60c4207bcccafd34 SHA512 5ecaea4f875261b9c108840779554505fead02011b5fbf6387a01335cbcd5169e2f76b491806efabdb418c0dee9977f15856470099e3464ec039bf8dada9b9ec
 DIST xmlrpc-c-1.54.05.tgz 933228 BLAKE2B 50d73fe22454f04ffebf11d4b88986eaac571d107abce4e04244ad0b74469fc5233178967e3dd832a8525514912e4f835fa1ce13c439caf918a2b2d0c05021a0 SHA512 81bf8f398e9cb73b421907d8e304b9a6dc8da931f573f7296457486ade432f4a00a94b6850391690f7b229928f785522e5852db8aca68cb462c71d139e4f27b1
+DIST xmlrpc-c-1.54.06.tgz 933199 BLAKE2B 1286323b59aa4d77fe2f8b04fef18d9a448d29a7fa23aad143418e62c92ac6a5156bb61ee58e0df4b0667e73a9170663b02b42fac94b38df71fc789d13e929e0 SHA512 0e8c920ccf04c78947bc66f7210b62c153ba185183c181461584772885690a3bb09dcf63d69c5b0f1f76a96f162a2a0eba6268e7210dda42561f59bec8008733
 EBUILD xmlrpc-c-1.54.05-r2.ebuild 2013 BLAKE2B e227ee8ac8f9ed851004c5f59bd19de358a2a39a9a822c23c5f567633d9e58665aeed8b9f8084952fb38aa8b014bc236a1b6ef55aff68be3846aabfc0b8e1a76 SHA512 9a8015aa57bc48d12bfd542bcc5e48945167ce6f23e77326960135be6a0a42058ab3c6c82ceb15668de606e42f908cbecf9562d3aa0436dc0dc35bc162bc305d
+EBUILD xmlrpc-c-1.54.06.ebuild 2091 BLAKE2B b1af861e1bd328941d8614f8961e7a95680244b15c265ac9896c23263656042f78c3c2b5a15be1c738991a455f82a51736398b2c370b4800ac1778c97eefad48 SHA512 d1b27e5efbbee75b6594202463fab36fb13c43c56d204a9a6cad2e0758c7a405e29c1b17288a565f9418e407b8864c88efc4859892e4343d7f45b81b5f2384c4
 MISC metadata.xml 628 BLAKE2B 3d59eebbcf6eddfba969215a990fd59daa58b78dc305f05d10ba9f77f3ce5d5edbed0599644b40574beacb3c1e084af745bc2d75f0cb660968f4e3bf963c4f00 SHA512 fd572b06cc3359372e5b048d721b33d6bb614ab631fec95628af36217f94434fc9f279d83ec0de8828cd72265158b1a88f58418f94fb2e3d3e82de117c7bea71
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.54.06-wformat-security.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.54.06-wformat-security.patch
new file mode 100644
index 000000000000..462adcd06375
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.54.06-wformat-security.patch
@@ -0,0 +1,29 @@
+https://src.fedoraproject.org/rpms/xmlrpc-c/raw/rawhide/f/0001-xmlrpc_server_abyss-use-va_args-properly.patch
+
+From d31c2ffbf5181053330fa32e4f03c47283bd1448 Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+Date: Sat, 17 Dec 2016 10:28:31 +0100
+Subject: [PATCH 1/3] xmlrpc_server_abyss: use va_args properly
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+../src/xmlrpc_server_abyss.c: In function â€˜createServerâ€™:
+../src/xmlrpc_server_abyss.c:783:13: error: format not a string literal and no format arguments [-Werror=format-security]
+             xmlrpc_faultf(envP, error);
+             ^~~~~~~~~~~~~
+
+Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+--- a/src/xmlrpc_server_abyss.c
++++ b/src/xmlrpc_server_abyss.c
+@@ -780,7 +780,7 @@ createServer(xmlrpc_env *                      const envP,
+         ServerInit2(abyssServerP, &error);
+ 
+         if (error) {
+-            xmlrpc_faultf(envP, error);
++            xmlrpc_faultf(envP, "%s", error);
+             xmlrpc_strfree(error);
+         }
+     }
+-- 
+2.13.1
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild
new file mode 100644
index 000000000000..a9115dea33cf
--- /dev/null
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html
+# 1. Only the "Super Stable" series is released as a tarball
+# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/
+# Because of this, we are following the "Super Stable" release channel
+
+DESCRIPTION="A lightweight RPC library based on XML and HTTP"
+HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0/4.54"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( abyss curl cxx )"
+
+RDEPEND="
+	dev-libs/openssl:=
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	curl? ( net-misc/curl )
+	libxml2? ( dev-libs/libxml2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.51.06-pkg-config-libxml2.patch
+	"${FILESDIR}"/${PN}-1.51.06-pkg-config-openssl.patch
+	"${FILESDIR}"/${PN}-1.54.06-wformat-security.patch
+)
+
+pkg_setup() {
+	use curl || ewarn "Curl support disabled: No client library will be built"
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/CFLAGS_COMMON/s|-g -O3$||" \
+		-e "/CXXFLAGS_COMMON/s|-g$||" \
+		common.mk || die
+}
+
+src_configure() {
+	tc-export PKG_CONFIG
+
+	econf \
+		--disable-libwww-client \
+		--disable-wininet-client \
+		--without-libwww-ssl \
+		$(use_enable abyss abyss-server) \
+		$(use_enable cgi cgi-server) \
+		$(use_enable curl curl-client) \
+		$(use_enable cxx cplusplus) \
+		$(use_enable libxml2 libxml2-backend) \
+		$(use_enable threads abyss-threads)
+}
+
+src_compile() {
+	default
+
+	# Tools building is broken in this release
+	#use tools && emake -rC "${S}"/tools
+}
+
+src_install() {
+	default
+
+	# Tools building is broken in this release
+	#use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
+}