gentoo auto-resync : 14:03:2025 - 00:28:41

24 files changed, 104 insertions, 144 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 1162958690b7..b77698a97aec 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/cpu-x/Manifest b/sys-apps/cpu-x/Manifest
index 7b0f9bc64245..8b853e2b47ab 100644
--- a/sys-apps/cpu-x/Manifest
+++ b/sys-apps/cpu-x/Manifest
@@ -4,10 +4,12 @@ DIST cpu-x-5.0.4.tar.gz 1995465 BLAKE2B 6e3982040400a2bbdb7fba0cac24f1b183792693
 DIST cpu-x-5.1.0.tar.gz 2705947 BLAKE2B 8f5989170ebba7b943bc4bf5d3550ff2a7f9d527305d2ee4ad9ffa39cebcf089098b6ed0340c001d0926d0a093fd559273b3b61b404cc21ece3aea937097c1f5 SHA512 7f0ce6123cdd957663aa1012194cee12a09cdd3a44b0bcdfecad36315a3b1c1e5e6461ffa0d9613c0ff275332d4aae0499f8687d1acbcd921703971508819ed6
 DIST cpu-x-5.1.1.tar.gz 2721238 BLAKE2B bfd0f1e919e3ca3663b54b41f50dadc6c0ebc2329bad58253ef26f5af0c1f5b3ce713f7309be25c16990d056df415aa5ce76e5fb9bcb975675568a856290c45c SHA512 8601946feaed567e144350c69761a46a7f5ff1aa47c1d550afca11d6b3eb7546b125c56ecd4f266a33d5ee8a6ef09eba01f7c6570dde25c4f1989971eb6dbb27
 DIST cpu-x-5.1.2.tar.gz 2727723 BLAKE2B 570762bd7c58ebb6b168b7dab78b9a58a55b5619c69e0ac0b30d51600b5bf5c4962be8c353f51b0a3f330f536af99dbfae8b08ee17f43b12cc6c30f76bb018a5 SHA512 3c07efbebc44b3a085daea161ce0144a786b76ac46b80141ede985e07a79837b6f40d2af3203b3d6f1dad6c6ff6dff99fbb553e705a9471b55b041f42db2111e
+DIST cpu-x-5.1.3.tar.gz 2732630 BLAKE2B 86f7dff5ab93f98e54154104f75a221bc0bf966014f3f89176f0049b89cd03aa01c19c6eec9d91a8204137117df2e69624904d3d1b1aea5deecf83905838cc33 SHA512 2823c313d2d940443eee174c5cbfa83c3dd003a3b669c3d7dcb85f14f80571e7a232675c380ab8e4eea977f3c4b6c6d5d4d3bd5c6a1215f14252defc16cd9375
 EBUILD cpu-x-5.0.2.ebuild 1823 BLAKE2B b8e7318b93a8603b5d0de8978de442ebda77878f84af965e541c9e5035cb1ccf4fcd9ddd5d3de80c0a84a865b2801c62d07ed356d97011ae00f8e88b98b03381 SHA512 6bddd67ef011623b156fbf44b41a13385675bd0b27b23962390d8d84bd17dabdfcd6abecb9a2e184fca9c1826ea51b0e82458ad13f433ee44dfbd5dd83764912
 EBUILD cpu-x-5.0.3.ebuild 1823 BLAKE2B f3070e76ea40d66d01aad73e5728141a15856587e8bd1df07e7140708cc0f89aa3614090dd2f6afa7926af0c78f87327dd32a41fccd2374e819059e965adeaeb SHA512 3a04877974eff90a711fefb3531c39e213bdd71e6cf72a3074ba208bab85304bf8629a995464e5af0f7ccd2bc8a6ba0c2426293e522e14acb047e6d15a52b031
 EBUILD cpu-x-5.0.4.ebuild 1823 BLAKE2B f3070e76ea40d66d01aad73e5728141a15856587e8bd1df07e7140708cc0f89aa3614090dd2f6afa7926af0c78f87327dd32a41fccd2374e819059e965adeaeb SHA512 3a04877974eff90a711fefb3531c39e213bdd71e6cf72a3074ba208bab85304bf8629a995464e5af0f7ccd2bc8a6ba0c2426293e522e14acb047e6d15a52b031
 EBUILD cpu-x-5.1.0.ebuild 1823 BLAKE2B ec3fa60b5b921bbcd3e4669cd5d9ab32a335769e0aee085ef5450adc55d08a3d93d94404c49c8e2fb0223b9f5447f76e8c33e642f70174514cc76684113c7903 SHA512 54d8192a9c865a9a9088c7e253bd373f9c85ce486ead9fe8875ec4342115d28719e638be3bca3e0eded8f9bdea07653315a5c30e2bc1d6a1e1e154a7e2fa9c5d
 EBUILD cpu-x-5.1.1.ebuild 1823 BLAKE2B ec3fa60b5b921bbcd3e4669cd5d9ab32a335769e0aee085ef5450adc55d08a3d93d94404c49c8e2fb0223b9f5447f76e8c33e642f70174514cc76684113c7903 SHA512 54d8192a9c865a9a9088c7e253bd373f9c85ce486ead9fe8875ec4342115d28719e638be3bca3e0eded8f9bdea07653315a5c30e2bc1d6a1e1e154a7e2fa9c5d
 EBUILD cpu-x-5.1.2.ebuild 1823 BLAKE2B 5c32aeaa1813395402595d12eedda582550dc7c65f164ecbee1528c0bda16116f95c57f402c5123dc47f390c4dad9637a02d37d888e981012997c4a1264408cf SHA512 62c548ac13a9ad47ef00640b8e2413d85d37b4a1664e868b83e2de35702665b7e4ae049136a4f83d3cadcf558a1faa4d6f752969bcfcd0a6f8d6024d96b71af2
