gentoo auto-resync : 29:08:2022 - 22:47:16

20 files changed, 36 insertions, 506 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 9140fea49861..b922f155e9ef 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 11a27ee09e7c..651fb091e988 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -2,6 +2,6 @@ AUX ell-0.51-musl-build-time.patch 1449 BLAKE2B 7012ac17e87b9e2cb1a4a16b723bc7b7
 DIST ell-0.51.tar.xz 544744 BLAKE2B ae9cd3bc2d892109f5ae1a602f0f711b350ceb10ce2a7fcced5ce4bca63986a69c350013fc08eed29c9c626cc892b70ba997dda321d7c6c089d465850fabd5e1 SHA512 c2fd2ea9858542e23d46eba96045e1c924531b6a436401e86d838ffee39d0062923861c2898dae76ec9bfb325327c97b13799d81a2324982928b07b1fb898595
 DIST ell-0.52.tar.xz 548816 BLAKE2B 9c2ac4128fe770c1d1a1532fca8a5e36fcb620b9908177acb4fa8f35cea733374199fbe55ae78aac25ff5e37ee71044b6296a38fbbf7ff23fa867e2a338b8287 SHA512 e3cad20e42b71a7c1aae2c8bebe025f7a2bd0e594738aba96ffe8b316e216eb57dc86a5f0b0837d8141b16cae4f150c7b472c60d455feec5d7eb340b960c26d4
 EBUILD ell-0.51.ebuild 1331 BLAKE2B 7d6a254dbf13ae781be3f9f4e4240590cac8f9bc36267bb84f5fda9d7035b01007bc4106d04537daa5fd2828cda7f1343a5f3ccc8258349c01cbdc41344981cf SHA512 287bfa2f891a9097fb7fbf11c96037fa7f875afe1a268863a8a21d77d0c0bcdfb8a7a83044c010a5fa767cd1bf21b7187e8ead14719428db074c8588b1c24cf8
-EBUILD ell-0.52.ebuild 1289 BLAKE2B 16b3d08369263e8288eaf8ef065b01063a6d08af14a702936d50162af903516657b055692e121e2e98942c7a02cee78ca5275e4d0c1e4a08aa9568564388fcc7 SHA512 40793f63accc3c91da83fef2c6a8ab51e874d244696560a142de8ceb62a813a38411d7a1d266017107b1253137592b0a379906ed6b3ef7f79c09f8d89f698f24
+EBUILD ell-0.52.ebuild 1287 BLAKE2B 8606be8e360b93d0350a1206269a87f95354b89bded541bb9ab9c6054dcf8e6be80a52e2668704a3261a8e9e7bb5c189f91f7977d91366aab3f86c99f876dca7 SHA512 0891526138e93592c6ec8262113c9c88390627f919ebc684a902554ebc789ffdfd75af845c69ffeebe71886a498b1905dc196739e10ce492afe599bedecc41bd
 EBUILD ell-9999.ebuild 1175 BLAKE2B c91500654e555bb6023ac37c0715d240e93d57d5f1e48f1c3a3b6083360a8a2eadcb37a8750730905b9a73abfd0d9e42e55928d884801711ca65ca947629e6a3 SHA512 a402b13afb81a1cb481464581c2210961a5ecb239ac68a638c0f3e117c1e1490cc4ae17c939d25995b1e647104a9713ed628fee4eeb9c396ddbb9dd9e86f6b8b
 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f
diff --git a/dev-libs/ell/ell-0.52.ebuild b/dev-libs/ell/ell-0.52.ebuild
index 15a2056985b4..7a75ce103f17 100644
--- a/dev-libs/ell/ell-0.52.ebuild
+++ b/dev-libs/ell/ell-0.52.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/ffcall/Manifest b/dev-libs/ffcall/Manifest
index 3fa5d4d466ac..1cccb046252d 100644
--- a/dev-libs/ffcall/Manifest
+++ b/dev-libs/ffcall/Manifest
@@ -1,8 +1,6 @@
 AUX ffcall-2.4-slibtool.patch 5050 BLAKE2B 45db7c7c1dcbbcad4860e99806cc4e2a260877df5d122872964f94c968ea63b231e2f44426d9b0836fe9eccc8e9056ced77eaae9b38ad6f5248d1ce5a808c2d1 SHA512 36df8951ff2f33b06bcf479cf6e5e7b445dae613551f02f4d8af9792781baad60ab48de290068487b265185361a9615b0eeccbb636eedb6c5ffa54bd1b85ee78
 AUX ffcall-2.4-vacall-riscv-pic.patch 16090 BLAKE2B db91cee446d8542d48b7bc33cc134e572cb4d4901bb756ba7d4541ddfdb76fec829e1626d2cfab6d79f6d4d5ca5488e87a3e9b08dda4a99250bdb55ca598ebe7 SHA512 360c6abae6c617bad70d68800065980ca06bc68eb855f6d4c976d11ca7d3f22a12eaa9dd6c00c6ee4596748984011827ba0bb6ed4614c338ca8ea72d283a17ef
