15 files changed, 10 insertions, 230 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 682c02a1c45f..9810a5873368 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 8be1f7664830..a29ba14b9e80 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,5 +1,5 @@
 DIST asciidoc-10.2.0.tar.gz 216824 BLAKE2B 500038d655f820fe89048bbff683ae029c7044de839ae4f9ec4666b843585511c99bbc1991ec1764262f33c55b08845661fc1e62eb21bb3250d3168e369928ff SHA512 2f83c7f6d1d0a34948035347833ca59841de1271e8d008b4c4a43a7a8273b230148e6f51ee8f6e2dc702460e27c495037fbe2d6d43195b70bf3447ad86390d28
 DIST asciidoc-10.2.1.tar.gz 1280535 BLAKE2B 9e15eb5d40384fe586a6148e53e03e73a6958061841843f7b32b4209a15477f97a6547ea1cb48d23b5d4c9ee5add1bfa87d53c1bfbc14c10f31397ebeb86ba39 SHA512 02d064aab8dfb05af4ae49a7c7bd1381156c6c90f95b2494218c80f01c39987cb971d68c533b5519abade77be9832b3fab653d8ae2ca7bb682c5bb720612839f
 EBUILD asciidoc-10.2.0.ebuild 1442 BLAKE2B 0d24d9dee0bf4c22f56cb9d21dda2ecca8822a31f12864a35beafd6001239f8f25d8c7606b5fc3d4c7ed8b8ba45f3f52b005615ed2f8612040c14f17fcf3408e SHA512 5f9ae6c4f81241e0efa14769643beb0200064709d31354066463c5809d69077f916788f0dcd67da184464e889c7dd2829b680b33363a4ac808086779658549a1
-EBUILD asciidoc-10.2.1.ebuild 1704 BLAKE2B 5f7865324781b6450f82959367ac3511f84b6a07cc150c5e27e3f323f39976cbd406fc62f5bae6dec330233baafa588750041dcedb937055313b2cb8a5bfedca SHA512 0a55e9659344f91a6414b29d6ee1635d8a36f74d85263081d7035397605dad1e73609e3cdeada030c88a268e452a1ccc677282ec83a2aa25a57f201e57c34051
+EBUILD asciidoc-10.2.1.ebuild 1703 BLAKE2B 391ffec822f1c1fbeb046f40bdaff7cb1745e3696f95ae99ac523621d92e6e93df1e0af0c58173c8e003e4284312e592fed1beb3de40664de724e9ee2a5dbaf6 SHA512 a95fe870cec615d02f159170545934a0819fa46ec901b29bca274119d697a409ee67e391df17efdfe914a7f1eefc02bb752009f6f7f7a25fe3b1c637651015ab
 MISC metadata.xml 437 BLAKE2B daddb5640390428ca681f4efacc9fb3e02d11687644d2ff2d233fc5fa59f7950dbe8cef9f875f3e2af077a74567a4e4f48b187b1eab64e5a9d4ef3f5b1cffa1b SHA512 5d281a8e6fd3dd551a9d5df099f3b0586c363f4295a5e9bdb63c82a501d076e04c3b4a88f0f861d445ef3bb22970b10e15eb98094375f3e634cbbe506432bedd