+EBUILD cpu-x-5.1.3.ebuild 1823 BLAKE2B 5c32aeaa1813395402595d12eedda582550dc7c65f164ecbee1528c0bda16116f95c57f402c5123dc47f390c4dad9637a02d37d888e981012997c4a1264408cf SHA512 62c548ac13a9ad47ef00640b8e2413d85d37b4a1664e868b83e2de35702665b7e4ae049136a4f83d3cadcf558a1faa4d6f752969bcfcd0a6f8d6024d96b71af2
 MISC metadata.xml 2358 BLAKE2B 3479171bf4bcfd7103e6fafd49aa2b68535054c62f706871476d540b4bfeeed842ffdf6c380e912633216ab001b0d4556913c9bf1bf6449858960a6f22d83c8b SHA512 d0abed69e5cdf0e98180f9526dfeacbbdf6f449114607484c735cc194f80951691429ab594f04e4481659c3440b431927b8b14be016aa4c0179b81a45ec09ec9
diff --git a/sys-apps/cpu-x/cpu-x-5.1.3.ebuild b/sys-apps/cpu-x/cpu-x-5.1.3.ebuild
new file mode 100644
index 000000000000..9c1588876128
--- /dev/null
+++ b/sys-apps/cpu-x/cpu-x-5.1.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="CPU-X"
+
+inherit cmake gnome2-utils xdg
+
+DESCRIPTION="A Free software that gathers information on CPU, motherboard and more"
+HOMEPAGE="https://thetumultuousunicornofdarkness.github.io/CPU-X/"
+SRC_URI="https://github.com/TheTumultuousUnicornOfDarkness/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+cpu force-libstatgrab +gpu gui +ncurses +nls opencl +pci test vulkan"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	force-libstatgrab? ( sys-libs/libstatgrab )
+	!force-libstatgrab? ( sys-process/procps:= )
+	gui? ( dev-cpp/gtkmm:3.0
+		>=x11-libs/gtk+-3.12:3 )
+	cpu? ( >=dev-libs/libcpuid-0.7.0:= )
+	gpu? ( >=media-libs/glfw-3.3
+		media-libs/libglvnd )
+	pci? ( sys-apps/pciutils )
+	ncurses? ( sys-libs/ncurses:=[tinfo] )
+	opencl? ( virtual/opencl )
+	vulkan? ( media-libs/vulkan-loader
+		>=dev-util/vulkan-headers-1.3.151 )
+"
+
+DEPEND="
+	test? (
+		sys-apps/grep[pcre]
+		sys-apps/mawk
+		sys-apps/nawk
+	)
+
+	${COMMON_DEPEND}
+"
+
+BDEPEND="
+	dev-lang/nasm
+	nls? ( sys-devel/gettext )
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DFORCE_LIBSTATGRAB=$(usex force-libstatgrab)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_GTK=$(usex gui)
+		-DWITH_LIBCPUID=$(usex cpu)
+		-DWITH_LIBGLFW=$(usex gpu)
+		-DWITH_LIBPCI=$(usex pci)
+		-DWITH_LIBSTATGRAB=OFF
+		-DWITH_NCURSES=$(usex ncurses)
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_VULKAN=$(usex vulkan)
+	)
+	use gui && mycmakeargs+=( -DGSETTINGS_COMPILE=OFF )
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 2babc5faa0f8..96805779f345 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -9,5 +9,5 @@ DIST dbus-1.16.2.tar.xz 1115644 BLAKE2B ddca8abdd5df70b24d51293a262cda3f9e69681b
 EBUILD dbus-1.15.8.ebuild 6519 BLAKE2B cebf3404aa78ad3297aaeadc79696e77d023e36fa136fe4009fd5413ce35ea0126ca675662176f90d1df21645972317608a295c26ce78ad228bfbe653d90727f SHA512 1eebfe7c7073f0e84aca536a611ab90db6506f4b47cc356612a51dc212e5ec8715443c7eebc987e121b4ff48900f655ee9ba08446e033e83ccf64f2abbfe559e
 EBUILD dbus-1.16.0-r3.ebuild 6546 BLAKE2B 23f4e71e75864646094d3b767212d00d9ad78b69be030520bf872bf2ab4ee6df7048538c18556617b90c48364d14de119c10fcac94802e3dc6fd7665dfe272c5 SHA512 c77953d8a299838964c14108f0569b24da5bfd45aff0b466da77abba3f747add7249f746167acaaf23eef60c2cfb02f0b85d0cf9de8822dd93e967f82cf15d92
 EBUILD dbus-1.16.0.ebuild 6477 BLAKE2B 5bea7ce249ad7206f808326e04078f429931f840b0c296d2a1743f2ee9f8328a59b56256d8b2a19e1d9041390ed8a8994345d46590f2fdb3817dfa62b0224777 SHA512 2598ff881f25f2385bb9725ceb75952f6072c844059fcd7f7befeed15a9de735112e1aae94cfe991800fe7dfee8d2ef8b0a8265fecf7e96228cdba052eb6ec49
-EBUILD dbus-1.16.2.ebuild 6546 BLAKE2B 23f4e71e75864646094d3b767212d00d9ad78b69be030520bf872bf2ab4ee6df7048538c18556617b90c48364d14de119c10fcac94802e3dc6fd7665dfe272c5 SHA512 c77953d8a299838964c14108f0569b24da5bfd45aff0b466da77abba3f747add7249f746167acaaf23eef60c2cfb02f0b85d0cf9de8822dd93e967f82cf15d92
+EBUILD dbus-1.16.2.ebuild 6539 BLAKE2B 3da31e435dd99a028b417096a6a3fd85ddc8db5ec7782aad2b077c33b183eda1f7a872fcfcf6bd5ba13daa05f790e7ae86397d0308430931372b62ee76bb2de5 SHA512 1a46847fb8e1ab9d29e53c519be6657d9745883799e4f29971411d67f7d2a74d9f202d4fec3c397eb44a1884e3561e71be3cf01892dcfca0168f0762b6292d80
 MISC metadata.xml 562 BLAKE2B 5ffb7f5e162d8aae0b6db26fae2c3fa5be300110f57e46d0829c184fc564e766f86ffff5acea3097f9bb260d4f21793f0673d1545a03b25d0283b0e29e6f9460 SHA512 e5f21ed99b2678c60477623984d3609ce9b38120f327ac462d0741164473375d4808984b3405bf0dab0918d8d481ed5768380c0085cfbe70d9f5a055eb6ddba8
