13 files changed, 10 insertions, 344 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 9c67baba64f2..ea4f20486e4f 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index b60941bb28a0..978b9c662445 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -6,5 +6,5 @@ DIST patch-6.8.2.xz 247244 BLAKE2B a85078230548543c38550a5546689d0b44a54208cdad5
 DIST patch-6.9.2.xz 16184 BLAKE2B 8a37e96c253b55b57c86f1654f2ea8bf65af96b1b38213e90032cb918bb8eea992d6ddbfa6a6774a229ab2e2288ab57bdb6cbad6e7e393c123f24850e06847c9 SHA512 a27af24f0caaa5de3811b6db5acc2d72b96df9ebb5c44bad99a949d871fb06c6ffd2be10cfc35b246d430c7be2291701f802aed47eaa8818ad12b8818a60f3ec
 EBUILD bpftool-6.8.2.ebuild 3101 BLAKE2B b032c5133f13d0a2f789a08fa054bd5d88cc729026974189d20b9d91f6295fdbad39056acc1223e78923b6201d91799c8cb833948135bccf25b84b4c25f00d5d SHA512 1efcf7572c1aa378394f38d2b939752aaf3215f92ffa227c493d0e3e9c8f945bcca82f759487386cd62e9c5996400395a944962f61af20fc62f8a206b57740d5
 EBUILD bpftool-6.9.2.ebuild 3125 BLAKE2B a8395a94a01d8fe758246cc158713ca30f928aa4051380f6fbb4a285f7a16a223db02b199b422242adca3df4032d79daa20b9420f3a4543aeefca128e41ddfad SHA512 3931abd489a3cbb7aaaf4ea8fd004a45c4a27c8a645fb7eb5088fab3186ebc59b61d58e4b0704dd1c264eee50a95288ad1824af0aff482da306c282465d3013b
-EBUILD bpftool-7.5.0.ebuild 3114 BLAKE2B dc70c80e66f00283994cceebc3ccb2349e98d9f366cbdb1eb4c2bb41469aa8f9fddf1c0b502d5c90a5c84bb5242547271a69caca34591ff4380808c569a1b290 SHA512 bffab4a310e3876bf7c94d1d18408fe32ef0d0e8efd1372e46a8c1b2396180fea57e7081479358e3fa83403c2625d17d2bcce03d63329f14a653354341102dc3
+EBUILD bpftool-7.5.0.ebuild 3132 BLAKE2B 95deb5713bd69d0c18096a9a71f96f17e330b8c170f56d9bb3357713e7f995a3cc08101dcab10c3ba13e6eade7ae9da8d749197c4d37bbb93ff744233ba5ac83 SHA512 24145eb9b842c7f766ea798b122038e6fd93dc3a99607129e44f81e232f1f4dae14bf4009b4d1422e894ed5d4e62853666c4aea86b9011f6932998d871132010
 MISC metadata.xml 576 BLAKE2B 43e31ea0f23589a48d8169dfff0ae2a18fd665c7fe323d454ad9a6f13b46f39886ce92bf7ce1fc1f047fd25b1a6085e873234a1c9d30462251ad7c56ea7ef731 SHA512 bd878bf328a7bd08614e5a152d6f8f653d2faf30cecbdb94af9fb11662e19252ef96df921588260dd90b55c981babd0c92766aa6ae2b04638364c761887e1cea
diff --git a/dev-util/bpftool/bpftool-7.5.0.ebuild b/dev-util/bpftool/bpftool-7.5.0.ebuild
index 1e317304dc31..9a93a41059b6 100644
--- a/dev-util/bpftool/bpftool-7.5.0.ebuild
+++ b/dev-util/bpftool/bpftool-7.5.0.ebuild
@@ -11,14 +11,14 @@ DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and ma
 HOMEPAGE="https://kernel.org/"
 
 # Use PV to indicate the full kernel version
-PV=6.10
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
+MY_PV=6.10
+LINUX_V="${MY_PV:0:1}.x"
+LINUX_VER=$(ver_cut 1-2 ${MY_PV})
 
 LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
 SRC_URI+="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
-LINUX_PATCH=patch-${PV}.xz
+LINUX_PATCH=patch-${MY_PV}.xz
 SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
 
 S_K="${WORKDIR}/linux-${LINUX_VER}"
