12 files changed, 4 insertions, 463 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 6f0e305158fb..1613195ad1b1 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index ea454456c310..d64a332d9aca 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -18,5 +18,5 @@ DIST boost_1_85_0.tar.bz2 124015250 BLAKE2B dd72a9299cd78d2c260e1c94e28ba04daaa3
 DIST boost_1_86_0.tar.bz2 126220652 BLAKE2B de3d262e3dc174813e8e9abc8fb083ae101949dbd3b818b1114457497607085dc998f6f0fdd095a87c38c90700761c825ce239b082144389507c0fec77d527dd SHA512 9f8144e07a44cc5b5be6c6da17b2e6f29f0637dda345764c89eac0bcb9ce2878469a7e6fcd2c96d25034937025768450b33fc14fb40470fa4806bfcf03330e75
 EBUILD boost-1.84.0-r3.ebuild 11400 BLAKE2B b7e1d1b111e3fbb73f3bc0bb94d28a617e1e27ac9118521a32706b12c2fb7f6e75da97ed8663c9eaf7962981d398b69a2b87e8d7b1541ae5438b432d73070bc2 SHA512 30f864b39faba3b215aa8f88f9b65d3b60abbd640b4837f9ba5c0076cbad9cb4d39a611823a1ca93a1a8e9c572f52a6d6eb5e4344ea8da5d71cc60ae7f8e50fe
 EBUILD boost-1.85.0-r1.ebuild 11733 BLAKE2B f2397d23c551d13af5b66e4d2b4792024c71b7a8c326d7265e909fd80d3d037fd62f995843a94af5b227d435b85a5e259add02e381da05cce9aa3a282aa3acff SHA512 5d320568684e906bcf108de93dbb3a7726283398ddef97fcf79df5d08c7d55f52a9a45c8524cc6acd6a10083f63e24d7e62bcde4677696af0423295b5db11b5e
-EBUILD boost-1.86.0-r1.ebuild 11405 BLAKE2B 9b6cd01628325c22124587a501445fc33fdbe694e607cf96eb8be50a4381aed9b59b6bd0d71b792192570021ec36c1dfb0a23c0fb007dd6e956fd7409a04ea6e SHA512 a21671595ff0451cfc04d620cf7a900e30b42dca4f95462dea8f5e019e40b98f4cc9ca69c3a8176cf56098b4a94a2178decb1290dc69ddf04b4029d9c2d3941a
+EBUILD boost-1.86.0-r1.ebuild 11405 BLAKE2B deb6d8d7262b3acb7c7a3522c4dc8009b42b2f6db2d0e5a12bb73c59789373f0caa27f1e5b95aaed2b69bafbb53f5b1bdea0c63bf68ae866251d1e3bf498cc83 SHA512 1524b5fc33727d564943be7d6a718b540bfdcef7fd09fa9a827228c29f45c193d8dd7e1d6bca316c09609dff41e576d17d30ba34b34dfcf9a0711a96148ee43e
 MISC metadata.xml 9162 BLAKE2B c8df087c7fe1e4af3a59f21763777d3f1318aebcd524e077b6a93c374e0910ff31b1e73b8b4908130d63c2bb7d060348602cffd215648f09afd8015c782e2340 SHA512 3c45d74e046e0fd09f152fcfa7af942c9097e3ed91a0915a2541caad14a8b94b9faceccdbc74bf8aa7c8f7b383db7e91e09babba9c2c28fd7855a7b809616839
diff --git a/dev-libs/boost/boost-1.86.0-r1.ebuild b/dev-libs/boost/boost-1.86.0-r1.ebuild
index 426a0b9095fa..0832d12b6146 100644
--- a/dev-libs/boost/boost-1.86.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.86.0-r1.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
 	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-build/b2-5.0.0"