diff --git a/sys-apps/dbus/dbus-1.16.2.ebuild b/sys-apps/dbus/dbus-1.16.2.ebuild
index 329294046b7e..6e3b3438bdc2 100644
--- a/sys-apps/dbus/dbus-1.16.2.ebuild
+++ b/sys-apps/dbus/dbus-1.16.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz"
 
 LICENSE="|| ( AFL-2.1 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"
 # TODO: USE=daemon
 IUSE="debug doc elogind selinux static-libs systemd test valgrind X"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/edid-decode/Manifest b/sys-apps/edid-decode/Manifest
index 0dbf0be88390..f58411f60b85 100644
--- a/sys-apps/edid-decode/Manifest
+++ b/sys-apps/edid-decode/Manifest
@@ -1,4 +1,4 @@
 DIST edid-decode-0_pre20230131.tar.gz 147392 BLAKE2B 8a08ca44bbdb61b0264a24b911b082d264eb1ef281d98a93dc12d62f5d233cc898cf1ad06647e680f8ab49b047721f31c80572582a2dd5dc8fec93ff70227b03 SHA512 53619eb79e456d4bf3566506019ad77a8f8dacb4211106cdf21164c26d0d026383bedd8a8ba2a7050d4d0657e1bbca51fb89978cfd066f1130f888a4537dd19b
-EBUILD edid-decode-0_pre20230131.ebuild 708 BLAKE2B bc4e189a164225134b5338d6eb8f47b7c409c787379f15e0664643b1a49697aee478dc235be7ca2f69d9d23814ede67d1a169f829291f7612b45d58f996712a8 SHA512 16f6401834c204ee3339ec77c5d48a809538e4977ed4da68c37b554c3fd2afd2a1feca4cff67628c9fc084016c9c8019caa8f703d5805a611f1185b081859b80
+EBUILD edid-decode-0_pre20230131.ebuild 707 BLAKE2B 3261d047fe94192ca74b68c097a4845ff0bca747e4f38a8a7239c8fb42ec81070a273171e037ffb7e11421b852764151cde2a72bee0647f151de827b3ea04e09 SHA512 3c1bc00ddc735d48062a199a4e2739c38a48ecaae4636f243326b9cb159650bceb136b1a11db2de566961f1abe777d8c0e4c6823c23af368370c8d71f138a3c2
 EBUILD edid-decode-9999.ebuild 538 BLAKE2B 281b8d8264251c8b2c9dfc7003aad201be92df0f962f06772f49165a620ff22a018dd597e76ef0630cc9f88e7862596336defcb8a7b494f5050fdb80f2a1c71c SHA512 cd8bf283683b1e16316c111c03d2507e3971aaa9491ef65db2d8117cfc384fe3ecb6841405369fefd5d0d67680ae062043ed88df0617aaf8689655003bdf4b10
 MISC metadata.xml 647 BLAKE2B 42d8d41db31a4748f5ffad976c0ad35ff483073c286236d77f3c6fc91e854844e519bc8d4761a02880e116faca88c43c16bea37c008719c8adb8f55f4226ac83 SHA512 c7c46f576fd17b42a06a6b241d3a5b6f5dfb9597e824f00ff311feba48a587ecd821285ecc3fb46d3533b6bdd352b34a69ec8886e0e7e8da38dbd29055effbad