diff --git a/dev-util/cucumber-html-formatter/Manifest b/dev-util/cucumber-html-formatter/Manifest
index 2a4529851e69..5aa2dfbe2a35 100644
--- a/dev-util/cucumber-html-formatter/Manifest
+++ b/dev-util/cucumber-html-formatter/Manifest
@@ -1,13 +1,10 @@
 DIST cucumber-html-formatter-19.2.0.gem 478720 BLAKE2B 1f2f6b2f93d63207cb2bb6e23ad14d71eb06a8363c7af7f417e4755ffffb2beabe8502ed5d82a881c072b911a42cb1fc2f1809e7326c223c00c25a36482d052b SHA512 c5f1453677b4df5e9091721bbb15a522f5c91cbcb2cb11a8c1d8f2577d8b3b93810698447a1fe1f2b80dc52a1bf798ffcb876b2c728ceaf109f1997a2fdde249
 DIST cucumber-html-formatter-20.4.0.gem 592896 BLAKE2B 48fcdc7dacf354973b25c745c0f86334f882766e6d3776cdcbdbf574b69bd01550d43417fbb55d99c01f8485d174dd3e64a3b4aaeb33a577c3ab3b87318029c0 SHA512 c60b8a084bd0c05c9659e9cfb327194975d9eabf6dd39e282d3ff343df740f0fd13a2d854d3b095064ea3df04e73ba0324102f5fbd05b3cf98498420a036005e
-DIST cucumber-html-formatter-21.2.0.gem 267776 BLAKE2B 8d99b8cebd4722f390740e0a9868d1e1f53c42556689e401948d1d9c7dca8b717fc5870aa7ceec9796d91bb2df3e5311ee073260b914f15071bca3efe5f316b0 SHA512 a6dbda14941a3290a6b2502dccbf980b39adb65ccfc6135ecd4bf09d9f4474d48c4dffa0d86d9d1da71dd9fe973e7ad14584ee3c367d7cfe948fd83e7bf9ade2
-DIST cucumber-html-formatter-21.3.0.gem 271872 BLAKE2B 8eaad29c6a67f0dc897cb6e26defc35020ee63e8e76ff20632e56adec3097329da1eeb207cbc1d82ac64dde7f97352838f00d9363f1de80599fdc17fb1bd7d1e SHA512 3cb4c21d58734bd2bab683ee43f77ee9636098c3b388c41bc379d671a9a92ddbaf130dd941f7d622d5c25c06c556fe4a3adda2426e99b2688ecbdff596ea1364
 DIST cucumber-html-formatter-21.3.1.gem 272384 BLAKE2B cc6dd87f1a3ecf312b0310a032fe26d7177edfd0242e9f98f817e3b11882cf4e5244b6fe43408aee9cec715374c5051087f3eaa9b5b38e5bed4ebec108ffc5f9 SHA512 04fe71ef8dca04491737f61fe0b6858f85ba09cc78a2796f20055612b4125b877faf8b6fc3b0dda2c6e3809ee6360f6bc97c8a7422b8e7beccb67d024b18c894
+DIST cucumber-html-formatter-21.4.1.gem 273920 BLAKE2B c0fb1402118d5aa670346953a5f9322fe848e1006ef8b3cf5e8169d46269d8d15c1d452301c167220fefce1775e311282bbd3d9ede9088440f8148b67ea0e691 SHA512 968b74210c34b227e66b614c613333b683097e425747d54f0cf0f76360cc0f97095022bfb94737bd882b766ba5db1264057c753d341585eedb94f891993e09fb
 EBUILD cucumber-html-formatter-19.2.0-r1.ebuild 752 BLAKE2B ece79750cc0d8ab615f1e56932022d24c92647113bc5fe02e3820fd5b5ed0fac5955d36a9731fd474ceea9c25bd9f30460fc328037edeec3e6dbb17acca90f16 SHA512 dee9d4ae279463d8fa3664add041a5dd660767065425a6a186eef4aae41aca8b564f5e3e2f111407f0b35e50f955fe2add2344ad3b5c62234542880360f7c0d3
 EBUILD cucumber-html-formatter-19.2.0.ebuild 827 BLAKE2B d68245d50802cfa4c2cd02eedabb1802f641383664ddd2fe773aa4120a5a43bfed12ccded0a2a0ab5ca867af378d5bf61d443c8ad2a98fc8d79b6e674a38ca8e SHA512 e54da455489c703328741ea3044b0f5cba67a23a9bcf0869e2821ec103ecb27db1ba08b4a7bb8802844933e1e9cc1960a52e1069401c07256f4f6e4d784c6ac4
 EBUILD cucumber-html-formatter-20.4.0-r1.ebuild 732 BLAKE2B 33d09cce40794e8385213789a3ad8eca20accd4d2397b1a793086edc0ab142f2eabe45ee7c33933a69e9b2985e954c7d2df318d7c04a4b7d1afad19d61faef3c SHA512 ff1c4d803591f0f92ef7a878f1a90a2ca56ca05860519496070a9ed8801a598319da8450f9c8b7ca29be25c8901bffd0c8adedcfd8e76b09b260fccef1fbdc02