-DIST libffcall-2.1.tar.gz 943235 BLAKE2B ae82663174db084e830b6ff77ceedf8641b3edeb7800952ac4e2772d9033da3e45f46159e6fdae86615dc69fceba39f48d6c75e6cbd41be98f1986fa69d50b3b SHA512 da73375fb45b7d764c06437a517c2a90abf7d5de6afe0a8ca19e6dfafd2a8c7107e39d230ecbc8edfdd5926b16a0c13b7bb9319287047c47de1241b2f6ae805e
 DIST libffcall-2.4.tar.gz 1253767 BLAKE2B 669bf556f082b533eb7d71ebc6fadeac464b1a6054ac8078c9315678929bcfb8ad4b7376b345bcfbb5d2caf9d45179012d4bb5a08ad675f475f58570ae96b7ae SHA512 c9451662764a888e3be21499c29673bfb0e1df4915814da3506db5d395a2b00ea2f0c08d1c9dffebf030179f9347794876ec6ec9e6710b4fc70fd760960335e6
-EBUILD ffcall-2.1.ebuild 1465 BLAKE2B 94c45c5e0c32ef02e7eeb1922466dabb4c5ad239e992403796e84a803fb2901384da0b029af539b8d71d960e207530de48bc49a72ecdd7143721d0982af76e13 SHA512 4b4fd2c30aaa9e7039e3797df97ad9947f960ba22d65fc5ae1a8d6c57c1cf6ad04ea6726249d3e2fcb34940ebf30b2c15f270f19b79dea9dd2e8b0fabdce062c
 EBUILD ffcall-2.4-r1.ebuild 1648 BLAKE2B 63bc28b5cefed8c1eaba88e5af218cda15376e2d424cd975190179791f079574a1fec592b14317d08415fbb14b70fa2a3ea3e74d6c62fdb8b0c7359069e3b6ed SHA512 d0bdc6147c06256933903ce0865094fed2c893c72faa13b858dfb2685f98ea04c3940263ab3a5ba501f9a3ff20822bcc908e1c3a652e66daad5ba9b4b83daa8e
 EBUILD ffcall-2.4.ebuild 1594 BLAKE2B d5698aba91126067627ddb9a88f525e248bffecc7ef49288f8dff1f7c32746a4dd0d9f421bac6ede0f5d0130434a69771e7c38ef457eab46911361b374025e90 SHA512 27ff8105f30e2c1f3fe76e2c125cfb1b25870bb18471bacc642ca203ee6059f10f3292e2ed4f06ac40e128cbbe1619d3fc7e1985059d56d5d844da684c62b6dd
 MISC metadata.xml 859 BLAKE2B a3c2244f2545985f3000c06357c8494bda02e082d089a1b44793a944bdd2592eac8b6e567be29943d07a0eb2930dfda1eb20695f213ec469a1457fd3f8d4360f SHA512 49e8a58e4839ee6d15de7165fede7f8b5f1f200731f8d3a0c4ceee97b8ff1c6e03550ca6be6531d928d43000ec7ded5922f85ef8e3a97d1853be94c9c3d3afe0