+BDEPEND=">=dev-build/b2-5.1.0"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.81.0-disable_icu_rpath.patch
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index b241e0e863d5..e08a6e766ee1 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,11 +1,3 @@
-DIST expat-2.5.0.tar.xz 460560 BLAKE2B 670298d076ff3b512a0212170d40cb04c601a11d6b152f215a5302ad3238c69c2386393d7a6c70bc284be35ce97bf27d87115c3391f4bc17406e509d739d3e31 SHA512 2da73b991b7c0c54440485c787e5edeb3567230204e31b3cac1c3a6713ec6f9f1554d3afffc0f8336168dfd5df02db4a69bcf21b4d959723d14162d13ab87516
-DIST expat-2.6.0.tar.xz 483448 BLAKE2B 2f0117317bde4e03d8662bcac1ff6c2bbb1af694846b21a82ac12d11ccd43032b481af72fa35298c3cb19b7426dba6a67e703904ca7b05663ffd854a42348bd0 SHA512 d6f1c4a1a2ec8ffc04c04d6767cc8dd7dea3d132d10b8a2c45c5bfb405893c75db032b87a56cc88300b61c961dd7f9782b93aa74dddc7e66f25acb0c6c82b1fd
-DIST expat-2.6.1.tar.xz 484000 BLAKE2B 21a177ae8d70ca1bf41cae75c299a3021a9fc1b9d5eb01eb2945b16d7b24dcbeabad855379bdd8a14de804e1a1648105ce03b505f68c2beb4096a81020e35848 SHA512 fcd7e04e9411799c48b7d08ea07808a0809d034453a0649d9a79ed09000f1a11e5082a034089fc0c0acd2789e85bdf1deb2a94d8e3e33791bbfed66ce7207bcc
-DIST expat-2.6.2.tar.xz 485236 BLAKE2B aae019270e1ab233fe8480b7eaa77f648f23ef3383dc772dc946cb13163067431716dc5446862eb502315fd089f2f52f3d476589b74a97e462575cd54df44db4 SHA512 47b60967d6346d330dded87ea1a2957aa7d34dd825043386a89aa131054714f618ede57bfe97cf6caa40582a4bc67e198d2a915e7d8dbe8ee4f581857c2e3c2e
 DIST expat-2.6.3.tar.xz 485600 BLAKE2B b8e0a0e779f0f136eaca91115cbbcf5a5cca457cab1cca6f8d6141151d19f8ef2dccb41b0e9134459c1e7d99cb2e0b4ce3922d2bd9221002ec43fe9d53a0084a SHA512 e02c4ad88f9d539258aa1c1db71ded7770a8f12c77b5535e5b34f040ae5b1361ef23132f16d96bdb7c096a83acd637a7c907916bdfcc6d5cfb9e35d04020ca0b
-EBUILD expat-2.5.0.ebuild 2278 BLAKE2B b6eb3992e9c907d4ef66e0e486affb6603c7112b9f38cd29b5ac22b862d5d35bc93fa73216211039227215ad16cf515728a0a6bb98da8c3c1ff99721365f07be SHA512 37ea464d798aad70ae4ac07f08b50595a2952d5997c9a1a174999c306d467e7720f193659e85758d97fe7692b43343fef5bf09cc4340f60d04915fa90558123c
-EBUILD expat-2.6.0.ebuild 2286 BLAKE2B 7279043f174c3162ce41975be4a6841bef0427827100fd9c880bc91eb812119e6c0f8c5c8a046aafd9d97da3aa02a38ed0b8c0c24ac60bae86cee813dd1c7b28 SHA512 d43f00a26b04f777219f64bc53dc285e7b3fc0e13fb7fc10c7c066ccf252ce98d9bb5c7d82a9dca118791fe43088dab490cba9aa4426a57064d7cf7f8e3f507a
-EBUILD expat-2.6.1.ebuild 2378 BLAKE2B 7838e49c2561eec471f20bc85b9b38f6a8ffa2d5e8e02ad966e0603fd72176fa1c34a89614e9ed6e90d07ca4e292e7a39370617d7e9dab814498e046a0f3c99c SHA512 ef17fb5d4a0351a950f99cdc5b32007827d0f971885ef6fb53b5d0fdf24577ebebc85d919e7127e25dcf82439f12b71426c141ef4b67613dce2897d12adb5ccb
-EBUILD expat-2.6.2.ebuild 2378 BLAKE2B 7838e49c2561eec471f20bc85b9b38f6a8ffa2d5e8e02ad966e0603fd72176fa1c34a89614e9ed6e90d07ca4e292e7a39370617d7e9dab814498e046a0f3c99c SHA512 ef17fb5d4a0351a950f99cdc5b32007827d0f971885ef6fb53b5d0fdf24577ebebc85d919e7127e25dcf82439f12b71426c141ef4b67613dce2897d12adb5ccb
 EBUILD expat-2.6.3.ebuild 2293 BLAKE2B f3c776b179688b40656661ba65c409dda78b13583aede7148996eb7a11f9213c99bdbed077a221ffa21ba77d802b3e5f9c490cde3e8e17e70cfcbfae3afaa87d SHA512 49a64e8f1f90c9b327c6b0cba447349dcbc3e3290e610c036a9be7dae9f997c56a7739d5525dabebc56c756c4a178a1286bacc972963a8e24e881892450f8a9f
 MISC metadata.xml 571 BLAKE2B ebefe11eb4a54dda87048089930a051a629fd99a6983b3c804dfd033eee4017c3b1871cbdff56c8659cdf74b19651cd7f2134721a9bab3e8a752d4a1694c6266 SHA512 8d726b1dee71528e43c8693bd4b08cf33a94f43470126aa18a51ed248b032c5e8b9d801c5b2d5f58c2fd7896b32ee9e6eb3953395e5a6004cdf00569d114ad1d