-EBUILD cucumber-html-formatter-20.4.0.ebuild 708 BLAKE2B 2626d3b30c85d2c785a48858603f30e474311623491772a81ff6ddede0726bc9a7427a12f7e27635f3accda3c7b0d275c4dd5776bb3fbb8562692c24d32fb488 SHA512 8a37dab5465585365c22be0086cfc426dbda9f19db2d5b1944615dc89dbb4ccb0d0316e19de2ce90eedcc878909e50b2852710962fdb2a914cc342fb6280c9e4
-EBUILD cucumber-html-formatter-21.2.0.ebuild 818 BLAKE2B 6576c6b030c28eb649aed463b10f4723050cf34091c262aa451508f845d8ddc545c6e0000a066a474f7c48d25df50192f9382a6c6cbc4288b95452eeca7929c0 SHA512 17b22013e4d417bfd1a5d09cf25840fa2e6d6a38b5a3c331efb5a3b3dde5b8e68f98e32863cb0823503645f5331c2146ce6e0876067f03003b632f9562220f58
-EBUILD cucumber-html-formatter-21.3.0.ebuild 818 BLAKE2B 6576c6b030c28eb649aed463b10f4723050cf34091c262aa451508f845d8ddc545c6e0000a066a474f7c48d25df50192f9382a6c6cbc4288b95452eeca7929c0 SHA512 17b22013e4d417bfd1a5d09cf25840fa2e6d6a38b5a3c331efb5a3b3dde5b8e68f98e32863cb0823503645f5331c2146ce6e0876067f03003b632f9562220f58
 EBUILD cucumber-html-formatter-21.3.1.ebuild 818 BLAKE2B 6576c6b030c28eb649aed463b10f4723050cf34091c262aa451508f845d8ddc545c6e0000a066a474f7c48d25df50192f9382a6c6cbc4288b95452eeca7929c0 SHA512 17b22013e4d417bfd1a5d09cf25840fa2e6d6a38b5a3c331efb5a3b3dde5b8e68f98e32863cb0823503645f5331c2146ce6e0876067f03003b632f9562220f58
+EBUILD cucumber-html-formatter-21.4.1.ebuild 818 BLAKE2B f3da608dc2efb52915a1bc43d122f329534f7902fd21741d6478d0b77aa5043dd62cdf567c5dab50311bd23c1a8c20ef58e91c50ff678ddaaf141dd013722a26 SHA512 22c99990c5974c2a96dae8adaf49ea9a000edd1900bb050b9d278697fe1011eaf6ef2dba20073c9c2cf115bf6cc24f6d6c4330f915c285521716467546cb4e19
 MISC metadata.xml 371 BLAKE2B c7647643f6a224e97cfdc14a5533fc33d30342c19b894573c357691058f54fcfe00139de5ffb9bca48ec25950e03976260d1e92c9e81c051696288be306f353e SHA512 19bfa2565e0171203dad40fcd5093b1f73f8e9ce663e4f916bf0c8037003256b648439496171ff22fb6da9d1ca4c93b5ffec9f65555b7c62712bfee0bb9ce15c
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-20.4.0.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-20.4.0.ebuild
deleted file mode 100644
index ecefcef2d20c..000000000000
--- a/dev-util/cucumber-html-formatter/cucumber-html-formatter-20.4.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HTML formatter for Cucumber"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-messages-19.0.0:19
-	!<dev-util/cucumber-html-formatter-19.2.0-r1
-"
-
-ruby_add_bdepend "
-	test? ( dev-util/cucumber-compatibility-kit:10 )
-"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "cucumber-messages", "~>19.0"' spec/*_spec.rb || die
-}
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.3.0.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.3.0.ebuild
deleted file mode 100644
index 3d108c72cb09..000000000000
--- a/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HTML formatter for Cucumber"
-HOMEPAGE="https://cucumber.io/"
-
-# Can be used for specs but requires assets to be created from npm
-#SRC_URI="https://github.com/cucumber/html-formatter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-#RUBY_S="html-formatter-${PV}/ruby"
-
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
-IUSE="test"
-
-# Specs are no longer available in the distributed gem
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-util/cucumber-messages:22
-	!<dev-util/cucumber-html-formatter-20.4.0-r1:20
-"
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.2.0.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.4.1.ebuild
index 3d108c72cb09..c6870e49ecfa 100644
--- a/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.2.0.ebuild
+++ b/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.4.1.ebuild
@@ -18,8 +18,8 @@ HOMEPAGE="https://cucumber.io/"
 
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 
 # Specs are no longer available in the distributed gem
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index c674860a3974..d670611b825a 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,13 +1,7 @@
 DIST cucumber-8.0.0.tar.gz 412254 BLAKE2B 8e86ca726a85afeb6d80799c3b2cf633e4949bacb9ad65b41d3baf37f642b9032d57b4e66cca15cbababcdbe5541ce2cd0d23b113897dedbd7cbfb5c85283a00 SHA512 33e9abeb33c7924c3eedfcf477019a782cd813a004e35dcdeb0878b6dea920ba870023b6c8a60c8de810ff231378fa67969208611ce8e9199ae2611d3f6f1f99