diff --git a/sys-apps/edid-decode/edid-decode-0_pre20230131.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20230131.ebuild
index ea02a5616b19..a2a1a02afc2b 100644
--- a/sys-apps/edid-decode/edid-decode-0_pre20230131.ebuild
+++ b/sys-apps/edid-decode/edid-decode-0_pre20230131.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="examples"
 
 src_compile() {
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 14282fe3e838..af0274e46642 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -10,6 +10,6 @@ DIST iproute2-6.12.0.tar.xz 925392 BLAKE2B 95aee769662e21c8c6223d09ee0ec365fcdeb
 DIST iproute2-6.13.0.tar.xz 927416 BLAKE2B bbebc44d1a7e35c410869a2a5884df09698ea3950acd126e5736a938718d40e57d539ff88ecd7827cbdf2f9481c3d728fff3948a61c2ba3e1483c5b7a7616577 SHA512 2e392a8ddc3d7662c3a72bba1c845587df85b7afc6efabf7df0ec2830bb1d4b16cac5bfb7a43dc3ac73adf0ea3fe3670824674d4f32209c6d1aa638a7cb7cd6c
 EBUILD iproute2-6.11.0-r2.ebuild 6106 BLAKE2B 87d1a285c669f862cc0bce9326ae482cf78fc5a25f36e111d3b98e434f9841f57acc5a9f2b442a99f5f60383055bd9a81683d7b634a57f941594764305bf95cc SHA512 3035309c205b9991973a47d53e9cc853770276a5c58af90148808a4d3c6f99573b41515342544f668ebb8d0e88912e6c1fa91d2a2d4c5ffa8cdcd371ab6b432e
 EBUILD iproute2-6.12.0.ebuild 6102 BLAKE2B d9438c9d727671e130f4e3f203ff4dd02fbc15aa795edeb23e30e33a4290de0ee15063521e8f996d93367d22ff484cd1138c2339608922d1ed672d5104618f01 SHA512 a3ac2e3572f6c26bd1493ff16f6d9d11e96dda39be9508f04ca10b95d191e421eac4ad7432e6ca6858a9383249abaed84dcf0b89df4c598b0654e00818a7a52a
-EBUILD iproute2-6.13.0.ebuild 6000 BLAKE2B e7df45f3855e6146c2dd90e6d5e2360796a9e9bae3137dd7b56a2bcb41e1ea10eb40c586feb6649e796cb890ce4dda369d498904bddd7afd5a11254765b9f55d SHA512 78607ee3cd1e95b1e781830457b20383369d66d8caa58b672c4ca48aef44ce7326fecff6d660ad124642239f4c60cf229452c2bb46d83443714cef344f05f097
+EBUILD iproute2-6.13.0.ebuild 5993 BLAKE2B 8318985875a4cd2310a03615f1fcb2d9f6a9c5c17f6c4ecf5d37fc8106134eeefeca76f1cc5060a20ca58b678d6f2d49de10f4818f066562f19106460be2ac5e SHA512 87a10cea39cb25c8ee021e6fa716e13fd5b78d022ddc279d6490487416de13602c7a5e20ec13debce95acb18a1c4e7e163ef8528cd4236a11d2f90d8da3903e4
 EBUILD iproute2-9999.ebuild 6000 BLAKE2B e7df45f3855e6146c2dd90e6d5e2360796a9e9bae3137dd7b56a2bcb41e1ea10eb40c586feb6649e796cb890ce4dda369d498904bddd7afd5a11254765b9f55d SHA512 78607ee3cd1e95b1e781830457b20383369d66d8caa58b672c4ca48aef44ce7326fecff6d660ad124642239f4c60cf229452c2bb46d83443714cef344f05f097
 MISC metadata.xml 887 BLAKE2B 28f816c12d798665f2e32e22ffd69dfda03e251bc6447a34e3ddbf0d5d00046c561b7f8282f73ed8609b3d9397da9bc2b1bf54d23bc82d5395af141e2448a3e3 SHA512 e5cafc242c2e4fe64df7456b3e001285933a680b674400ef53b2fc5f966f0c8551fc2ad7d07798d56eed365331ae01536d7b6d41fa5a710c1c2257900ce45d3e
diff --git a/sys-apps/iproute2/iproute2-6.13.0.ebuild b/sys-apps/iproute2/iproute2-6.13.0.ebuild
index dcaf60620faf..286b0dd42326 100644
--- a/sys-apps/iproute2/iproute2-6.13.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.13.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 173289153ea2..7ab26adbf49d 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -6,6 +6,6 @@ DIST man-pages-6.10.tar.xz 1878432 BLAKE2B 8f4e46616692aef9aafafb7c48353478ba5d7
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
 EBUILD man-pages-6.05.01.ebuild 3579 BLAKE2B 32a094672db701fff2484826852b678386518d03d08b48d23f3ef5b10b1f33317ade59cb4cbcd7f6ce8ead78cc02822fcbeda55e6c5f79317fcab76345eacaec SHA512 f9c2b94b12e6da4ca6f12ad8e317bc600a6f7ed510223e9ced39a7f80607aed35cd3cc3e764dd953a7edb7e58f86691f1fb292905bef4326aa97a24fb1d7a736
 EBUILD man-pages-6.06.ebuild 4306 BLAKE2B e72815cece4648fa08706e41be599f29ba9db82be5ccc6e9fb94dda006583f1acc85a40eb4f6737f1fc7df75f4c48cbfdaf873efd38dd077e733477256ea0455 SHA512 df990f926949ce477141ed39075122eb09ed8064584802405434d0358281193d2f3afe33b070dd41845855d709729a53a9c89d0ac16467b07904fa951cac5ca1
-EBUILD man-pages-6.10.ebuild 4277 BLAKE2B a3c3493728e8ad5e3adb28edd30040a7f243967b5fa6c9b35154a0568913e0bceb6e07a528343094b477b43d2eee657354f58a29a12f852aa4b0782d84da2b00 SHA512 71d99f0f675fd88a8f1ee23bace82173ef003dfd9ed825ad2edd2fe67a35f0483be17026aa5f9e78311e0e388f19d70fa2ad2ea02cd67d96efa7011142ae00c5
+EBUILD man-pages-6.10.ebuild 4269 BLAKE2B f30c7211a4d664a8e4a05c6130ff1989ed76f7960025075edbed2b93f854bb38ab28d6613dba87cb76d9597a3363ec073ea34f8ae1f0c88d29b4c0b2bd380364 SHA512 410ae1d3c488b3b810d1e24525fb081e4d4c9fc1df9bfd3f0db59d9a562a854f43edb7793097d61410767d540a5bd6779ceffa24155931ef658c44b6bcc5c5a7
 EBUILD man-pages-9999.ebuild 4271 BLAKE2B 3ed017c629b1224a94d70af70734de1b5f1dd0472cc20343a4e6202de1b7de531771dc23504483b059e36684c09313ad72a8dcfceff61f8e4f8bb6ed39c7b282 SHA512 fa9ac77058d11db94470ef5feb9856e475ddfaf699bdddb576ef5cc4bdc230fc7104997967bd4ec273516f244b910e6a1c29340689ce6cd09c535591ebcd9663
 MISC metadata.xml 277 BLAKE2B 866b0f11a1927de0a75083001a598aa5ff99fc21b3e2b61811bda22915df73776a2d0ffe350497964c95c47a050723d2573d7248589c5cce28ba83c2660736b9 SHA512 0f502e6d4e3e23c0c88e2d5f4ba641974d934a175a643ba2ad96cdd954a2ab26972794b6ca9a1b370536c6eade6798bcb9c89be0193d170320e1b0f302a2747f
diff --git a/sys-apps/man-pages/man-pages-6.10.ebuild b/sys-apps/man-pages/man-pages-6.10.ebuild
index 9a787b0cbe0d..ab6418681db0 100644
--- a/sys-apps/man-pages/man-pages-6.10.ebuild
+++ b/sys-apps/man-pages/man-pages-6.10.ebuild
@@ -52,7 +52,7 @@ else
 		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-alejandro-colomar )"
 	fi
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos"
 fi
 
 SRC_URI+="
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index b7c93891279f..7ee78dfb4852 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -3,5 +3,5 @@ DIST mawk-1.3.4-20240905.tgz.asc 729 BLAKE2B d4db8a008cac7e0a274de689ebef9fe5d7e
 DIST mawk-1.3.4-20250131.tgz 433213 BLAKE2B 7a23051cfdb23f2451c23b357e895e49532c2211bac8d092d1fff9f7ea08dc43661d1d78eca2cff2b45998854eb0f64265c400e8f9cb7df83769cb98f96ba716 SHA512 100b1f5ee190d2841d5dee449c53601a6d32453e47b232de919f3489f6f7040d0c6d21f6c7d30df616b04abde2db9799c5eb16570c1f88dbc10fcd75c5838042
 DIST mawk-1.3.4-20250131.tgz.asc 729 BLAKE2B 7432d1c06f0a5d9a4deec34bfb795f0b7b8e04d43e259b8baab5f033349bf331f94c3d541334ba886545855e682e7c7ec372e8f66585731b09ef3be44b426032 SHA512 0d8ac93bdafcd8915b0d2d2b675f8d5cf2aeba655cd04af4b4037336b74b320e02db360b7d18b796aedc09fbabc8a42e471766ea24219bad7a1cbff4f7679552
 EBUILD mawk-1.3.4_p20240905.ebuild 1083 BLAKE2B dc1ad5be667f8fd30971f22e8e5b1a91661b1c71ce4381cd5b482fe9eaf9f490edf0270f3aae7e3a81a963714f6b6b89a89b22db42f949fb62ee1e2d21cc3562 SHA512 9d877d7c9aa8d937c83518cb351f0343d1bc390b4caf51a665e8986cab683b70fd3b2ee44d0500c047b6b404b8c3067a0c4ec5b387df339a2c4786a42be5e80f