diff --git a/dev-libs/expat/expat-2.5.0.ebuild b/dev-libs/expat/expat-2.5.0.ebuild
deleted file mode 100644
index 147a248aae0d..000000000000
--- a/dev-libs/expat/expat-2.5.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-AUTOTOOLS_AUTO_DEPEND=no
-AT_NOEAUTOHEADER=yes  # because expat_config.h.in would need post-processing
-inherit autotools multilib-minimal
-
-DESCRIPTION="Stream-oriented XML parser library"
-HOMEPAGE="https://libexpat.github.io/"
-SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples static-libs test unicode"
-RESTRICT="!test? ( test )"
-BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-
-	# fix interpreter to be a recent/good shell
-	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
-	if use unicode; then
-		cp -R "${S}" "${S}"w || die
-		pushd "${S}"w >/dev/null
-		find -name Makefile.am \
-			-exec sed \
-			-e 's,libexpat\.la,libexpatw.la,' \
-			-e 's,libexpat_la,libexpatw_la,' \
-			-i {} + || die
-		eautoreconf
-		popd >/dev/null
-	fi
-}
-
-multilib_src_configure() {
-	local myconf="$(use_with test tests) $(use_enable static-libs static) --without-docbook"
-
-	mkdir -p "${BUILD_DIR}"w || die
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
-		popd >/dev/null
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib install DESTDIR="${D}"
-		popd >/dev/null
-
-		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
-		cp expat.pc expatw.pc
-		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	doman doc/xmlwf.1
-
-	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
-	docinto html
-	dodoc doc/*.{css,html}
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-		docompress -x usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/expat/expat-2.6.0.ebuild b/dev-libs/expat/expat-2.6.0.ebuild
deleted file mode 100644
index 6831ba968e9d..000000000000
--- a/dev-libs/expat/expat-2.6.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-AUTOTOOLS_AUTO_DEPEND=no
-AT_NOEAUTOHEADER=yes  # because expat_config.h.in would need post-processing
-inherit autotools multilib-minimal
-
-DESCRIPTION="Stream-oriented XML parser library"
-HOMEPAGE="https://libexpat.github.io/"
-SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples static-libs test unicode"
-RESTRICT="!test? ( test )"
-BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-
-	# fix interpreter to be a recent/good shell
-	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
-	if use unicode; then
-		cp -R "${S}" "${S}"w || die
-		pushd "${S}"w >/dev/null
-		find -name Makefile.am \
-			-exec sed \
-			-e 's,libexpat\.la,libexpatw.la,' \
-			-e 's,libexpat_la,libexpatw_la,' \
-			-i {} + || die
-		eautoreconf
-		popd >/dev/null
-	fi
-}
-
-multilib_src_configure() {
-	local myconf="$(use_with test tests) $(use_enable static-libs static) --without-docbook"
-
-	mkdir -p "${BUILD_DIR}"w || die
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
-		popd >/dev/null
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib install DESTDIR="${D}"
-		popd >/dev/null
-
-		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
-		cp expat.pc expatw.pc
-		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	doman doc/xmlwf.1
-
-	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
-	docinto html
-	dodoc doc/*.{css,html}
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-		docompress -x usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/expat/expat-2.6.1.ebuild b/dev-libs/expat/expat-2.6.1.ebuild
deleted file mode 100644
index c156f565c7a4..000000000000
--- a/dev-libs/expat/expat-2.6.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-AUTOTOOLS_AUTO_DEPEND=no
-AT_NOEAUTOHEADER=yes  # because expat_config.h.in would need post-processing
-inherit autotools multilib-minimal
-
-DESCRIPTION="Stream-oriented XML parser library"
-HOMEPAGE="https://libexpat.github.io/"
-SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples static-libs test unicode"
-RESTRICT="!test? ( test )"
-BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
-
-DOCS=( README.md )
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# https://bugs.gentoo.org/906384
-	arc4random
-	arc4random_buf
-)
-
-src_prepare() {
-	default
-
-	# fix interpreter to be a recent/good shell
-	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
-	if use unicode; then
-		cp -R "${S}" "${S}"w || die
-		pushd "${S}"w >/dev/null
-		find -name Makefile.am \
-			-exec sed \
-			-e 's,libexpat\.la,libexpatw.la,' \
-			-e 's,libexpat_la,libexpatw_la,' \
-			-i {} + || die
-		eautoreconf
-		popd >/dev/null
-	fi
-}
-
-multilib_src_configure() {
-	local myconf="$(use_with test tests) $(use_enable static-libs static) --without-docbook"
-
-	mkdir -p "${BUILD_DIR}"w || die
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
-		popd >/dev/null
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib install DESTDIR="${D}"
-		popd >/dev/null
-
-		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
-		cp expat.pc expatw.pc
-		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	doman doc/xmlwf.1
-
-	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
-	docinto html
-	dodoc doc/*.{css,html}
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-		docompress -x usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/expat/expat-2.6.2.ebuild b/dev-libs/expat/expat-2.6.2.ebuild
deleted file mode 100644
index c156f565c7a4..000000000000
--- a/dev-libs/expat/expat-2.6.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-AUTOTOOLS_AUTO_DEPEND=no
-AT_NOEAUTOHEADER=yes  # because expat_config.h.in would need post-processing
-inherit autotools multilib-minimal
-
-DESCRIPTION="Stream-oriented XML parser library"
-HOMEPAGE="https://libexpat.github.io/"
-SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples static-libs test unicode"
-RESTRICT="!test? ( test )"
-BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
-
-DOCS=( README.md )
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# https://bugs.gentoo.org/906384
-	arc4random
-	arc4random_buf
-)
-
-src_prepare() {
-	default
-
-	# fix interpreter to be a recent/good shell
-	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
-	if use unicode; then
-		cp -R "${S}" "${S}"w || die
-		pushd "${S}"w >/dev/null
-		find -name Makefile.am \
-			-exec sed \
-			-e 's,libexpat\.la,libexpatw.la,' \
-			-e 's,libexpat_la,libexpatw_la,' \
-			-i {} + || die
-		eautoreconf
-		popd >/dev/null
-	fi
-}
-
-multilib_src_configure() {
-	local myconf="$(use_with test tests) $(use_enable static-libs static) --without-docbook"
-
-	mkdir -p "${BUILD_DIR}"w || die
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
-		popd >/dev/null
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib install DESTDIR="${D}"
-		popd >/dev/null
-
-		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
-		cp expat.pc expatw.pc
-		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	doman doc/xmlwf.1
-
-	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
-	docinto html
-	dodoc doc/*.{css,html}
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-		docompress -x usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 9377ad7ebbe6..1e2f3897456d 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,5 +1,5 @@
 DIST link-grammar-5.12.4.tar.gz 4720724 BLAKE2B 6573895298128165d7f840a13aad124418dbd1b9c70436dbe2bd65b3fd1883777e72da13f5196031696edb7cdc6c9d86acd5fdd4d1aa8fb295a136b2ba0568cf SHA512 fd5318c21202c17902de996882fd8630c7e95622b8ebe6877a334df22ff678a6040e0519bdabfa1138aaefdf3a7c20cbfe9e65bdce4dfe568729c9ba5a2d6fe5
 DIST link-grammar-5.12.5.tar.gz 4727809 BLAKE2B 76654a94bb1222761bc9107f2e129d6c7606e4cc0fa03b4564705714c8ac35f9562c28d66924b24143c8bbd6365f77714ad233f163f8f83de1da73ac66213f07 SHA512 2637d6b571ae027d8813da188a555a8b91afa0a216921842b43e4cf6aa4d799ea5342fe17081c13346c6bbecc46032765b6f5d978b53cee570e329b6b141094b
 EBUILD link-grammar-5.12.4.ebuild 2915 BLAKE2B 0672fe6886cb1f4aafa12899eaa81f7116aa2b9eff5a3a39f00956da5a90c1922355be6ccc27855b8a74272bd8eb7b4a9921516e5fbebddc2798895cfa46d3ae SHA512 c21bd19d17ef15f9f570023de11cf0a2c306440ae117d29e11dac5971404726099b965465453686ea504a421d01c69c208bfc7cfb618a7980d39e3f59037569d
-EBUILD link-grammar-5.12.5.ebuild 2927 BLAKE2B cbca568edeec27bc4cf65d06522cc781e4cfc4a0dc3d79ede23f4226387ca6839b705dcbbc09c15942686678db6a3e7e604474ca0cbf2488c0cdad1814bd12c0 SHA512 9924b9964186cc52120f7a011ca4cadbdf1a114bd8bce2164508de94fd5e8e8294fc847cd2e586b3f04ef2e9862448dc2a4cd942a55a5f51d02a298102e37763
+EBUILD link-grammar-5.12.5.ebuild 2925 BLAKE2B 888c796534bab3fd0843d4a7ae0fbebf909e77e878f7e8ddb8620d0f492214144f8fba09eaaceda46f0e1645c4fd77534bf307aaa74c34bad6e106ae06e5d268 SHA512 fc6f52926e7516e9c42102fb4c45ffdf9c6b6c1f37a9d9aa65546e27cf13b445c36e0abcdacdf912244e0e6f6e22a6ed5febaeabf2c34fb22214583724e21f16
 MISC metadata.xml 1197 BLAKE2B fac6dd40856d97100ee06cdcd340e660bb2ffe527df31983165beec9d194839336dfddb54be33561560ac2c79d8bad12809eef53abd4059b7c74b7494d728354 SHA512 dcb16b8afa977639e3fe8633762fc7a26d8ab095da15d630bedc6ba65e4c82ec5f0bedbd564b6ad0490790723c0a04065a5cab536aff93cdcf8eab5f1a2d503e
diff --git a/dev-libs/link-grammar/link-grammar-5.12.5.ebuild b/dev-libs/link-grammar/link-grammar-5.12.5.ebuild
index e70353727041..326a3d0b05e8 100644
--- a/dev-libs/link-grammar/link-grammar-5.12.5.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.12.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.gnucash.org/link-grammar/downloads/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="aspell +hunspell python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest
index f38b751781bc..c107902540cc 100644
--- a/dev-libs/log4cpp/Manifest
+++ b/dev-libs/log4cpp/Manifest
@@ -10,7 +10,6 @@ AUX log4cpp-1.1.4-fix-implicit-func-in-configure.patch 801 BLAKE2B e3613e90707bb
 AUX log4cpp-1.1.4-gcc43.patch 578 BLAKE2B d585766584cb688dffa0016d1afd1d236554223f6abceffc2da5aa361944b77d10005f3d2b792bbb51c06340debb721338570d8822a478f2688f76bc49348860 SHA512 85d15e1ccf6ff50bed0aa95ba501273a88350b24702b1fa3f6d3d34d96ec14db87a78823d748f4d8fd94dcc7fa413814cb143a67cb5ce5b7f6c3c717eaaa1602
 DIST log4cpp-1.1.3.tar.gz 595639 BLAKE2B fc7d643aa70d739e38ec5aba127b4e760a47a064f4032690586c4698ec83a2b7f219d8476650d3bfc5e25563de0852869429ec45171233c6bd5c08b69476b169 SHA512 88e5e10bce8d7d6421c3dcf14aa25385159c4ae52becdc1f3666ab86e1ad3f633786d82afe398c517d4faaa57b3e7b7c0b524361d81c6b9040dbded5cecc19de
 DIST log4cpp-1.1.4.tar.gz 637440 BLAKE2B fe7d3cf5ea8ff8f9bdd86691195c02473bd21a90ebfe2d9cd7a32c2fa30e17b5a104c6181601cf2dce19b703496bb6038e7b0a782a24dfd55415ecd462e49841 SHA512 0cdbd46ccd048d70bea3c35d22080dc5dd21fc3b9c415fe464847e60775954f57e9c8344506f0f94f16e90e8bdaa9cc6d84d3aa65191501e52ee8dfc639f0398
-EBUILD log4cpp-1.1.3-r2.ebuild 1347 BLAKE2B 274afdf4ef609056c6a3ce98f416413ffd946535462bd0918df08750ca05bdc5879b78a2abcd1b246fabb5381ac214fdcc830bf6f00b4dd0f002a378f46d2f37 SHA512 8ceffd8edad56384d35f90a18e11817dc3949612750037d4dd07b94f9358a91cd426881da5038637d617251cee199d12eb0cfa5e9efd07fde408c1c90af7ec17
 EBUILD log4cpp-1.1.3-r3.ebuild 1489 BLAKE2B 1a087f69c2f4fd938f317656f5362b710472d1e9bb3e9ad0f6567f03c6f529e8559064bbee5b04dbc92f78764ce5f18914e05a19561d0aaeda12a95eea6538e4 SHA512 501a134cd3db6123ea9f3af0c32176dcddef36e907bf2fca751ee84930a2ede72f554bd87e0726187e8dcc108a3b7cb35a15ba82f1753cab8687064a26a85b5e
 EBUILD log4cpp-1.1.4.ebuild 1458 BLAKE2B a0639104d3c2ad0eb2b9f746b4b6d65334ae707570558567beef2f92fe5ab40d0d3c5e0e8be502810a4012bc747ec0d6d2bd07907103c8a6c429b9408970063c SHA512 278b054491ec5fb5f8e2fd2b6bbb6b312f118500eb2014087ff9ca53d55975b304a1f210cec1fc899bb5155098ddb8f48452d2be81d270c43f9a6f3d638806c2
 MISC metadata.xml 245 BLAKE2B fc64c325a442c85782c437edf7e7835b640d7d42d6161da3d4e803c0e81c7e1df99baa33c812e6da007a7286084aa97678109e21c72f684a4b7ab5903f1d281a SHA512 8ae4a6eeb33b2013ef7200430fbd5e9e24c72b8c1f02a7b36d7c62a122c5a10a184e4b86645f1e5ad3ee0b384fd786b2d7d063cdd1befb911f6d4bad7506862a
diff --git a/dev-libs/log4cpp/log4cpp-1.1.3-r2.ebuild b/dev-libs/log4cpp/log4cpp-1.1.3-r2.ebuild
deleted file mode 100644
index e73fe69e5d42..000000000000
--- a/dev-libs/log4cpp/log4cpp-1.1.3-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations"
-HOMEPAGE="http://log4cpp.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/5"
-KEYWORDS="amd64 ~arm ppc ~riscv ~s390 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? ( app-text/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/1.0-doc_install_path.patch
-	"${FILESDIR}"/1.0-gcc43.patch
-	"${FILESDIR}"/1.0-asneeded.patch
-	"${FILESDIR}"/${PN}-1.1-cmath-fix.patch
-	"${FILESDIR}"/${PN}-1.1-automake-1.13.patch
-	"${FILESDIR}"/${PN}-1.1-glibc-2.31.patch
-	"${FILESDIR}"/${PN}-1.1.3-fix-version.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.{in,ac} || die
-
-	# Build tests conditionally
-	if ! use test; then
-		sed -i -e '/^SUBDIRS/s/ tests//' Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	# Bashisms call configure tests to malfunction / config.h to be misgenerated
-	# which then causes a build failure later on in the package (w/ GCC 12,
-	# anyway).
-	CONFIG_SHELL="${BROOT}"/bin/bash econf \
-		--without-idsa \
-		$(use_enable doc doxygen)
-}
-
-src_install() {
-	default
-
-	# Package installs .pc files
-	find "${ED}" -name '*.la' -delete || die
-}