-DIST cucumber-9.0.2.tar.gz 410190 BLAKE2B db11ade6c97ca9ea51820c0b0fc394012eb8668bede0b8d60376075208eb569ab0925263b4f46286234f260ca52dd7987adfbc069616fbd2edda00cc0a41d779 SHA512 573f4182e901597487993299985b9b9bdec93f19c11b26d2fd34a14b76364630c8d0d3f2b1ee3c6f1ca59d49c155cae397bcf8e0e6fb8fe748105d68e8c846cf
-DIST cucumber-9.1.0.tar.gz 407729 BLAKE2B c0d654124b71d58677569ce29d81c169176d6945ea5bb3c537326c2c3543922652bc83e7728be25e10e712ee1981076fd185b147b3f303bc59f103c01f4295f8 SHA512 f6783d6f0df19d227fc2a77f6f16c496ea323b3937aca5236acc7c680be5b633ea7a942de12670f88ba60b65493224153601c5e0c61fc99861e9935a2ff8990d
-DIST cucumber-9.1.1.tar.gz 404818 BLAKE2B 61696bfaf38ed0c4b89bc15ff36d306e1d04ce11062d149a399e89cbe88ddf5fd56236d7ecc18928731600db22df2009ef954045c4bfb8135496d63181d68496 SHA512 c25b3c20f25b2e73ea8f3073976f9da533beb7ad5efd043de46cfe847c104c0a7352e9841313015673d6d247051bcedb65bee4da362cb873799406975c24e149
 DIST cucumber-9.1.2.tar.gz 424404 BLAKE2B 4e4dd3cef2dc933aa2a1da3e2840ce7ba451607262f8b1cd963658d5e7d81689e5e2f30740e135f9fcdc9a15227f7b94ba40b2bc07dd3849c1e8bb4eda4bc659 SHA512 cacfd23e761dd5f6af030525e06c59c6f410c15ad3d2826745d4a38db95ecb32e556e05dadd3e2d822b4bf8fa1529124d112f35bb649230a4c20a7c822318b04
 DIST cucumber-9.2.0.tar.gz 425211 BLAKE2B 4bbd9b0ecf2d3e3a06d9ca36f512b67b7f776185c1888987cd247fdf457150f96a30b1d33d2b76605efe71a51e1866ae595b77458dcf63eabac2974db0932027 SHA512 4685647167268621488fc0144f24f44cc4dd684206298cd20b9a2efbbbcc43f5b05223e4d1e9c8b6b29c552eac31d8471c12c59d5fec7463a28c8f8ebd20159a
 EBUILD cucumber-8.0.0.ebuild 2563 BLAKE2B 52f3985affbef319901f855a0bab09caafb5a4dddbc4d6c1dc3099696e827ef4242cabc4ff48513a80be3d95c812cfde26cb56f8010b50fecf5c83beb0905c83 SHA512 988bbab9d390c01e2d2953aca18e89552b40f4c3c053800bc4351269e9125d96d9c5355e878fa3210b57d6c7c9e1ceefff7b39fbc36ad67a10d6924bba20d462