diff --git a/app-text/asciidoc/asciidoc-10.2.1.ebuild b/app-text/asciidoc/asciidoc-10.2.1.ebuild
index 3a5faa3da345..07131e89edf4 100644
--- a/app-text/asciidoc/asciidoc-10.2.1.ebuild
+++ b/app-text/asciidoc/asciidoc-10.2.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	app-text/docbook-xml-dtd:4.5
diff --git a/app-text/nuspell/Manifest b/app-text/nuspell/Manifest
index 5fe182b37d9e..eb11ad31706b 100644
--- a/app-text/nuspell/Manifest
+++ b/app-text/nuspell/Manifest
@@ -1,7 +1,3 @@
-DIST nuspell-5.1.3.tar.gz 371496 BLAKE2B 7a4aa05b01bd085e0612cf681783cfa2314a3b775c283f7e25c19d6afbb5af74c7ea2ffe149c68ca422383c24bd043e4b5e6b0895a0acd7c376e3d39f253a867 SHA512 72c868f734848be79c7cfb0502298626307213e4f3f422f8e9ee7dac24cb3d79ea55d04ef0443e7107bb11eb545c79a15a8aea8cb056dc2805c23bd5e3292562
-DIST nuspell-5.1.4.tar.gz 371512 BLAKE2B c1c05cc113cf7a6a4b77671f4fe372b2131a6cbcb328d76517bcbb45863e1fd0f27d76597193cae3a5c686d8e0b480fc831e0aa8dbcbf9f9b65420200a13d444 SHA512 f4119b3fe5944be8f5bc35ccff8d7a93b0f4fa9f129bc97a7b96879a11b5b35bd714b41dd209267417e94c5fed45fd3a74b349f94424f4b90bde07d9694d1d7d
 DIST nuspell-5.1.6.tar.gz 373260 BLAKE2B 978f1055c4e8f68a1e7e712b98af11b5f9a4be3b42044d7d31733cf30d301145da501da95168e1c96518bba6e0f2d525a6929d5fa81f350828158e6db7dad147 SHA512 ab6d9394a55d9a2a347ccae47aeef6a96af70f421ad6ea8f7ac7fde2052790f37fb1c7ec3112daac7600d193430a560cb1915ab6557c9353717f65cb32f13ab8
-EBUILD nuspell-5.1.3.ebuild 1122 BLAKE2B 26f2748dbaf1a961e44467de34a348739b7683c5adb8ca9beb13b9757b31388e0e8e0bc65df8a6ad2ae5ca74e3b2a13c5df9c5a4fbd3cea68f35edc5f446b5bd SHA512 01a54179b2184e62d1648a80a2a531825708891d551889a1b84d38d7c054609142ed33e78ee411fff65ad2e861436b0fb953366d7793840110c7127857937d34
-EBUILD nuspell-5.1.4.ebuild 1129 BLAKE2B 3f41d08680c445e24128b8006023c397a4723e48b14764909265177756dc53ec30f66066f05cfafa4956fd8168f4ef6b194f5cce8e094927295f2b0a58118ebf SHA512 7ae02257895b98642ac3922fc0c7bd45b49b4d0a72d006165a0fb0a9e1912835782bde191ecbe353b02c02811a2b5d7f7309aa017c40633f84cfe220fb439597
-EBUILD nuspell-5.1.6.ebuild 1156 BLAKE2B f4db71dcd1b838cadc04e71e06f203c1bf4e422f4c3909f0a5fea226a6bab03a0277264904acf729d32676f44927dc71c335bf1282a8f6bad762c32bcf4f8b98 SHA512 bcfa5713ecaab29b011abf3f74220e4d5a7eb31ac4b01ebd624451f93b9b234fa94af66f459f8d31deece2495858f6208eba8bded3155cb215ae09055f18ed72
+EBUILD nuspell-5.1.6.ebuild 1154 BLAKE2B d3548f9aa075229109ce42dd23747a65cf3bb822fe06bd6117ba5deed8178a25819d48a821f52370c5ba557eac4bbf43e5e5a2be000d2e9b046bb6c7e82265db SHA512 c29d9c3bb9e8ab49f668f58c6e641afcdb3268954bc696d72d13eea061d5b1451e53034ccfdcf044658642abfa28d36e27cc12a32901c9df20fc4d8b6530bf60
 MISC metadata.xml 570 BLAKE2B 35d293be6eceb86ffb9b19a890b6fb280b0d81e29a9d3b648edddf35e4cc1f7986c04926ea570b6e3c6bba9b753bfccfa8728118da836b00633eaffe59fbd8f0 SHA512 08de4433355e1e8b059bcade466dbb8947b38700ee8cf96b7fd8c80d7fef9caf330a9294ba5a80b98dd986581e7b07bf6ae9b14d138477dbeca34d3dc8230edb