-EBUILD mawk-1.3.4_p20250131.ebuild 1091 BLAKE2B 593c9f7695a03343ecf24bfca8a3e490c19e5320410d2a251e5946864fc241218e14920f5b473c1fa963406997d6c34cd14a7f589246dfa5e9c9c786fc046bcf SHA512 6c0e4dac0d3833db817618effd1023c075d1eeb7e268e66a21554df9df6d0f1bb5c6c067f77e1d957ab2dafe7bd14fdcb07f2c8affdf77cb9f849319e4b2f4b2
+EBUILD mawk-1.3.4_p20250131.ebuild 1084 BLAKE2B 7f5fe53d5fc12528daf151a149ea26b2679ab1e66cde155065de076a06914d32cad3c65837f50e3eda0f7d2d2b3265154cc2a8e659a59c1903dae079a056ed5e SHA512 70f65bd18749176982fe397b8362344fb9ed6591457e75c9d003b7754c59728e32842b3ebe8c32cb286783f7a1c1997a29f779e1bc27cca5333deddc49864fc3
 MISC metadata.xml 422 BLAKE2B 8bd344848b5247eb1858b7cd31d91a796671c321610b826e602d9350e59769a4e6612438d9bf89ee2d6d63c327729d88a9ccb538b162beb816fde2910d0a4d9a SHA512 9adcc3c3b54ee935d3363e874e76f9e9b1efee00faac94184a84d10a6600dad4f11da51d4567acabf63707ca55f9b3d5ac3df107c6de8b38cad1da9891e82086
diff --git a/sys-apps/mawk/mawk-1.3.4_p20250131.ebuild b/sys-apps/mawk/mawk-1.3.4_p20250131.ebuild
index be8b392ab86d..c252e15c2781 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20250131.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20250131.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-thomasdickey-20240114 )"
 
diff --git a/sys-apps/nawk/Manifest b/sys-apps/nawk/Manifest
index 1864b0297ea8..c2845fd8f6dc 100644
--- a/sys-apps/nawk/Manifest
+++ b/sys-apps/nawk/Manifest
@@ -2,5 +2,5 @@ AUX nawk-20230909-big-endian.patch 1661 BLAKE2B 7d67e8c1df3e67eadc226885959b79f0
 DIST nawk-20230909.tar.gz 1833391 BLAKE2B 1a8dc9805d144953d6ad5d0539847b1d83661a8e2c0e029e13201ee44f5f6a29cf487c4368c8578d01577b99349968415503fb0c2f7f8f37f4a55fb57cec2b07 SHA512 28687dfbd797fb1f758bd356824110602045b7249a41f47e2cda15ac3d256d57260f1fc74119dc30fbb0e909295bd676a52ec24d3b3cc35e417d46a1749f856f
 DIST nawk-20250116.tar.gz 1845685 BLAKE2B c1c2d230953d169d7115ae7822154944a9930e0ae8c35bc019cd35835a20e73ea180df7576432d5aa031f60eb164ca2985c321f6cd44a98b5b5b234f5784e9a0 SHA512 3be63637bc1689e56d2eac9fa646e8bd89b8c4ccd4ad028a61c7c5d5e9f3490d3c49657488d39a62451b23f0935b81c5ecd812c92cef9e160f7377f4bd4fc711
 EBUILD nawk-20230909-r1.ebuild 1029 BLAKE2B a4b23164f8240c40bdc0ba7d457b0a9f4bf27dc4517e5d40b8fc57f847a861b150c2c2410ac73b1e201ab4f518139951d43c1f76f78bb36d27a8424d17648f17 SHA512 a4b68013258078a9b37b973936fd14551b6a69b8f7441c9b549d6d7ffb7e439cd753fda926a57c9ce92f784dca96bed725f01d345b691363347d1bd270e29938
-EBUILD nawk-20250116.ebuild 977 BLAKE2B 6b2ca83c111d311b4b734621660f3957e73ebeda6ba8b30d6ce5f21f8c6f7339e78566c8ff5fd796491240f9a22c12484d5159a1eec631556df2f3d5d711c441 SHA512 fd97e6a6afd3890b23f08dc8997e4f1c6179673a33b39c347678c4b81aca28df8953822519bef93f60b9024832d8804dfb18fe80116094f66fb52b1d229718ad
+EBUILD nawk-20250116.ebuild 970 BLAKE2B f76e8fff5556b5517cfab3cf795e66cbb4dd3c4f9b0f63eca599e05b6014dbde4a7fe77386c1d36b78bdffb5cc607d87af7434be470c18bd69c389bf5d8e4baf SHA512 f9fee948dc2c58b3f9338cfa16548eca547447f73aa15768ba514e3458c00324101fd9356fc281d9cd7628989e0e573e39346bd3d4b83179fd4a92a2565e9f3a
 MISC metadata.xml 337 BLAKE2B 39b318d3780c5249fbf02ea024166015bb8d7798da072dbaf95318ce222f9722cf86d04e9a7c8c92c27377f5b6e09e2d8c11906c9d4e1977102ff6611f1ee6fa SHA512 8dd91d8652fa219ac793b361e5ee2bdc5337c4c098a851a1d19bf03cf2eb9a0c5ef7087f2b4ab7f51a0492ee03a7ea471f990a717e20f492dd9a57c1111237f6