-EBUILD cucumber-9.0.2.ebuild 2560 BLAKE2B c183be27f8733e7f1707ee2c5966a851fee4fc9ed8674e74ee33dd2738df83c0c1cccfefdcdced08cfae5e27438b1f455a5a76489782a6fb13cd303eba66d455 SHA512 b113e2c8d7eb8cb7ba16123a18082b03766151be59eab6b607ed74a8ff3b7d87037cd679ce7b73a13084fc76252b17106553aecf26cab8f097b6f85e83c9d20f
-EBUILD cucumber-9.1.0.ebuild 2606 BLAKE2B 59e9f6d2d3713f08755c6d896ea54e00ec08fd241e48664614ab9f8bbc6c007c4283032f1fbf346da3545452b1670fcd311768b3fae0a901f66fe159a1f7ebbb SHA512 3eccde5f73ebad985c36881b1eb3d2ce51cfd64f0b9044d687c38ee5933493b65d7e4353f2ca2f07d0ee472fb2e373ca6e1db38a19a7f9c4af3615cba2176e1e
-EBUILD cucumber-9.1.1.ebuild 2606 BLAKE2B 59e9f6d2d3713f08755c6d896ea54e00ec08fd241e48664614ab9f8bbc6c007c4283032f1fbf346da3545452b1670fcd311768b3fae0a901f66fe159a1f7ebbb SHA512 3eccde5f73ebad985c36881b1eb3d2ce51cfd64f0b9044d687c38ee5933493b65d7e4353f2ca2f07d0ee472fb2e373ca6e1db38a19a7f9c4af3615cba2176e1e
 EBUILD cucumber-9.1.2.ebuild 2614 BLAKE2B cbed5b269c18c0b94928c17a1b08dfdffaa8c4f9f7acb7f04c2e5d3600353daf32e4571e026340711dba801372f6dd5033502499a288439ed88663d818c01dd6 SHA512 cbca5dd59aa785ab1bb4fe18d911f3fae76f7c9f2e0c9c0ede019317d44e445ff12602b86398dac53066b6e6ff1e3090b566b8591673f5bcb74d0320b8c25446
 EBUILD cucumber-9.2.0.ebuild 2607 BLAKE2B 5b24995dc443c9d27d9af61a0c5141877bea98bea649818d19f22d47d46607c3f4c5ba893794e4471234ed3860262c1c1984ae1f43def0b9cbc5f0ee6862c28a SHA512 969e952576577e7a97b11833119c835b165fb3d49b7ec1541fc29fd6d9e789eb8a27da278fa08095a1f1e20eb14e1debd09a9e150b1ccc626297fcc4fd525ceb
 MISC metadata.xml 360 BLAKE2B b66a3bae14c4ddd0801c27b52bf5e6445329ac2e3a06d9aecdbdc86624700be85a67cac775f195d8c67de900660f8f612906c85394a0761b4a31e1863c8fb396 SHA512 03b7395abe6033b07ca481220061b5c52c5cb97af5a97e9b1631d37144c815bf9f192f3c973e7954ee1c32dee1db0134b9e9799b73d65be17094b9abd1fab9f0