diff --git a/app-text/nuspell/nuspell-5.1.3.ebuild b/app-text/nuspell/nuspell-5.1.3.ebuild
deleted file mode 100644
index 18d0806fde8f..000000000000
--- a/app-text/nuspell/nuspell-5.1.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Spell checker library and CLI for complex natural languages"
-HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
-SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0/5"  # due to libnuspell.so.5
-KEYWORDS="amd64 ~loong ~riscv x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-libs/icu-60"
-DEPEND="${RDEPEND}
-	doc? ( virtual/pandoc )
-	test? ( <dev-cpp/catch-3:0 )
-	"
-
-DOCS=( CHANGELOG.md )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	if ! use test ; then
-		rm -R external/hunspell/ || die
-	fi
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	einfo
-	einfo 'Nuspell needs language packs and/or dictionaries to be of use'
-	einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
-	einfo
-	einfo 'Besides MySpell dictionaries, for other options please'
-	einfo 'see https://nuspell.github.io/#languages-and-users .'
-	einfo
-}
diff --git a/app-text/nuspell/nuspell-5.1.4.ebuild b/app-text/nuspell/nuspell-5.1.4.ebuild
deleted file mode 100644
index d0791bda1ad5..000000000000
--- a/app-text/nuspell/nuspell-5.1.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Spell checker library and CLI for complex natural languages"
-HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
-SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0/5"  # due to libnuspell.so.5
-KEYWORDS="~amd64 ~loong ~riscv ~x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-libs/icu-60"
-DEPEND="${RDEPEND}
-	doc? ( virtual/pandoc )
-	test? ( >=dev-cpp/catch-3.1.1:0 )
-	"
-
-DOCS=( CHANGELOG.md )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	if ! use test ; then
-		rm -R external/hunspell/ || die
-	fi
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	einfo
-	einfo 'Nuspell needs language packs and/or dictionaries to be of use'
-	einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
-	einfo
-	einfo 'Besides MySpell dictionaries, for other options please'
-	einfo 'see https://nuspell.github.io/#languages-and-users .'
-	einfo
-}
diff --git a/app-text/nuspell/nuspell-5.1.6.ebuild b/app-text/nuspell/nuspell-5.1.6.ebuild
index 58d1d8ac4075..10fcf11be833 100644
--- a/app-text/nuspell/nuspell-5.1.6.ebuild
+++ b/app-text/nuspell/nuspell-5.1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3+"
 SLOT="0/5"  # due to libnuspell.so.5
-KEYWORDS="~amd64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~loong ~riscv x86"
 IUSE="doc test"
 
 RDEPEND=">=dev-libs/icu-60"
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 2a439bef19cd..441bcacdd430 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -14,5 +14,5 @@ DIST qpdf-11.9.1.tar.gz.asc 833 BLAKE2B 4b676ac2469971e0b4862d329d489ca4c37a11a7
 EBUILD qpdf-11.7.0.ebuild 2253 BLAKE2B b2bc43884c75da8d3381d12b9f8f0d2d836ab03b8de884be792d308b0a564c623eccbab64ce694806cf7477f667e6754a177a9c94eab83ee75b551b05984cf51 SHA512 1956e77716fa8a25e5214e3463a5c51f8c2e20ad8d46a4ad43d0aa8068e858c054985cb2ca01ce682d90215fb80e10e019ce88f64c0252d46405c7a431a8f5ea
 EBUILD qpdf-11.8.0.ebuild 2261 BLAKE2B b3687a1e2b26990a2344e0e070aa3e7cb05cc9e802b727719900e42b69af8759bf936e3c707660174d009921ddf8d53c988558e05ef2a9be592744c5180ce32c SHA512 52525584740a3526daff4e097afaf743f3c5ca678ddec343b27fd41f068fda44fcf0087f11782bb90a7e3f8615101221aefac252078b4fa862de4e45738d34eb
 EBUILD qpdf-11.9.0.ebuild 2261 BLAKE2B b3687a1e2b26990a2344e0e070aa3e7cb05cc9e802b727719900e42b69af8759bf936e3c707660174d009921ddf8d53c988558e05ef2a9be592744c5180ce32c SHA512 52525584740a3526daff4e097afaf743f3c5ca678ddec343b27fd41f068fda44fcf0087f11782bb90a7e3f8615101221aefac252078b4fa862de4e45738d34eb