diff --git a/sys-apps/nawk/nawk-20250116.ebuild b/sys-apps/nawk/nawk-20250116.ebuild
index 46cfa3c820a5..4612fd779bbf 100644
--- a/sys-apps/nawk/nawk-20250116.ebuild
+++ b/sys-apps/nawk/nawk-20250116.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/awk-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux"
 
 BDEPEND="
 	app-alternatives/yacc
diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest
index 0f84f8fa7714..7ec31f3a74eb 100644
--- a/sys-apps/pcsc-tools/Manifest
+++ b/sys-apps/pcsc-tools/Manifest
@@ -6,5 +6,5 @@ DIST pcsc-tools-1.7.2.tar.bz2 387207 BLAKE2B 0337de4e1558100777e486f1ddbfd5da37f
 EBUILD pcsc-tools-1.6.2.ebuild 1343 BLAKE2B f2f7843d68c78d5d44ef49eac125f5c3484f92136d1ebad7462e0b2be1aea6a7c5debcf0309dfe0e50eb12ab8d94ccdfcd4159146f0257b7d585c927077b8d6e SHA512 761a3bd17e109df415ee556205d110dacf00f2fbec4cfbfd2df0eda03d7b865bc6c5c6f15a0a4dfa37c9f4afffd4f2837bf631d334317bfdf7b6f75734586403
 EBUILD pcsc-tools-1.7.0.ebuild 1404 BLAKE2B 7b866aa6b5bf3b8e3a4880613fc640fe38e558473b1e295c7853538f438bc19152e7143c3874ba601f35a42a9b6b7420d2e5baf7a7c01d8e47ea4e73acacd8cf SHA512 33a9a136826cdcbad5e6f5635bfb75acc742a374fcd3725b64e38aebf7c9e282ae98422a217298a49db386a5394297ffcc9c73fd96c60c54951de6d8407343af
 EBUILD pcsc-tools-1.7.1.ebuild 1404 BLAKE2B 7b866aa6b5bf3b8e3a4880613fc640fe38e558473b1e295c7853538f438bc19152e7143c3874ba601f35a42a9b6b7420d2e5baf7a7c01d8e47ea4e73acacd8cf SHA512 33a9a136826cdcbad5e6f5635bfb75acc742a374fcd3725b64e38aebf7c9e282ae98422a217298a49db386a5394297ffcc9c73fd96c60c54951de6d8407343af
-EBUILD pcsc-tools-1.7.2.ebuild 1408 BLAKE2B 4b24a8599af226be45c38dc74ea5ad662ea5dae22f735e30a893e22b33b2d143fa671360244eb9ceb4308a9b17717139d1dc1de6b479f61b0a13c02d17c9f895 SHA512 9ab49c6a75d614abd894c4d2376f4042a5675fbeef50e39f47b34a17d29bdad00a293287aabb379052ebd3e4acb234de2bc012f28937568845a3e2fa12e60033
+EBUILD pcsc-tools-1.7.2.ebuild 1404 BLAKE2B 61610ef153dd6ee31474e355400c50820f0b65fad60eb843450d77b853403897c54df594f6322a63b9a7e9f3acbf50a30e996e351be2d25e31ad046a8800a75e SHA512 7ee9a777959c54c103498f78e1d1f721fc2a0048f08d3f9341edc12193473b6133d6cf6567467a891dc15c4a3b99c5a8ed595f1cb49272f18cd75c06a3edd26b
 MISC metadata.xml 530 BLAKE2B f9a0c7d8938d6dd2616fc62108c567ac598d880cca2e7b43f8c4c6ce53799a340a319015f2c0bae0ee8cf0a62cb5d52722d070e01d45bc38837e4e87fb0e709b SHA512 22ccf135d86a9eeb75a0b3369c5931420a88dddf679bd1de70c8c34fee5920c188931660c29d00394b40041c7ac8af0e549d90a24d2213b5a53ac5202f16c5d7
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.7.2.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.7.2.ebuild
index 5647853fafa6..ea14cd2fedb9 100644
--- a/sys-apps/pcsc-tools/pcsc-tools-1.7.2.ebuild
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://pcsc-tools.apdu.fr/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 IUSE="gui network-cron nls"
 
 DEPEND=">=sys-apps/pcsc-lite-1.4.14"
diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest
index d64abca3c099..0890502b783f 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -3,7 +3,5 @@ AUX the_silver_searcher-2.1.0-lzma.patch 16900 BLAKE2B 80b7ed6ca050e155c07236c31
 AUX the_silver_searcher-2.2.0-lfs-fixup-config.patch 3087 BLAKE2B 89e71136161f60f2e792e0165bd1b5f2d73c98f7a49816ba73dfad3898a2763cb60704d2b2b64147837402468e7bf307c4dfe96ca7dfc27cd1afb3b2b2db8bab SHA512 1f720486b9f959439d226f8b8922ee5634a07ffa55af70522a3d07927a887dd963f6d08e0c0cb212f7f1382e95c1169ef4f44d5912e720e5f7e269bc843bfc56
 AUX the_silver_searcher-2.2.0-no_lfs64.patch 1375 BLAKE2B 008c2f6b647dcf97452c0fce2610219c8a762e3e5e3c825c8032104e6766364ff47ea8094413c60a3fc88cc4f03519e98d63aff71f62a73131544bf348b705af SHA512 6f951fcb635285c182f89d932933f92375637891d83f669ee5c3f4c62269d310be51761e3db5dbef3bcdc385f5744c4c35b8746a956f31ee5e9d12eea40b4905
 DIST the_silver_searcher-2.2.0_p20201217.tar.gz 165236 BLAKE2B eaf5e657b33d463048a83e08a90588448cb2fcd481b1f7f869e82c5e1ae1168a10dacb0d549dcc4acafb4323c96a9b67ff9e58de85f80bd2bd7e209ddc5ca6fa SHA512 96bc8da8ba10034bbb646bac71d479a21a68793e8af5377481da72c8dfa49ac99a1540c2b4193c4a95167127f1caa48fbd611ba367b8279bd2115549b6d8d126