diff --git a/dev-util/cucumber/cucumber-9.0.2.ebuild b/dev-util/cucumber/cucumber-9.0.2.ebuild
deleted file mode 100644
index 4da94ec2abf8..000000000000
--- a/dev-util/cucumber/cucumber-9.0.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
-
-RUBY_FAKEGEM_BINWRAP="cucumber"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://cucumber.io/"
-SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		dev-ruby/rspec:3
-		>=dev-ruby/nokogiri-1.12.5
-		>=dev-ruby/syntax-1.0.0
-		dev-ruby/json
-		>=dev-util/cucumber-3
-		>=dev-util/cucumber-compatibility-kit-9.2.1-r1:9
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/builder-3.2.4:3.2
-	>=dev-util/cucumber-ci-environment-9.2.0:9
-	>=dev-util/cucumber-core-11.1.0:11
-	>=dev-util/cucumber-cucumber-expressions-16.1.2:16
-	dev-util/cucumber-gherkin:25
-	>=dev-util/cucumber-html-formatter-20.4.0:20
-	dev-util/cucumber-messages:19
-	>=dev-ruby/diff-lcs-1.5.0:0
-	>=dev-ruby/mini_mime-1.1.5:0
-	>=dev-ruby/multi_test-1.1.0:1
-	>=dev-ruby/sys-uname-1.2.3:1
-"
-
-all_ruby_prepare() {
-	# Remove development dependencies from the gemspec that we don't
-	# need or can't satisfy.
-	sed -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|rubyzip\)/d' \
-		-e "/json/ s/, '~> 1.8.6'//" \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on unpackaged packages
-	sed -i -e '/\(cucumber-pro\|webrick\)/ s:^:#:' Gemfile || die
-
-	# Avoid specs failing due to differing deprecation message
-	rm -f spec/cucumber/deprecate_spec.rb || die
-
-	# Avoid failing features on new delegate and forwardable behavior in ruby
-#	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
-
-	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
-
-	rm -f Gemfile.lock || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/cucumber/cucumber-9.1.0.ebuild b/dev-util/cucumber/cucumber-9.1.0.ebuild
deleted file mode 100644
index d7a52d6e8c96..000000000000
--- a/dev-util/cucumber/cucumber-9.1.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
-
-RUBY_FAKEGEM_BINWRAP="cucumber"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://cucumber.io/"
-SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		dev-ruby/rspec:3
-		>=dev-ruby/nokogiri-1.12.5
-		>=dev-ruby/syntax-1.0.0
-		dev-ruby/json
-		>=dev-util/cucumber-3
-		dev-util/cucumber-compatibility-kit:14
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/builder-3.2.4:3.2
-	>=dev-util/cucumber-ci-environment-9.2.0:9
-	dev-util/cucumber-core:12
-	dev-util/cucumber-cucumber-expressions:17
-	dev-util/cucumber-gherkin:25
-	>=dev-util/cucumber-html-formatter-20.4.0:20
-	dev-util/cucumber-messages:22
-	>=dev-ruby/diff-lcs-1.5.0:0
-	>=dev-ruby/mini_mime-1.1.5:0
-	>=dev-ruby/multi_test-1.1.0:1
-	>=dev-ruby/sys-uname-1.2.3:1
-"
-
-all_ruby_prepare() {
-	# Remove development dependencies from the gemspec that we don't
-	# need or can't satisfy.
-	sed -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|rubyzip\)/d' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on unpackaged packages
-	sed -i -e '/\(cucumber-pro\|webrick\)/ s:^:#:' Gemfile || die
-
-	# Avoid specs that call out to an installed cucumber version
-	rm -f spec/cck/cck_spec.rb || die
-
-	# Avoid specs failing due to differing deprecation message
-	# rm -f spec/cucumber/deprecate_spec.rb || die
-
-	# Avoid failing features on new delegate and forwardable behavior in ruby
-#	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
-
-	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
-
-	rm -f Gemfile.lock || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/cucumber/cucumber-9.1.1.ebuild b/dev-util/cucumber/cucumber-9.1.1.ebuild
deleted file mode 100644
index d7a52d6e8c96..000000000000
--- a/dev-util/cucumber/cucumber-9.1.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
-
-RUBY_FAKEGEM_BINWRAP="cucumber"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://cucumber.io/"
-SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		dev-ruby/rspec:3
-		>=dev-ruby/nokogiri-1.12.5
-		>=dev-ruby/syntax-1.0.0
-		dev-ruby/json
-		>=dev-util/cucumber-3
-		dev-util/cucumber-compatibility-kit:14
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/builder-3.2.4:3.2
-	>=dev-util/cucumber-ci-environment-9.2.0:9
-	dev-util/cucumber-core:12
-	dev-util/cucumber-cucumber-expressions:17
-	dev-util/cucumber-gherkin:25
-	>=dev-util/cucumber-html-formatter-20.4.0:20
-	dev-util/cucumber-messages:22
-	>=dev-ruby/diff-lcs-1.5.0:0
-	>=dev-ruby/mini_mime-1.1.5:0
-	>=dev-ruby/multi_test-1.1.0:1
-	>=dev-ruby/sys-uname-1.2.3:1
-"
-
-all_ruby_prepare() {
-	# Remove development dependencies from the gemspec that we don't
-	# need or can't satisfy.
-	sed -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|rubyzip\)/d' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on unpackaged packages
-	sed -i -e '/\(cucumber-pro\|webrick\)/ s:^:#:' Gemfile || die
-
-	# Avoid specs that call out to an installed cucumber version
-	rm -f spec/cck/cck_spec.rb || die
-
-	# Avoid specs failing due to differing deprecation message
-	# rm -f spec/cucumber/deprecate_spec.rb || die
-
-	# Avoid failing features on new delegate and forwardable behavior in ruby
-#	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
-
-	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
-
-	rm -f Gemfile.lock || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/librnp/Manifest b/dev-util/librnp/Manifest
index 7c01b75b937b..336e1d8dd854 100644
--- a/dev-util/librnp/Manifest
+++ b/dev-util/librnp/Manifest
@@ -2,5 +2,5 @@ AUX librnp-0.17.0-dont-bundle-sexp.patch 1073 BLAKE2B be3a0068f0134aea8347be9f95
 DIST librnp-0.17.0.tar.gz 2996461 BLAKE2B 9a6ea0452f067464ef52cef395c2969ba9912c5ed32ac6f4d860a3410965dbfbb1ad5c0d4f25489011d869222a4362a90463f521efe5af4b7c412f0ed1e4570b SHA512 0aa5262aa3be163b8a8931d6b9200ced52bb640cd7b02b50009cfb8d5fe1e664d27b2c4a0a3e534cf59d6ea42fbc1c62c970a07cadc27ab6962e0f69f996f74d
 DIST librnp-0.17.1.tar.gz 3515288 BLAKE2B 279cd5c669b469112066c4754a9a5a5c9fbe3ba225be4f85bc507aad9f29cfa166f90cb3dfe83ea8e29964fdfbbf926438fb36bb345da494ed7f70586fa8d7b6 SHA512 0224f79e4dd4b72ddd9c191218327da5485ed1d81321cc3a167cfeea68c00e47cec9151a4177e65e5560039345db3a52e41a093adfdf833f57e867bc559494a5
 EBUILD librnp-0.17.0-r3.ebuild 1932 BLAKE2B 5ec8fe6ba0119f30f81201cff3dd4b669741b4bbdb3db65996bf1bb23e5267fb552a75edffa00e5d4e9b2f178ab50ad8c539c5d6532d8d041cba531484c20758 SHA512 f3b43221e5ce01ae2a64e4c418a04000b9c0d7ef5020f7ef50d2960d5ee95bde15298beed85e5015a5e383b36eece1120391b000513e68aaa8b2e3e92806f032