-EBUILD qpdf-11.9.1.ebuild 2327 BLAKE2B 14c3f9de377dcebd5cbc2e0d01f47657c7828a66f003a85a2b60b0127607824cf8bfb0beeacd1fabe213f85ccdb15a13dc47fce5a0fac5824250678ce0121811 SHA512 ac0a89347db73fd28a5de603eb100283ba2dba457dd20d79eefde191ba5bfbc59140649742bc085b447219e9b47c7c08ecf6c49e1b19d2f8c147bf75550d0880
+EBUILD qpdf-11.9.1.ebuild 2326 BLAKE2B be5432ce01db4355101947865c0c041eeadda89d3291deae369ec8d229cece291c293cfe159955bdad04729a642dc20670311e205b707bf7ea11e0e622c28311 SHA512 cd3bb17c84809c9f4d8171ff8397c7a8b591a1f9b72755ff13ec021924cca2f990e92ffaa454a335a8f65d0cd9a6ebf33060e6b8e484bfbe9b1bd7b9c3eca2b8
 MISC metadata.xml 444 BLAKE2B 1febc86d8f85aff5ec02d910550aca3bde66111c3e7364b264db3fca10020ea9bc2887dc8283217e2cb8d05ba46c176a92993e0d418528cbe590771dccc49d90 SHA512 dde5e34ef0d6c65df8a2ca8d630182413800f4c10f4b9860ed752623b6f4864dd4969c757e06b2689c8c5da3377bfcc28ec223e531432add083cd4a68211ea1c
diff --git a/app-text/qpdf/qpdf-11.9.1.ebuild b/app-text/qpdf/qpdf-11.9.1.ebuild
index 8fcfe79ac201..6912432eae53 100644
--- a/app-text/qpdf/qpdf-11.9.1.ebuild
+++ b/app-text/qpdf/qpdf-11.9.1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # Subslot for libqpdf soname version (just represent via major version)
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples gnutls test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index cff3028e878d..1761757b3e05 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -5,5 +5,5 @@ DIST sigil-2.3.0.tar.gz 17480782 BLAKE2B abcb5eac75ec56e9bc83a50175e6e9dc8a494ae
 DIST sigil-2.3.1.tar.gz 17475697 BLAKE2B 668d02f941c900921224977bc2d8edeb6a21cf7985d1f7980ffc6b8ecc6627fe5a29f71ea75e12d1f54c2b1959afa7323dda807b1189e4189a996e98c90bdea2 SHA512 da0433882040212a8385c1b872b568ef39660b6c0127d64d9fc4cdd4f3939c2e14f3d08056ab1b405142e012caf363ebfe170761a74e684590c1a358e1115d09
 EBUILD sigil-2.2.1.ebuild 2658 BLAKE2B 0e2946c04521844adc0d492ecaa8137b2ff02883182664597dc7e0a6de2851b433c096691ac7f0edd2f3a03613dab9ff28f6c92d0b1fb034fc401eaba45de048 SHA512 d265f2756b29f4b2ad71ef5d72ebc3f5c963d0b31fe69f7ef64ba60a740e26fc05019865fb20e02e1eef141883b53cd6fb6a5b8b2ba4dde05ef109716e2d3d4b
 EBUILD sigil-2.3.0.ebuild 2239 BLAKE2B a8498de5b0fb811744f3e5fd2684d1151c934af4a26aca251416cb6bd09f29aa3b1a4d65b80f541ac4af70f1bfa07c4984d9f427757997c7c42aff1dab73f6b7 SHA512 c6c4b55a871a905e663780bfc9c15cd2b3d125d7bcce1b4a0fe0e40ba6f471227b7fd634fa239020dbb6d05f88dc73b1e3ae5d0b2ae78ce02a869106dca267b2