-EBUILD the_silver_searcher-2.2.0_p20201217-r2.ebuild 1248 BLAKE2B 9478a97970b5fc43ef375e2ff6d31221d9cd88e01c68cd658d4d5bf933cc93489f87508b018573ebeaf49971fc8cf96fad2d1ff23926982bf56e98ab546b484f SHA512 33110751afa88d6ffa5005dac1c74d0149f589ccd9be55e91978a9e770c40aea964e095b1ddc82c6c148d4b85ff89b93f27c5ef13096dd060e393d9deaebaa17
-EBUILD the_silver_searcher-2.2.0_p20201217-r3.ebuild 1417 BLAKE2B ebcff15b708f6a4f132e80e34f4244fb17a1e0376531f265a3b80dd71a132a558b2f333052f9b74446fa0a24e335a0bbf866aa9d46ec4c9e7b12111dc9876eb9 SHA512 ebf346101bfe02b65cd144bd17223531edfb8e57a22e1f8386732b64b9b2ad18d60ec424bd9be88c489096c58c2766e01064de3b423b776003437a396f87a303
 EBUILD the_silver_searcher-2.2.0_p20201217-r4.ebuild 1462 BLAKE2B b5cb588410c6647ab40b43e19a64603ecbdb5d44399eef7cbeda1c4cb1309ce048ea432acaa61331b2b7f27f9c62c93447032a1996df42578416c02d4653fd68 SHA512 ad99c46764a41852f0b356a478eff7b9777dfa02da18af22ca99ef86e968517f55952e2b9538a22751468c958e29aa9399c96713005acb650556dd86ab798025
 MISC metadata.xml 259 BLAKE2B 703872b1e3d4395fbd05daec4fe759e9dee9578a64b1c252889402a61b4eb8a9549b0a9a238dd4a8eaf6af63a1e43b9b70aeb5641c1b9fa84c1a7ddfe0a22ef9 SHA512 9fb79b710b6e2ecde94d3c128b82fef372c64c87071aff04fc854a2734472c2a2587f2af37305a56dd950adcb2b94d4da1ac07ececf9a0db6e77000b5c12a1d3
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r2.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r2.ebuild
deleted file mode 100644
index 1b9f8c8a60bb..000000000000
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools bash-completion-r1 flag-o-matic vcs-snapshot
-
-COMMIT="a61f1780b64266587e7bc30f0f5f71c6cca97c0f"
-
-DESCRIPTION="A code-searching tool similar to ack, but faster"
-HOMEPAGE="https://github.com/ggreer/the_silver_searcher"
-SRC_URI="https://github.com/ggreer/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
-IUSE="lzma test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/libpcre
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		dev-util/cram
-		dev-vcs/git
-	)"
-
-DOCS="README.md"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-lzma.patch
-	"${FILESDIR}"/${PN}-2.2.0-no_lfs64.patch
-)
-
-src_prepare() {
-	sed '/^dist_bashcomp/d' -i Makefile.am || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# false positive TEXTRELs on riscv
-	# https://bugs.gentoo.org/797355
-	append-flags -fPIC
-
-	econf \
-		$(use_enable lzma) \
-		$(use_enable zlib)
-}
-
-src_test() {
-	cram -v tests/*.t || die "tests failed"
-}
-
-src_install() {
-	default
-	newbashcomp ag.bashcomp.sh ag
-}
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r3.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r3.ebuild
deleted file mode 100644
index 93ac9f8cc8f8..000000000000
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools bash-completion-r1 flag-o-matic vcs-snapshot
-
-COMMIT="a61f1780b64266587e7bc30f0f5f71c6cca97c0f"
-
-DESCRIPTION="A code-searching tool similar to ack, but faster"
-HOMEPAGE="https://github.com/ggreer/the_silver_searcher"
-SRC_URI="https://github.com/ggreer/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
-IUSE="lzma test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/libpcre
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		dev-util/cram
-		dev-vcs/git
-	)"
-
-DOCS="README.md"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-lzma.patch
-	"${FILESDIR}"/${PN}-2.2.0-no_lfs64.patch
-	# https://github.com/ggreer/the_silver_searcher/issues/1537
-	# broken with >=app-shells/bash-completion-2.12
-	"${FILESDIR}"/0001-bash-completion-port-to-v2-API.patch
-)
-
-src_prepare() {
-	sed '/^dist_bashcomp/d' -i Makefile.am || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# false positive TEXTRELs on riscv
-	# https://bugs.gentoo.org/797355
-	append-flags -fPIC
-
-	econf \
-		$(use_enable lzma) \
-		$(use_enable zlib)
-}
-
-src_test() {
-	cram -v tests/*.t || die "tests failed"
-}
-
-src_install() {
-	default
-	newbashcomp ag.bashcomp.sh ag
-}
diff --git a/sys-apps/usbredir/Manifest b/sys-apps/usbredir/Manifest
index 3b79db2b9188..15d42e80f90c 100644
--- a/sys-apps/usbredir/Manifest
+++ b/sys-apps/usbredir/Manifest
@@ -3,5 +3,5 @@ DIST usbredir-usbredir-0.14.0.tar.bz2 69515 BLAKE2B c521a08b789eade8947c4deac1c8
 DIST usbredir-usbredir-0.15.0.tar.bz2 69562 BLAKE2B 2702587950423b59f9c98c1e15a381803748f486e27b849236169ae62cdf75119286639bcb6a9d77dec245a0330caf4a1e7183f2a14b1f06daf12a75855e1b3f SHA512 5635ac1ab5e7d5f34fd48ae2f235c57b49ecd8736bedf4428f37dc03c300f26b57ed3a2044268ef74b1f2e6819415dfa5cf542dbacdc143d6c722a780f2dd345
 EBUILD usbredir-0.13.0-r1.ebuild 950 BLAKE2B 543cbf8e341261124a4d10a10e08765f758ca9bedc16c0662396e2e9ac23f2428711853638a3fa95c05ff3ae02607208747fca66c83c5ff2597ac45be83510f5 SHA512 57d8f4fb3a1c39af6fbbdac4e84ef72fb150d8673eee3996f7cee673fc7046b12e9183f8025a73427d21401888e4d3ed9296f25b99f79f5c206e15f8270e1e29
 EBUILD usbredir-0.14.0.ebuild 950 BLAKE2B 981a0fcff1d839344130ca4ea84c6a5960d461cad321abd7d0155628f702e775d590fea3db86e3e3ce65a95437201d16ee07b897e783d016730fe613e248f087 SHA512 b3147b64cdbbe9fd643feeff60da8c430e2eb5aa173944c80e26be9a82077cdc9c3064481f154afc5f439f56283827e9aab34230a449bc090b3161777a0fca2f
-EBUILD usbredir-0.15.0.ebuild 956 BLAKE2B 128fff845ac34903ac3cacfd930ee5ac95589cdec65b0460620cb3993567925cdccfa9394019442adb15698d417759f2acdcb1229749de91dda458e4d8b9e06f SHA512 bfb756131fe9ce90bb488b69ebf8b37f6f63b02a43b02cc3cf09bb8f192c340f1660ae6d41299998f6ba68588ad99d15d6871a2a34502b978c702c9729a5bd75
+EBUILD usbredir-0.15.0.ebuild 950 BLAKE2B 968546c035df7797b70d0c2887018b4b879a30411b498ba7d50d57f1d00ca1fcaf89c630670ce3d8b23db5773d5b88e3887e5418c4ef571b9b1ff5a8bcc90e55 SHA512 8b052edbc2954099ff543007a2df7242f6ca2f7eb825295d72ccceb44a596c0b0f38fa7d2f67b72868bb4e98674d44aa1d3e60ca489ad88232f23af3fd555ff5
 MISC metadata.xml 481 BLAKE2B 705eee8b08c628f347b7f31d7f45b2323660442520fd6644a41ca16bf28605f904b80a451e3821fbfe07362d09242bf2b041067ba19563052385f61efd5d67be SHA512 8d68d6428971fed1283fd6d0eb91819cf9b87a9b00efb228e437115d636f4eb7c3c1c6d07fb11697a3a6b825f1975b53431068675df0624be3a55ffed9efaf50
diff --git a/sys-apps/usbredir/usbredir-0.15.0.ebuild b/sys-apps/usbredir/usbredir-0.15.0.ebuild
index d8ded0bec6ba..7c00e96def8e 100644
--- a/sys-apps/usbredir/usbredir-0.15.0.ebuild
+++ b/sys-apps/usbredir/usbredir-0.15.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/usbredir-${P}
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/which/Manifest b/sys-apps/which/Manifest
index e6835085cdd6..a53ca8482071 100644
--- a/sys-apps/which/Manifest
+++ b/sys-apps/which/Manifest
@@ -1,5 +1,5 @@
 DIST which-2.21.tar.gz 149305 BLAKE2B 355888b0dfe3e4e1679a8a9e1255a935fa48be220408abc441fae69fe0b26bd39e0544ed20e75497ed5bccaa75e788d9aec17007c668f15eaf6b1599faa131a0 SHA512 d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61
 DIST which-2.23.tar.gz 201930 BLAKE2B 64a3ae1f23a4c389f945f6c0985e6f6062b46785125a0d0659ff160560a4a473633d38af71b1505beeabba8336f5a9906f1ba58ab3494635e970bd5529b3936f SHA512 738807f79e8cfc5967541a28ae7021247c04c4177279f09be2c19c069af450a7e3b19baf9079fe5569b25b4630bb400be242a123647e52c9fe54f0ad007317bf
 EBUILD which-2.21.ebuild 585 BLAKE2B bf0fee3337c761dc76e6a6e2ee9d04233a4fa6277d75f0328ed81465b636489a81e8358846adfede55d252900e2e9b21fcddd7381812ce5888beb33844317ba0 SHA512 7804ace758f358dce84611ccf9d98dbecf378ab5050bd7bc659404dfc4e26d3df2f1db79f9dc259ad0d6a2bb3c7dd075a34cb2e35055834aae1e1615e6965b9d
-EBUILD which-2.23.ebuild 579 BLAKE2B 3e692b62cb570b9319bafde68283e7cae83b76b2e61c61475b06d24b8e9fdb96db9180e75271fb25512a45856f497d4542e5994c76d3cd18b111f4cdfd1531b9 SHA512 327cbbb913c71a4da16c4006a1b2f655ee08fe4b47159028947a31f9fcf198c8a5d7b2ac1c1d6b66d4dd7275db864aca30494c6597a7c7f0f2b2bc615f34ab18
+EBUILD which-2.23.ebuild 572 BLAKE2B 7b46695d6bf970bd52e643aaeeeaf3617ebd68196dd8fc3c4832c85b4e61dfa9ff83d98511aa75d4a1cc0f88e2343280a3c39599bf19888c9dca45848c9a894c SHA512 bf3cb40e092035b3493e9a397563fd490cde3a734ea678b775a8f8f429cbdff13518b92bd52869d0b15ead67501f11e7540a66a47bca026e65cb2ae9638f41c7
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/which/which-2.23.ebuild b/sys-apps/which/which-2.23.ebuild
index 62bcd5206bbf..c06de7f3e1ca 100644
--- a/sys-apps/which/which-2.23.ebuild
+++ b/sys-apps/which/which-2.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 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"
+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"
 
 src_configure() {
 	tc-export AR