-EBUILD librnp-0.17.1-r1.ebuild 1878 BLAKE2B 1f0d7ba0e07b9a13d7a219527eec09052fadeb6dbbe3169df861ea61463ff191fb1d6ce8d050ccd69e550a91c2f8a2514e677dbf58514946bc2e9828d32cc0b5 SHA512 8293c14787ca727da194601e0e52fdeda7160d862a08a7417b816147448c251af8b007e94bc552989b53878f1a793a58a3a2c51c6880dfee615b1879a8552569
+EBUILD librnp-0.17.1-r1.ebuild 1877 BLAKE2B 24396a654d81d72342f9fb4b8b059043f62cfa030deee7f38ab0aa43987553fe70118c74f286a28519705bbf5ab482d53154535dcf29822d3942aecd850c1261 SHA512 1b53ab95d4534bb46eb020b9fd5e4d82cfcdc40ca3895e0b0d2a48837971a0ea9352ec28277a4458a4e6815b869d231cf8e2bc29f64418deb6b9db6260bd9190
 MISC metadata.xml 430 BLAKE2B 739d6cddc56f385ad2b1679f6b3d9ba567ce77ec536894ca3861ad7ad127fd60c395db49b31d89963df12c03d8cf69fc6f083f5d3361b790079952c1e76ccf03 SHA512 ad7b3e6332741e1f2eae9e158d5ca767f5985a8f5c86eb5f21b7ee0214b9c7fdd2e90beddf1a9287218edf35aff39bd7ff1a4f1d15eb10552ab664738f8d1959
diff --git a/dev-util/librnp/librnp-0.17.1-r1.ebuild b/dev-util/librnp/librnp-0.17.1-r1.ebuild
index fad0047b4e0e..d1db4721c531 100644
--- a/dev-util/librnp/librnp-0.17.1-r1.ebuild
+++ b/dev-util/librnp/librnp-0.17.1-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/*lib/}"
 
 LICENSE="Apache-2.0 BSD BSD-2"
 SLOT="0/0.16.1"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~x86"
 
 IUSE="+botan man test"
 RESTRICT="!test? ( test )"