-EBUILD sigil-2.3.1.ebuild 2240 BLAKE2B 2a52db970e91a1de12a74d273dca8149f29a9285e8972791ac8db3235f64c509c090df724dab900566b42f81890586af133f8723c8fe04c16e92774430c7c2cc SHA512 56ef2cf8783dc4d7db7e8017c58b58c5b6e1aff6d04a77ba9c16711448af1847168dbd72941d91e92a88dc46138f33104abaf931fd14cc3796d6e39afa01c6ee
+EBUILD sigil-2.3.1.ebuild 2239 BLAKE2B a8498de5b0fb811744f3e5fd2684d1151c934af4a26aca251416cb6bd09f29aa3b1a4d65b80f541ac4af70f1bfa07c4984d9f427757997c7c42aff1dab73f6b7 SHA512 c6c4b55a871a905e663780bfc9c15cd2b3d125d7bcce1b4a0fe0e40ba6f471227b7fd634fa239020dbb6d05f88dc73b1e3ae5d0b2ae78ce02a869106dca267b2
 MISC metadata.xml 810 BLAKE2B 9790a33fa436de084e57410b5fea4fc477bef40dafbc9b0467b0b01a27dfcb9b6874df529f5e0ecc1aca5e48fb07adde0b3a8c99fdd1ff1bd14f6877ecfedc98 SHA512 8b0c12e38cf8516e139bc1277062f0499148b6eba417e9c65389dd5aa8fdae9b967cffbe066f5e3bee5ed11d2eac2d909c782dc3b3f1432b3f4515adb04acaf2
diff --git a/app-text/sigil/sigil-2.3.1.ebuild b/app-text/sigil/sigil-2.3.1.ebuild
index cb9aa8b5f970..3c649427ca1e 100644
--- a/app-text/sigil/sigil-2.3.1.ebuild
+++ b/app-text/sigil/sigil-2.3.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${P^}
 
 LICENSE="GPL-3+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc +plugins +system-mathjax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/xmlstarlet/Manifest b/app-text/xmlstarlet/Manifest
index db2a5d47e9a5..2969f3d90634 100644
--- a/app-text/xmlstarlet/Manifest
+++ b/app-text/xmlstarlet/Manifest
@@ -1,7 +1,5 @@
 AUX xmlstarlet-1.6.1-clang16.patch 1140 BLAKE2B 5adade599c64b6598754be6b15f118ddc3fc91d850ec8e01b956355c972d3afeb107a98aad4fc398dede34b3d2e61483c89667693403a47c01b04953d52a110c SHA512 4197ed29065608ae5dcff398a339237c2bd3af1f329b25acc0ff567668856262882e703c1299ad578dea2b1fb9c9e114bd667504668018eff2eecb8bd0f4b9e3
 AUX xmlstarlet-1.6.1-clang17.patch 2408 BLAKE2B 0f14db846fb7ab201b256ca60bb43175d6023407df647ebdde78f5ec44afe8252de5fb51707a7526058e461d639143d842787167e10024c669fbbbde90f83bef SHA512 269773daa93d7ce3f2325f846566b4db48137143a6605462393313b3023c79c8f25b9cee9a15be834bfa9208df57e5620fdda5b808930f722896ede879c7519b
 DIST xmlstarlet-1.6.1.tar.gz 420923 BLAKE2B 56bf29f62549a7445e3cf15b6a3f60558dbcacf96645c3acc5a45b432d61f47614274a5d3e7234399f7dbdb854b503d73a6cfb8989710b7363d743dce4dff8f0 SHA512 4228df812caec7059d7a76986c4d9a4262bd861cc53dca05f341ae6c062be05f1c39fc637918ab00f60f40587c6c556e3c9bfaf8a18b149e3c321a92214dbe8b