diff --git a/dev-libs/ffcall/ffcall-2.1.ebuild b/dev-libs/ffcall/ffcall-2.1.ebuild
deleted file mode 100644
index d7fb5928fbfe..000000000000
--- a/dev-libs/ffcall/ffcall-2.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-MY_PV="libffcall-${PV}"
-
-DESCRIPTION="Build foreign function call interfaces in embedded interpreter"
-HOMEPAGE="https://www.gnu.org/software/libffcall/"
-SRC_URI="mirror://gnu/libffcall/${MY_PV}.tar.gz"
-
-# "Ffcall is under GNU GPL. As a special exception, if used in GNUstep
-# or in derivate works of GNUstep, the included parts of ffcall are
-# under GNU LGPL." -ffcall author
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-
-S="${WORKDIR}"/${MY_PV}
-
-src_prepare() {
-	# The build system is a strange mix of autogenerated
-	# files and manual tweaks on top. Uses $CFLAGS / $LDFLAGS randomly.
-	# We are adding them consistently here and a bit over the top:
-	# bugs: #334581
-
-	for mfi in {,*/,*/*/,}Makefile.in
-	do
-		einfo "Patching '${mfi}'"
-		# usually uses only assembler here, but -march=
-		# and -Wa, are a must to pass here.
-		sed -e 's/$(CC) /&$(CFLAGS) /g' \
-			-i "${mfi}" || die
-	done
-	eapply_user
-}
-
-src_configure() {
-	append-flags -fPIC
-
-	# Doc goes in datadir
-	econf \
-		--datadir="${EPREFIX}"/usr/share/doc/${PF} \
-		--enable-shared \
-		--disable-static
-}
-
-src_compile() {
-	# TODO. Remove -j1
-	emake -j1
-}
-
-src_install() {
-	dodoc NEWS README
-	dodir /usr/share/man
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/judy/Manifest b/dev-libs/judy/Manifest
index 4ffa447e10a7..e3466ed2f32a 100644
--- a/dev-libs/judy/Manifest
+++ b/dev-libs/judy/Manifest
@@ -1,6 +1,5 @@
 AUX judy-1.0.5-gcc49.patch 3112 BLAKE2B 36550790454e36ddb1c13a3e2addce7aafe126d87f3ca39240460d84033123a518bf0b8162be8226bfeea43c08cf810b3ac2219909ff505903d54ebae42c74ee SHA512 191f64d44d444ee238b8cfe589fcd25471c82978f6a5e34736b7a9631dd72e06542c8f748ce2c2cd434ea40793ac5b9f95a32e95c5559fbbc9aee3f2dc2e7aec
 AUX judy-1.0.5-parallel-make.patch 6736 BLAKE2B 4ba894f81e98a02a83700a061c9fa1f4670ad0b880635fb7812f5a109c14b518598f65c3221cec35bbe1f148b2ab3bf48142734bc74baa15e86604cd6b75f985 SHA512 80f5f361f4cc9f8d5e433ac40f3f4371186025d4fd33b15ae5e80db9d80460c4db94bd6e24d83cfaeebb82328a762d5560464112c7d3f80c5601a7a98f6c5765
 DIST Judy-1.0.5.tar.gz 1147847 BLAKE2B f5f31af2b7d1db5524ff035e9f9b733a4c5c23de76cd4c55bcdc59f7474ee02d7c7ec9341f087736ff6e39a139d20d9ab8298397aaf17f7d48a851037b8677c5 SHA512 1a0d59b092c80d95270a3089cd25ee0ddad1d591101b03784e2e46dfc73bce445a7fb495b449043544a366c09b35b833556053bf3bf65dd00abbd786d26c6980
-EBUILD judy-1.0.5-r2.ebuild 872 BLAKE2B e06791a078ffea4e1fa25e3227bccaa09122c42ef84cdb1746f80abbd532f1bdae86f0491d532d91ef0280cd77d5c19d96faf58759b8535981692eb00dbf810a SHA512 5f042295feac44af7fd58445b77f6f22e2e2a5c3c60944d5dd8dc2d212db5cf992d18219cf18f1d032191679ab466bf9b61cfc631e1942535233c6dc7812c52a
-EBUILD judy-1.0.5-r3.ebuild 880 BLAKE2B 56b07fb8c2922c2df2e6d5b7221950d7733b50c4e7012a24f2b3c9d2ad355e9fbc9ac9f01ca100d8f2bf4c5f8a19198bfd2dcaa315948a6972ad6168290356d0 SHA512 64f191fb61e0399a3ae568206deffea4f7e17c5d4fbc8ac550eecb782a4011fc5d969a96f21a194c32a8824ead3bd9fb2e5c959eccbcfa243079c89ff02d4830
+EBUILD judy-1.0.5-r3.ebuild 879 BLAKE2B 852ce789874dc9e831be848a3c7c143bee7c9afc28331397795ccd94863476d4ca8948737ba89938614ee540303419ce01dc4e0737ab8202b838aefa2a0e07ae SHA512 ad95a36cafff1c7da107b3094a877404866f6e53e52d4293f109d2a5e6e6c69a2bda7ac08c670ece9e89c1e82fff3bd56b93088ba1024048e3790c4f7923dfb4
 MISC metadata.xml 321 BLAKE2B 6d6ab94e382db122f3ad8e94e456763f32616c09b1c0bc339b1115f0c7e90c43056fdc48b192f2d1b66e4df563b3b15eab4b76a19498d6ee70b718ba0d5edf3b SHA512 1ec5626e3a8ff786a4d192738e918859f670cf69d432e1769214cb0e5cd69741a4b54ca4ae2ede93fdc69b6a864ed897f0328f193829096dc7664e2bb0285189
diff --git a/dev-libs/judy/judy-1.0.5-r2.ebuild b/dev-libs/judy/judy-1.0.5-r2.ebuild
deleted file mode 100644
index 09e76a1992a8..000000000000
--- a/dev-libs/judy/judy-1.0.5-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A C library that implements a dynamic array"
-HOMEPAGE="http://judy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/judy/Judy-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="static-libs"
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${P}-parallel-make.patch"
-	eapply "${FILESDIR}/${P}-gcc49.patch"
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-	eapply_user
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${BUILD_DIR} econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/judy/judy-1.0.5-r3.ebuild b/dev-libs/judy/judy-1.0.5-r3.ebuild
index 64ccddafbdd4..7be4cdf3b359 100644
--- a/dev-libs/judy/judy-1.0.5-r3.ebuild
+++ b/dev-libs/judy/judy-1.0.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/judy/Judy-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs"
 DOCS=( AUTHORS ChangeLog README )
 
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index ff1d872f12eb..dc4c4529275f 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -2,5 +2,5 @@ AUX libdbusmenu-16.04.0-configure-fix.patch 1268 BLAKE2B 9b7c045b46b9b8ad6af069d
 AUX libdbusmenu-16.04.0-werror.patch 1131 BLAKE2B 0f08e797095a8f9358abe1784b64f8f4126f6ba6c271991a4cf95781485e6ddda30cc98db8c50c7f3cae61f398cec6d236fbccc7063073f041337832fa132536 SHA512 ba1144695110cd8ecf89deaea28e0aacc40b00a500a1dc86c28e67754599117e0a2217c4d6066c1061fa009af82e463dd303ba78c479053857ef6e793959068e
 DIST libdbusmenu-16.04.0.tar.gz 760376 BLAKE2B 6996ce09bc2b81a8f415a46490ecb3189a064a64f1716919bb1495dccefa220ab058af06f4b3391c954ec76ec38e62db9c092b620cb69cacffb064e590ec1297 SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241
 EBUILD libdbusmenu-16.04.0-r1.ebuild 3881 BLAKE2B a98ac44ba760b367bfb0473ece2d77419d6ba659700e412a8b6a6d335e7cb9d3e680a496621c2ac2ff0df2cb4d90345484a17b3f81feba56a549db6e3a1cc9a3 SHA512 23ff195bf5c1eb0e37f7dc7de5adf6e242b287c843d192544fca5234978c093bfea4a5159dd0dfe1db34d9c0aa91f86375e18baea1b9254a2d1678c677dd4e39
-EBUILD libdbusmenu-16.04.0-r2.ebuild 3863 BLAKE2B fe8da60412d4416e9c115dc124db70d34d790f985c88ec8a90dca96aa01819be31742abcb3a20483fdefad314e87c0d42f255e44f8628fbb7d3702d90c87f1b8 SHA512 cce543b8ad6182e67b6033cd64ccb09babdf3657552b38a3ccff1913afd1734615885768d4116ee163d896efc52e394519a0334c24dc9a890a45fb37e1aa6a7a
+EBUILD libdbusmenu-16.04.0-r2.ebuild 3861 BLAKE2B 29473238e37be9625b16ea2e343e0a6febc5290c813790fa0e960ede6c0937dcf1b185f17e9ed73b590def7f90e10c0d7f7ff502f3ec3f35388f0668c200bad7 SHA512 19a384132b510e15a3e665d5fe77c6362c96935bee47c54597b23a62cca72e2708ab1376a7f62d050057a9dcd2a5a85f4f3666bb0b47c26bf999f950490a83f2
 MISC metadata.xml 362 BLAKE2B 30fac8611210ba6263d5a91f9975741f1c799d5b841d278ccdf440e67f7dc3040f9937a79bbf6028b1ff6d1f2389eea6746e0772048b7c9b71978cc75fbac20f SHA512 80dff178352278089470bd2465f750e336056cba3321719b18dce1188c5dfde302c6bc0efcaa84fcc049840616a9949fd1a39e143ca2c61e7a8eaeb317b74c4d
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild
index 3cc0f3b85dec..ca19cfd70185 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86"
 IUSE="debug gtk gtk3 +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index c9acf9efea20..184502ef9e5a 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,12 +1,10 @@
-DIST libxml2-2.10.0.tar.xz 2698684 BLAKE2B 655b9241db06b98f5d33f6d02f2dbf5f998ae9a125f2c16e4d8ce3ee902d53ec14e728e7f3de2aea47b45e825b9ed78f17caffd9e4e9afbde40e1d7b1e047e7f SHA512 0a7a58414c3a4f21e9b052cc18f18032bc646f2690483bb95e37e132a3fc5789f0ec7bbc91b58497df59dbccf0e52f6e6280947762f47a035e85a316e96b1623
-DIST libxml2-2.10.1.tar.xz 2697480 BLAKE2B a6297058b9a4f351dbf078a4cbcee2be0a30d3cae10fad53e8972b8ddff833b1612a25af8784be547aa6a3e7bafa126a3a23e5a7b3b75d17d4484af668eba4d0 SHA512 7ae653eef725706c825a8755da14a92124c3f85b38f81fd1148c6e373b149d095eae935a47d874d210dafc7e76f09c019866657b8f9d6a44c666ce741e12f3ce
+DIST libxml2-2.10.2.tar.xz 2636304 BLAKE2B 3ccc11ac73a81ee7ea3e565597c95e74923eba3d858c9a915aecf1dcf2fb6ab3e46c6ed2ea504261a822de2ac2132834ffa8ffd039e9e1390a9637a2dac7d6c5 SHA512 c26ee428ae2fae2326fcaec156ed36c5f5d63aeb4839d626f6544a3fad158a1602e9dc0d542b2f947e6a8de0c09ff130da2626a30aec27446ce09614f78466b5
 DIST libxml2-2.9.14-patches-r0.tar.bz2 8304 BLAKE2B 067faba5bfcbf81e2ef356925c0d3b4ef0aff7604db049366180b8217b781c60c2746be348c5e1a09de925e54fc69e3e431f7e2199ce326b6ff88ea9352ca45c SHA512 e97bada92a14ef0501a5f7be312d35d26eb52b648102d028dc11b3eef62ee0597540d0b474f54bd015a914a9cb7600d4dc34912b0ead5230136e945d80ae8428
 DIST libxml2-2.9.14.tar.xz 3129968 BLAKE2B ab584503d5209e4aaf41ae6f44aed5e94c0ae29e28cfba39a9012568aa97515af861b47891b84d2a352a07357626ba50ddb1e344e911fa14ff2ce93c5beff1f1 SHA512 d08e6cafb289c499fdc5b3a12181e032a34f7a249bc66758859f964d3e71e19fd69be79921e1a9d8ab1e692d15b13f5fae95eeb10c3236974d89e218f5107606
 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.0-r1.ebuild 5286 BLAKE2B 930f69b4d1d3b42aa3dd876667cad120fc9ab0242f51bcb891b81ec6f4a1a8184d08a46cc0325ef3c91da96b379a689b5137d56177cae93dab29c0964d3127a6 SHA512 305f321ea2a811fef7ab41746a31f16a83d0f7d04caff96c45cd8887921b3e28dedaebf42d60c165a6a43c0192518abacefab3a8a9defb8b56a7019806cf07c7
-EBUILD libxml2-2.10.1.ebuild 5286 BLAKE2B 930f69b4d1d3b42aa3dd876667cad120fc9ab0242f51bcb891b81ec6f4a1a8184d08a46cc0325ef3c91da96b379a689b5137d56177cae93dab29c0964d3127a6 SHA512 305f321ea2a811fef7ab41746a31f16a83d0f7d04caff96c45cd8887921b3e28dedaebf42d60c165a6a43c0192518abacefab3a8a9defb8b56a7019806cf07c7
+EBUILD libxml2-2.10.2.ebuild 5343 BLAKE2B 64d792ad51b340afdba62613c4e565ac6c8b2557dc16a0843df4bef23573d28c4ea41e212c72dbaebac82ed2b3bc494689f98800c6e56e949b5f436c51924193 SHA512 b4ea90b16cdd78a46ba4f1591416c7ddd100cd97d2e4f2a0296812581a38db33de922c7a9793bfb81ad286830b416dcb071dc216826fa1b375e102cbe0fa6760
 EBUILD libxml2-2.9.14-r1.ebuild 5029 BLAKE2B 74875e62eede1a5dcacecbd383cc33cf95ef21f49998b88ee88166ddf659f1241840a44412118a3a2a59af6d1438c74e10beadf709ee8da8b826ca1d60e553f1 SHA512 61eac30dfcafe2daf7aa36c85d2c6803e9f44514138d087954ccd626a390056e8018c578880506f171bd4d6865ae22bcf492d5f01acd87ab77d992636cbd9827
-EBUILD libxml2-9999.ebuild 5103 BLAKE2B 21aeab864b6e7c6064b4bd3239cb670bc31cde0f7a82bb742f1e18ec5624c9978c695edf5d209e1da3649d13c7f91b9ccc46f80576be796ac362480be1e3d5f9 SHA512 03afbbad22aae89592859dd3cd3d01268511e1de7a7e700746c2ffce927a6b2c478c94ee77b618921a24f0c957938f861309e8d0d4b3d9fe9a0dd0ca62f6445b
+EBUILD libxml2-9999.ebuild 5343 BLAKE2B 64d792ad51b340afdba62613c4e565ac6c8b2557dc16a0843df4bef23573d28c4ea41e212c72dbaebac82ed2b3bc494689f98800c6e56e949b5f436c51924193 SHA512 b4ea90b16cdd78a46ba4f1591416c7ddd100cd97d2e4f2a0296812581a38db33de922c7a9793bfb81ad286830b416dcb071dc216826fa1b375e102cbe0fa6760
 MISC metadata.xml 458 BLAKE2B 318644d7202e85490c0b2f7a6fd36744cce5e4fa8929534149823d679a7fd01d118b9653ea5039c9e82b7cdcd423bf4541313cf550027ccfab8393f0b9b8ceca SHA512 b173246c3ec8351343bbe16f5572728ce6c6740056a0cf96e9eb4d975c181d54213d06c41ada9c38ac11727359d14d453cd1e824b29a52f7291a7ee50bfa5ed0
diff --git a/dev-libs/libxml2/libxml2-2.10.1.ebuild b/dev-libs/libxml2/libxml2-2.10.1.ebuild
deleted file mode 100644
index 713da438e12c..000000000000
--- a/dev-libs/libxml2/libxml2-2.10.1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2022 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_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit autotools 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 git-r3 #autotools
-else
-	inherit gnome.org #libtool
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-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
-)
-
-DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO )
-
-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
-
-		# Temporarily for Python 3.10 fix (version used for
-		# dist tarballs fails w/ "3.1" error)
-		# See https://gitlab.gnome.org/GNOME/libxml2/-/issues/392.
-		eautoreconf
-	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
-}
-
-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-2.10.0-r1.ebuild b/dev-libs/libxml2/libxml2-2.10.2.ebuild
index 713da438e12c..b8f7fa168857 100644
--- a/dev-libs/libxml2/libxml2-2.10.0-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.10.2.ebuild
@@ -7,7 +7,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
-inherit autotools flag-o-matic python-r1 multilib-minimal
+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"
@@ -20,9 +20,9 @@ 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 git-r3 #autotools
+	inherit autotools git-r3
 else
-	inherit gnome.org #libtool
+	inherit gnome.org libtool
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
@@ -92,12 +92,7 @@ src_prepare() {
 	else
 		# Please do not remove, as else we get references to PORTAGE_TMPDIR
 		# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-		#elibtoolize
-
-		# Temporarily for Python 3.10 fix (version used for
-		# dist tarballs fails w/ "3.1" error)
-		# See https://gitlab.gnome.org/GNOME/libxml2/-/issues/392.
-		eautoreconf
+		elibtoolize
 	fi
 }
 
@@ -159,6 +154,10 @@ multilib_src_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() {
diff --git a/dev-libs/libxml2/libxml2-9999.ebuild b/dev-libs/libxml2/libxml2-9999.ebuild
index 1c24959ee8b4..b8f7fa168857 100644
--- a/dev-libs/libxml2/libxml2-9999.ebuild
+++ b/dev-libs/libxml2/libxml2-9999.ebuild
@@ -154,6 +154,10 @@ multilib_src_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() {
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index a95dc8f577e5..31cfb09317dd 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,6 +1,6 @@
 DIST libxslt-1.1.35.tar.xz 1827548 BLAKE2B 9667a93e61f50098a512c1351bce2ee937fc5d29488d010b525122d28ffedc73e0930402f3df2d378161a031dc016a15f0f03bdc343f0c4aa5d0b5c454f8002d SHA512 9dd4a699235f50ae9b75b25137e387471635b4b2da0a4e4380879cd49f1513470fcfbfd775269b066eac513a1ffa6860c77ec42747168e2348248f09f60c8c96
-DIST libxslt-1.1.36.tar.xz 1591356 BLAKE2B 7cdb38b52295477dcf4c9fdecfb64bc8e770b37787b3f4522d6156838725f4ee506b6d58ec18d17adeb22c78aa62d0685e77ad23e72901d1083de4efef1ae0df SHA512 8a524d32fca18e8b108c1b300d1381c01a71a87dc72a09bc13613772c2836b1350d8caa0625782c6cadf953f7a15ce805718a754cef894ee77b20442fc10f5c8
+DIST libxslt-1.1.37.tar.xz 1588572 BLAKE2B 096d93dd7178bf4483207514b1435f5bf426eea4952ffab7cc00c3e85aa736534c4acb5377af9647aa77a0cd793205194509d997a7bb5cae692f65e326566cd8 SHA512 a4e477d2bb918b7d01945e2c7491c3a4aae799dc1602bbd13de55c8a5052e210a20bc45115347eae44473c8b1d03dbc5e4a2aa18c2218f1fdfd376d87cd501ca
 EBUILD libxslt-1.1.35.ebuild 1913 BLAKE2B 6c68990defa39e6d04fc70b4a2f4f3d1e1e27a109f04fefa85c0973aa8f9bd4680311fb25c8878cd65b29afc51bb7f4c7cc8a294b17f8a0f7a1cb77307ccc184 SHA512 9975052b66a9d23e5e0ce4c5df5647a4a43ebf9509dfae2cb90968fead499b2e7f83e0e74eb7ef51b969c0c0b7c89d97a1d1e62aa32b2b1eab6c724806498d01
-EBUILD libxslt-1.1.36.ebuild 2936 BLAKE2B d725f63af0542cbef7e1d1806a3b46040b7ebfa884f61337df0b1b26a3e0fddbd965fb96788a2317cd2775fdcf4c7eb1cefd61da1ed4ee40b35acbb030ca0e33 SHA512 6d97110b767322df85985dd037fb495d44b235a514bf6ff780eb4bf9642bc74b24cfa613f8b654b1fd093ccde9ca02b524638a5aac9d11ff6a51cc0d8b68a5b1
-EBUILD libxslt-9999.ebuild 2774 BLAKE2B 9ad743eeb27ad818fb0ccbc2198b88855d4f35348386b99606ca2b7e4f66501b1a15072a1a9c759777ff0d9e00b8d24a4dc081851bd9202767c0357894aa6518 SHA512 2f9055e43050325543460580137da2d85cd8b188c80f2aa5bd5096a5900f13c6fbdf0c6029cc99527dc9e7a81bc5abbce1e33a5ffb447f290e838402c436fb0c
+EBUILD libxslt-1.1.37.ebuild 2977 BLAKE2B 137a6782d1b9349c024444b9bdb8ab5e5d0e83347873766dbe783045b3c1e28992947f4506fbb46b02b72512a9fe4e9cd07d0dae0ad284ea256194dcda76d954 SHA512 f4764e3307ca818419faa3457c4bb7a274eaf3fce27ba780638016f7d3b60a453d61a59a778813493954adef6d0cbff5c68d503abcc0d9cb4ed9549d9f0ffe64
+EBUILD libxslt-9999.ebuild 2977 BLAKE2B 137a6782d1b9349c024444b9bdb8ab5e5d0e83347873766dbe783045b3c1e28992947f4506fbb46b02b72512a9fe4e9cd07d0dae0ad284ea256194dcda76d954 SHA512 f4764e3307ca818419faa3457c4bb7a274eaf3fce27ba780638016f7d3b60a453d61a59a778813493954adef6d0cbff5c68d503abcc0d9cb4ed9549d9f0ffe64
 MISC metadata.xml 458 BLAKE2B 75fd3316bf24367ed9748bf7fefd6ebc36811d1cef9606b9fd68155ef7412d192ebc3cc883a79f15210decb7ef7707ff82155ec2f04974c2dca84496660519a8 SHA512 9baf1253900f23539a78ef57cc03cca552eadeb92721517e2f3f54c3df72be8d364b30449ad433793c38a2c1872273231f0b3fe865b2ace2e605a1ae290c4f6b
diff --git a/dev-libs/libxslt/libxslt-1.1.36.ebuild b/dev-libs/libxslt/libxslt-1.1.37.ebuild
index 6f198ac22606..a4fddfe4f2e6 100644
--- a/dev-libs/libxslt/libxslt-1.1.36.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.37.ebuild
@@ -6,15 +6,15 @@ EAPI=8
 # Note: Please bump this in sync with dev-libs/libxml2.
 
 PYTHON_COMPAT=( python3_{8..11} )
-inherit autotools python-r1 multilib-minimal
+inherit python-r1 multilib-minimal
 
 DESCRIPTION="XSLT libraries and tools"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt"
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxslt"
-	inherit git-r3
+	inherit autotools git-r3
 else
-	inherit gnome.org
+	inherit libtool gnome.org
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
@@ -48,12 +48,7 @@ src_prepare() {
 		eautoreconf
 	else
 		# Prefix always needs elibtoolize if not eautoreconf'd.
-		#elibtoolize
-
-		# Temporarily for Python 3.10 fix (version used for
-		# dist tarballs fails w/ "3.1" error)
-		# See https://gitlab.gnome.org/GNOME/libxslt/-/issues/72.
-		eautoreconf
+		elibtoolize
 	fi
 }
 
@@ -109,6 +104,10 @@ multilib_src_install() {
 		python_foreach_impl run_in_build_dir libxslt_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
+		python_foreach_impl python_optimize
 	fi
 }
 
diff --git a/dev-libs/libxslt/libxslt-9999.ebuild b/dev-libs/libxslt/libxslt-9999.ebuild
index f76f9910fa95..a4fddfe4f2e6 100644
--- a/dev-libs/libxslt/libxslt-9999.ebuild
+++ b/dev-libs/libxslt/libxslt-9999.ebuild
@@ -104,6 +104,10 @@ multilib_src_install() {
 		python_foreach_impl run_in_build_dir libxslt_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
+		python_foreach_impl python_optimize
 	fi
 }
 
diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest
index f7e4330802c5..2450b4bb7b9c 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -7,9 +7,6 @@ AUX tre-issue55-part1.patch 685 BLAKE2B 45582ffee5ca731365c1cbeb41ccc3ce9dd58bbd
 AUX tre-issue55-part2.patch 335 BLAKE2B e4c67973f6565e918c17d733bd8d8a1c5e6e67ce0d5b8ce1781a8ef7aa8087249d8bb68d1e5df52703f91a37864b7201cff9551786810b4cb20b6f5f9f0d95e5 SHA512 76032f37f8750fa90ebcc81341b9141390080e3e3ce2627177676fe4a56dfe879bf3edf1a08991dcc5533b3a622da26115a138fc27efb45d980b08217b57eb21
 AUX tre-python3.patch 5186 BLAKE2B c9e08efa47fb8ad00385703c9c7cc9d240eaccacf472c47991426702d4c971857c7c6fd1cac47135153616e4358ccbe1fcd05c04973c3c9164639634926b9c8c SHA512 0fb84b2051b2082f3271e4d47d0bc666ba9e6deb8ea2dfe0201ef4f0708b94b6706726740bfbfcf1ae708f348c63850c1b175ed1f93200934817337a5d23f1d2
 AUX tre-tests.patch 235 BLAKE2B 11c601f9b352dee9e2d36e60c537a4c2969beefd04bdab21c1e00886611d243a6c818b4a8cb484b8a414d3ec07de3e3ce32fde4aaa096bcda307b66225e8179b SHA512 69373229743ad805d4bfbf41def35de930424baaf66c36f35b3cba04860c2de15051ff640d486ec75e85aa20a28863e7937c6876ec443418ba1391e9dbbf4047
-DIST tre-0.8.0.tar.bz2 380714 BLAKE2B b2af6e805e9e19fd69debf2f881ddfb591317f69db4e29a04e1899eb69100b8ac7744f86fa438530509ca2ee8aa1d346d416c6391f13247cd9398f4c59c2ed85 SHA512 db7465993e0d25eee8e52f974427b8a040234cf0f017769eb94ee88bc6261821336aad7f762bfa82db7e2212d8449bc221592586f061c528a59a550773cbc263
 DIST tre-0.8.0_p20210321.tar.gz 146294 BLAKE2B d740bd0e99f50f5e4d8105f5260e43a81b6af9857a21e386e437ab8d48a9e0de23eae03e96cf6b9f4d2d37f72d0fa73ef7343086271ea80f166bdba3f04475a9 SHA512 950c81f681970fc737cfdd6815445f05a018fc742b964cea3ce19f0249c677dd715ece4ff8e543fa9f3fd23b503eafa00aea00dbae063af9bc7e08dc1bc33aed
-EBUILD tre-0.8.0-r2.ebuild 1461 BLAKE2B bf3725fde8e7a6c740d958956ab2b8789abee70619576a41c863b8e7be744cdfd879b598a545f287613e241f21fb96b5e5397d3ae9dc4f287895b37e2a4acb47 SHA512 2a33c2871e81f7671d10aa6b2cb2de9397ea8d8e9ea9ec419c9450208124aa153e64cdb2c3b88e20aa128b2580b777c130ebcb5c88ee830416d8e745243dbda4
 EBUILD tre-0.8.0_p20210321-r1.ebuild 2384 BLAKE2B 71455f86ea9d2729ae120af4694d294c330f8612b23d7b7bd4c7baad76cafded9ce5e0fa3e7e4b3ac3415aa632d296cf90a05d8495ce7f1f5044a7108749dcc0 SHA512 7ae52af0db7a2fd2a537b2b4b14a2f9ff53338d799d739f47d92e79aef6d7d8dc0934d5b5b8baf1f7def2f305fd563083945730a53e3933400d7e4df84035b52
-EBUILD tre-0.8.0_p20210321.ebuild 2420 BLAKE2B 51ac2ef53355f730e18a51dc7e2d61a835b8f14cf165dd452426b557d17f40190a6aceb0d06bead1e3f42ce303be47d199e3bd05cad437e9dad546f660ad4426 SHA512 fe2b7d1b57f1231bfa310e821e3ff0811c3b8a6adc2089f7f35a702565dd9600a0347972a28dfe158cb10f063bd468a9174d91fc1b898ae3a8c535e8500e016c
 MISC metadata.xml 638 BLAKE2B 4e02f7673a19acc091ee21459551e6d40f6a78d5a25cbbffe877d46f0a181067e2163d1ac79d0f7d38ff383b8775abf6f69309ad97b25fd2af55b0ac2223ab40 SHA512 9f725eebbee4753cb05b0adcda1edec2aa50265257db359ca0ec4596761072ec335fffb5a5035cf5ec43c13b8c8a7dd7ed916bbf82acd57c6d8ee5e4c89cb622
diff --git a/dev-libs/tre/tre-0.8.0-r2.ebuild b/dev-libs/tre/tre-0.8.0-r2.ebuild
deleted file mode 100644
index 4558fd3f46e8..000000000000
--- a/dev-libs/tre/tre-0.8.0-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib
-
-DESCRIPTION="Lightweight, robust, and efficient POSIX compliant regexp matching library"
-HOMEPAGE="https://laurikari.net/tre/ https://github.com/laurikari/tre/"
-SRC_URI="https://laurikari.net/tre/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="nls static-libs"
-
-RDEPEND="
-	!app-text/agrep
-	!dev-ruby/amatch
-	!app-misc/glimpse"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-pkgcfg.patch"
-	"${FILESDIR}/${PV}-CVE-2016-8559.patch"
-)
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		--enable-agrep \
-		--enable-system-abi \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	if locale -a | grep -iq en_US.iso88591; then
-		emake -j1 check
-	else
-		ewarn "If you like to run the test,"
-		ewarn "please make sure en_US.ISO-8859-1 is installed."
-		die "en_US.ISO-8859-1 locale is missing"
-	fi
-}
-
-src_install() {
-	local HTML_DOCS=( doc/*.{css,html} )
-
-	default
-
-	# 626480
-	mv "${ED%/}"/usr/bin/agrep{,-tre}$(get_exeext) || die
-}
-
-pkg_postinst() {
-	ewarn "app-misc/glimpse, app-text/agrep and this package all provide agrep."
-	ewarn "If this causes any unforeseen incompatibilities please file a bug"
-	ewarn "on https://bugs.gentoo.org."
-}
diff --git a/dev-libs/tre/tre-0.8.0_p20210321.ebuild b/dev-libs/tre/tre-0.8.0_p20210321.ebuild
deleted file mode 100644
index f45acf24a58f..000000000000
--- a/dev-libs/tre/tre-0.8.0_p20210321.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-COMMIT="6092368aabdd0dbb0fbceb2766a37b98e0ff6911"
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit autotools distutils-r1
-
-DESCRIPTION="Lightweight, robust, and efficient POSIX compliant regexp matching library"
-HOMEPAGE="
-	https://laurikari.net/tre/
-	https://github.com/laurikari/tre
-"
-SRC_URI="https://github.com/laurikari/tre/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+agrep +alloca +approx debug nls profile python"
-
-RDEPEND="
-	agrep? (
-		!app-text/agrep
-		!dev-ruby/amatch
-		!app-misc/glimpse
-	)
-	python?	( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="
-	agrep? ( approx )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-	"${FILESDIR}/0.8.0-pkgcfg.patch"
-	"${FILESDIR}/0.8.0-CVE-2016-8559.patch"
-	"${FILESDIR}/${PN}-chicken.patch"
-	"${FILESDIR}/${PN}-issue37.patch"
-	"${FILESDIR}/${PN}-issue50.patch"
-	"${FILESDIR}/${PN}-issue55-part1.patch"
-	"${FILESDIR}/${PN}-issue55-part2.patch"
-	"${FILESDIR}/${PN}-python3.patch"
-	"${FILESDIR}/${PN}-tests.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--disable-system-abi
-		--enable-multibyte
-		--enable-wchar
-		$(use_enable agrep)
-		$(use_enable approx)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable profile)
-		$(use_with alloca)
-	)
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	if locale -a | grep -iq en_US.iso88591; then
-		emake -j1 check
-	else
-		ewarn "If you like to run the test,"
-		ewarn "please make sure en_US.ISO-8859-1 is installed."
-		die "en_US.ISO-8859-1 locale is missing"
-	fi
-}
-
-src_compile() {
-	default
-	if use python; then
-		pushd "python" || die
-		python_foreach_impl distutils-r1_python_compile
-		popd || die
-	fi
-}
-
-src_install() {
-	local HTML_DOCS=( doc/*.{css,html} )
-
-	default
-	use python && python_foreach_impl python_install
-}
-
-pkg_postinst() {
-	ewarn "app-misc/glimpse, app-text/agrep and this package all provide agrep."
-	ewarn "If this causes any unforeseen incompatibilities please file a bug"
-	ewarn "on https://bugs.gentoo.org."
-}
-
-python_install() {
-	pushd "python" || die
-	distutils-r1_python_install
-	popd || die
-}