-EBUILD xmlstarlet-1.6.1-r1.ebuild 1562 BLAKE2B 9a1f535c07e69221543f2d60655def546b3e4dd17f1e19162f3a4b1e81ee9d7a027e2e2c0a1fd27b40b2307771d43e4e57f0dab6ec67c3b8322602aca725b6df SHA512 b664735a2e53626d8d909732455e37cec7646d2fe51a811f0a83e5fe95adc42528852f6e010423d16445752c5fb9ebd95bcbc2a986cab1a7f6f6bf4827df2535
-EBUILD xmlstarlet-1.6.1-r2.ebuild 1603 BLAKE2B edcbe0c64f1bf06c92ac330a0a61ad8e58000a42e43376f81070e00501a0b5714b00e1e9a7c5e465ea38f9e58c5ccc578d0f096d4bea80bf5a38a3806604152b SHA512 0caaa421f64a1cc15ac3981712ba77edf15e23af6a21a98c430fb40b65fa4882317b4637f6a89a330d0acbd156d41fe08ed73bd7d601843f9dfbe39e463cba52
-EBUILD xmlstarlet-1.6.1.ebuild 1505 BLAKE2B 7bbab02e1497c4868bdba9ed8eb5986f4813bd7556608c6699ea82aab9889641c7a7a710bf91cb20846e69184ad72c20c3fcf664d395d94a368c89f4534feaae SHA512 fce25f527df7b78946b7bb102e1e8b57112673f8656b1c951dccf5f061a56e6a649b3eaccbfd5016d151c728aebc80121cfe0e091b976267e9b2eb4af567ab0b
+EBUILD xmlstarlet-1.6.1-r2.ebuild 1600 BLAKE2B 0aa8ca44e0891487844284818504606df03cbf6a875590a8c05605a9d00f546e59f544e2115908c94e1b6b47fb6e08ef42c28aac0b5d65e14f941e33182f560d SHA512 d7f23d1fc2d39b72c8f1add08b4b0fa8f5b186ed0e4bdf17ef2c21d9616d21578b4023f5a3438a7df8f14ecb46ebf3528d5a9021b1f895d92a991154ec8f61d9
 MISC metadata.xml 294 BLAKE2B 15c32d1ad62c8dc9e94ca2cd9554c9f16dd8eb26194eb24f5810202b9d0da8ab6d2638ebdc2f8c43aa6068de35616f3c29609fa85016f34839ddf46f2ec3be2b SHA512 518df7e45f852b93f924300a846be03d00c8dc9a4ad23d0f90b115e0f1fb98f7b41de45a550d05ccf290fe5cbadffb3dacb4e9d632b64996063b42b4289c80bc
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild
deleted file mode 100644
index 02d1abdb08d0..000000000000
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
-HOMEPAGE="https://xmlstar.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/xmlstar/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/libgcrypt:0=
-	virtual/libiconv"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-clang16.patch
-)
-
-src_prepare() {
-	default
-
-	# We need to patch use of /usr/lib because it is a problem with
-	# linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/729600).
-	# The grep sandwich acts as a regression test so that a future
-	# version bump cannot break patching without noticing.
-	if [[ $(get_libdir) != lib ]]; then
-	    grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die
-	    sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
-	    grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags $($(tc-getPKG_CONFIG) --cflags libxml-2.0)
-
-	# NOTE: Fully built documentation is already shipped with the tarball:
-	# - doc/xmlstarlet-ug.{pdf,ps,html}
-	# - doc/xmlstarlet.txt
-	# - doc/xmlstarlet.1
-	econf \
-		--disable-build-docs \
-		--disable-static-libs
-}
-
-src_install() {
-	default
-	dosym xml /usr/bin/xmlstarlet
-}
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1-r2.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1-r2.ebuild
index 7ef84964c69e..2bb5d2f5bb41 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1-r2.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/xmlstar/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-libs/libxml2
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
deleted file mode 100644
index 9b034dcdacb7..000000000000
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
-HOMEPAGE="https://xmlstar.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/xmlstar/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/libgcrypt:0=
-	virtual/libiconv"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# We need to patch use of /usr/lib because it is a problem with
-	# linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/729600).
-	# The grep sandwich acts as a regression test so that a future
-	# version bump cannot break patching without noticing.
-	if [[ $(get_libdir) != lib ]]; then
-	    grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die
-	    sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
-	    grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags $($(tc-getPKG_CONFIG) --cflags libxml-2.0)
-
-	# NOTE: Fully built documentation is already shipped with the tarball:
-	# - doc/xmlstarlet-ug.{pdf,ps,html}
-	# - doc/xmlstarlet.txt
-	# - doc/xmlstarlet.1
-	econf \
-		--disable-build-docs \
-		--disable-static-libs
-}
-
-src_install() {
-	default
-	dosym xml /usr/bin/xmlstarlet
-}