gentoo auto-resync : 10:04:2023 - 17:37:14

23 files changed, 44 insertions, 153 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 89d75678bd4c..179339962590 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index a3a276718dda..b97f27433f7a 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,5 +1,5 @@
-DIST CLion-2022.2.4.tar.gz 895935196 BLAKE2B d14fa5bfd91df50f48fcc581133ac1292476fa6706eb486f020141d4addf6d902294766ec9e848974d3e10a31668307c32ef2d7e8db42d65c53d3f36bff4e7dc SHA512 af9cc8a0768877e9fa997655ac3bb5e8fc0fe1128902707bca8574855cce99de855a866d8fdef9c53ef970dfae6bce9edbb2b763dd49df1dc76d45ef85115dc0
 DIST CLion-2022.3.2.tar.gz 847111855 BLAKE2B 7e1814bcc683126f51eefd350b3d171a22d320ec658bc24b8831db1198756c59ee1be951665d10f2c3e76831f0d8ab55c0ae5fd9abeae0acf4e7009ce00f1faa SHA512 7ca87933323c0e1a4800eb75fbe40d179af987f33de51bca0e6b35264aaffea991712187719b837e07bd11457f8891f9f6038fb10f4e3157170d7818179b7531
-EBUILD clion-2022.2.4.ebuild 2921 BLAKE2B 4150a87c2b0a153e804e4c6a4b55bc4a4dcb2db5b1734696254e1733a7b679dd5acb1bf9ba6e2e08c8a5a01a0175c3dbd67537f6949925dbeac7da4b53c8e7f3 SHA512 e384e940f1e1e43250ff3fda8a2991df31e006d0e81080f3d951ede68481e52d6e93813050d6d647d0bbdd3164734956ac0c6cbc8585af3aefe4eeb1293b736e
+DIST CLion-2023.1.tar.gz 856517982 BLAKE2B ed3460070e235a93929dba016775cf4afd845cf99c2732d927a9296ba053bfc75129bcb568aa2a2a413e2b3244c2791cf264b9c1f2219888d04d8d7b46064378 SHA512 b80625f32437baf3aceac284c266246dc76f780fb624bd43588b7f767e807fe3a56b993076bcbf56007f062f2a449529bca5b4fc19505e6d1a92f90c22586f51
 EBUILD clion-2022.3.2.ebuild 2745 BLAKE2B 626a8a4365d67f3a21bc9ee5a7a822b8d4b18831baacd471ccdd7277a3e9a694cf261474c5534d83110e9b4d65a23a102d68a21cd5fa9f7d503331e50d6b05ec SHA512 a9a2deea9b25abcb67d590823ae1935785fdee37d9d77e62cb489ff573ba15ea64e55f28b9194a3878898913591d1c0b156ea2c4216ff84c849f4e721084db1d
+EBUILD clion-2023.1.ebuild 2745 BLAKE2B 626a8a4365d67f3a21bc9ee5a7a822b8d4b18831baacd471ccdd7277a3e9a694cf261474c5534d83110e9b4d65a23a102d68a21cd5fa9f7d503331e50d6b05ec SHA512 a9a2deea9b25abcb67d590823ae1935785fdee37d9d77e62cb489ff573ba15ea64e55f28b9194a3878898913591d1c0b156ea2c4216ff84c849f4e721084db1d
 MISC metadata.xml 402 BLAKE2B a74ce91089fa83dc91f1878f17b0e2adc483fdfdd987eb2dd4b184b2a98b8f1d995ab5d2c4dca2d7f25d3a8e1dfec711625e980feb5a0422fe5635c5816ef4fe SHA512 6d425358265cac8deb12c18632cfe520d82a733e4caab71eeb89b6d6643eddbfa27df03fcd8111477a77efea136aca1093c84024c89b85dc66ce1b92633709c6
diff --git a/dev-util/clion/clion-2022.2.4.ebuild b/dev-util/clion/clion-2023.1.ebuild
index c924960bdb42..1faba92b159b 100644
--- a/dev-util/clion/clion-2022.2.4.ebuild
+++ b/dev-util/clion/clion-2023.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 inherit desktop wrapper
 
 DESCRIPTION="A complete toolset for C and C++ development"
-HOMEPAGE="https://www.jetbrains.com/clion"
+HOMEPAGE="https://www.jetbrains.com/clion/"
 SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz"
 
 LICENSE="|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
@@ -14,19 +14,18 @@ LICENSE="|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
 	EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM
 	LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 RESTRICT="bindist mirror splitdebug"
 
 BDEPEND="dev-util/patchelf"
 
-# RDEPENDS may cause false positives in repoman.
-# clion requires cmake and gdb at runtime to build and debug C/C++ projects
 RDEPEND="
 	>=app-accessibility/at-spi2-core-2.46.0:2
 	dev-libs/expat
 	dev-libs/glib:2
 	dev-libs/nspr
 	dev-libs/nss
+	dev-libs/wayland
 	dev-util/cmake
 	dev-util/ninja
 	media-libs/alsa-lib
@@ -35,9 +34,9 @@ RDEPEND="
 	net-print/cups
 	sys-apps/dbus
 	sys-devel/gdb
-	x11-libs/cairo
-	x11-libs/pango
 	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/libdrm
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXcursor
@@ -49,61 +48,59 @@ RDEPEND="
 	x11-libs/libXrender
 	x11-libs/libXtst
 	x11-libs/libXxf86vm
-	x11-libs/libdrm
 	x11-libs/libxcb
-	x11-libs/libxkbcommon"
+	x11-libs/libxkbcommon
+	x11-libs/pango"
 
-QA_PREBUILT="opt/${P}/*"
+QA_PREBUILT="opt/${PN}/*"
 
 src_prepare() {
 	default
 
 	local remove_me=(
+		help/ReferenceCardForMac.pdf
 		bin/cmake
-		bin/lldb/linux
 		bin/gdb/linux
+		bin/lldb/linux
 		bin/ninja
 		license/CMake*
-		lib/pty4j-native/linux/aarch64
-		lib/pty4j-native/linux/arm
-		lib/pty4j-native/linux/mips64el
-		lib/pty4j-native/linux/ppc64le
-		plugins/remote-dev-server/selfcontained
+		plugins/cwm-plugin/quiche-native/darwin-aarch64
+		plugins/cwm-plugin/quiche-native/darwin-x86-64
 		plugins/cwm-plugin/quiche-native/linux-aarch64
+		plugins/cwm-plugin/quiche-native/win32-x86-64
+		plugins/remote-dev-server/selfcontained
 	)
 
-	use amd64 || remove_me+=( lib/pty4j-native/linux/x86_64 )
-	use x86 || remove_me+=( lib/pty4j-native/linux/x86 )
-
 	rm -rv "${remove_me[@]}" || die
 
-	for file in "jbr/lib/"/{libjcef.so,jcef_helper}
+	for file in "jbr/lib/{libjcef.so,jcef_helper}"
 	do
 		if [[ -f "${file}" ]]; then
-			patchelf --set-rpath '$ORIGIN' ${file} || die
+			patchelf --set-rpath '$ORIGIN' "${file}" || die
 		fi
 	done
 }
 
 src_install() {
-	local dir="/opt/${P}"
+	local dir="/opt/${PN}"
 
 	insinto "${dir}"
 	doins -r *
-	fperms 755 "${dir}"/bin/{clion.sh,fsnotifier,inspect.sh,ltedit.sh,repair,clang/linux/{clangd,clang-tidy,clazy-standalone,llvm-symbolizer}}
+	fperms 755 "${dir}"/bin/{clion.sh,fsnotifier,inspect.sh,ltedit.sh,repair,restart.py,clang/linux/x64/{clangd,clang-tidy,clazy-standalone,llvm-symbolizer}}
 
 	if [[ -d jbr ]]; then
 		fperms 755 "${dir}"/jbr/bin/{java,javac,jdb,jrunscript,keytool,rmiregistry,serialver}
 		# Fix #763582
 		fperms 755 "${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
 	fi
-	dosym -r "${EPREFIX}/usr/bin/ninja" "${dir}"/bin/ninja/linux/ninja
+
+	dosym -r "${EPREFIX}/usr/bin/ninja" "${dir}"/bin/ninja/linux/x64/ninja
 
 	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
 	newicon "bin/${PN}.svg" "${PN}.svg"
 	make_desktop_entry "${PN}" "CLion" "${PN}" "Development;IDE;"
 
 	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	dodir /usr/lib/sysctl.d/
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
+	insinto /usr/lib/sysctl.d
+	newins - 30-"${PN}"-inotify-watches.conf <<<"fs.inotify.max_user_watches = 524288"
 }
diff --git a/dev-util/cucumber-ci-environment/Manifest b/dev-util/cucumber-ci-environment/Manifest
index 6e4bfc0ec987..25d21b78c778 100644
--- a/dev-util/cucumber-ci-environment/Manifest
+++ b/dev-util/cucumber-ci-environment/Manifest
@@ -1,5 +1,5 @@
 DIST cucumber-ci-environment-9.0.4.gem 9216 BLAKE2B f7758051d9e990b7b25b4dbbe4448c083630855619d11a4262740ca2bb2c85d659aeff95c889d179b22a8cb2831659b4cb86bf04d253a451749565e263244eae SHA512 be130abb5227a17308bdd2792e84d509a2ad64e1b19030bde254ceac607ebea5374f94dde80d9cce01be125a01356f12bc70b1884df149d6e1a7bc43651710df
 DIST cucumber-ci-environment-9.1.0.gem 9216 BLAKE2B 79287ac684faf3584ad18ddea54a6eb6bff6bf9ed76fb0c9126c4a0516aaebfebb09f9d5f5ecec44e84e7f1604bde6c53ae06e4ab339a0a2c79448dd9358f08a SHA512 3386783e70ed80f0465453708f14e5415d64feb4a995d05dbf04d8af9d38a25b089cd1a51b6d830d4aabf2b5499956d53d90f8e1e77d445ba00f8bb5e83685b0
 EBUILD cucumber-ci-environment-9.0.4.ebuild 431 BLAKE2B fccdc31f2dafe0ccd2161e63e76c62f725419784717f347fa2b64177c8062c9bf4c54c8c866485f387696b1db61a7e426d590703d45ecd674c371079f7390061 SHA512 4a21729d4ba1659ac7f5ac8c556b202e1cce67599d6d2663b6ebf4c98c55b6c7db8269c2463196e72e6fbf87b606eec19a8305cf0de5934fa2a2e85dedd4e60a
-EBUILD cucumber-ci-environment-9.1.0.ebuild 431 BLAKE2B fccdc31f2dafe0ccd2161e63e76c62f725419784717f347fa2b64177c8062c9bf4c54c8c866485f387696b1db61a7e426d590703d45ecd674c371079f7390061 SHA512 4a21729d4ba1659ac7f5ac8c556b202e1cce67599d6d2663b6ebf4c98c55b6c7db8269c2463196e72e6fbf87b606eec19a8305cf0de5934fa2a2e85dedd4e60a
+EBUILD cucumber-ci-environment-9.1.0.ebuild 424 BLAKE2B 620c7305124cfd35222afd5b9f34d6cf966d6b876fcd22bd28cb9e842e1de7cd8cf07321a6adfeb6cca5f27955dd1f7fcf5231ff8a615f759a173f9c356fc372 SHA512 41edd498b0e5b7020de2d7e702bc9b53366ba8fa92dedbbfd21fdfc2fb8bf205f7e772e1536bb7bd5c496c7f07785742514b3c7dc7a5c04f2b5b2c82861a83f7
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-ci-environment/cucumber-ci-environment-9.1.0.ebuild b/dev-util/cucumber-ci-environment/cucumber-ci-environment-9.1.0.ebuild
index 86d9504df267..919095cdd805 100644
--- a/dev-util/cucumber-ci-environment/cucumber-ci-environment-9.1.0.ebuild
+++ b/dev-util/cucumber-ci-environment/cucumber-ci-environment-9.1.0.ebuild
@@ -12,6 +12,6 @@ DESCRIPTION="Detect CI Environment from environment variables"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="$(ver_cut 1)"
 IUSE="test"
diff --git a/dev-util/cucumber-compatibility-kit/Manifest b/dev-util/cucumber-compatibility-kit/Manifest
index e4d5bda8c5bc..7ce21b698c0e 100644
--- a/dev-util/cucumber-compatibility-kit/Manifest
+++ b/dev-util/cucumber-compatibility-kit/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-compatibility-kit-9.2.1.gem 34304 BLAKE2B 95d9d3df1a70dc54595ac3acb28ad0835257e317f8f4e64de556e650dc504d0fd8bee013a3172b6fcf93734f01dcbca37570edea3add2797a2635c747b68afb9 SHA512 40ab5d28828e1ce0467229c95f5f66ca07f99dd477cabe91468e67a9c34b40eb0def9ba5326c20885be8f8d815a2f3bdf3aceecd345eb8b310fd5f83f5a1e910
-EBUILD cucumber-compatibility-kit-9.2.1-r1.ebuild 543 BLAKE2B ca075c00ea19145eec20fbece966966024ba3a947d263578c28810bbb99a9d900ac53a9810c08d0ead11f8bacc831f46969708aebd72be64836142a6c5f8033e SHA512 63786a13732184940c1273728c9480ba9ea3fdcde80a64a386ffa1354ebb4c8784419a817894f0008455c1e048b1f7607ef620a16572c67dca40d9897dc7fffc
+EBUILD cucumber-compatibility-kit-9.2.1-r1.ebuild 536 BLAKE2B 76bacb31f266c571fd03d3045eaf0418ad5f9ed939785869612005cd43f8f879b376e8218c81a58b52261fc15bd829fc485b3bc9711813715ba85d2cd0710567 SHA512 c0cebbe6130aa35f269a6a67c46e750476090e3355864bd19500a1e1c746a83de6fa788bd8880328bf6bbeb3a94127e01c189cbe5bc2f7fe155eb4341a5fb3b8
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-compatibility-kit/cucumber-compatibility-kit-9.2.1-r1.ebuild b/dev-util/cucumber-compatibility-kit/cucumber-compatibility-kit-9.2.1-r1.ebuild
index 417cf9b5e856..c64e884cc74d 100644
--- a/dev-util/cucumber-compatibility-kit/cucumber-compatibility-kit-9.2.1-r1.ebuild
+++ b/dev-util/cucumber-compatibility-kit/cucumber-compatibility-kit-9.2.1-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Kit to check compatibility with official cucumber implementation"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index d5149035f38c..7d678733ebfc 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -2,6 +2,6 @@ DIST cucumber-core-10.1.1.tar.gz 202764 BLAKE2B c5704ed4821d056aea7bf537c7193bb8
 DIST cucumber-core-11.0.0.tar.gz 202792 BLAKE2B a85074a9bad6b91dcb2b409eee6162efed6890868b762ebd221ea2ab383a029eb7d7f605813e6e73f6bcbf4c526ffb94f26e7338e6cfdd94abf28d631bbd989e SHA512 fd2cb97d72f24e5a5c00336e4243594270546225a027ee23907256d81fdc9be01c017a4d25dea85727ca834a6d3e3fb1ae003357cf530eab9d44fc211d52f331
 DIST cucumber-core-11.1.0.tar.gz 200962 BLAKE2B 5ac40ca2114a925c93f98b363443b560f24f5103c23e6ec3ae429cfdd1c1039367a64212a87c6079aacc94a2da757f2e8f889d57f6a46ceff5ff58810101e86e SHA512 02918828b9f626ac9a6d451b5d8ce4f19df01cd628c008c4a1b2b926f27d6af1353ce4bde5cd05bd1ce560449e37cc2db971049a4b8230f0c85cf0b05d0a462d
 EBUILD cucumber-core-10.1.1.ebuild 972 BLAKE2B 67ac1a9e510dda0e2b7c527ec5a9adf24e961b6c51d4691356b4a3dfd10c52ec6c5d20684208d4f6b690bddbfc0be3eaca191fb9f9ca7dddb14b010efd64a646 SHA512 672c4ed95e9b305d0cd2cdb1e0dcec60f8b3e126c56f5a862609adab28ade655b809c6a009103548b92140b5de1ff8815df40d787ca003fc2ffcd74a547b7819
-EBUILD cucumber-core-11.0.0.ebuild 979 BLAKE2B bb57be7d8ae62ee4c1fa570cfe127b69a0d55f0d841ae2f873b0149d8346ee6c1ca9fc9d4ebf591b217ef6a6272ea9c3e50a8ed65e28a8301788f7aa303f11c0 SHA512 f873e80559b91c3a7931862385ca66056b2b85ac5faea3cfcc96bd9a800d0770c744a8ec76472b60f60ef60770dfbe596e2fb314ac6c553c5ae2d0b0849f0046
+EBUILD cucumber-core-11.0.0.ebuild 972 BLAKE2B 7778b2d9b9b46c9b205f638bb23429baffc09cbd7a94f3935f53eb5dbe43fc13aefb45a5bb87cc7e6cdb561d67ec2f3bf775a24f1a634281115c1ef2dc5ea83c SHA512 e24526f5d517e83b52d76ebb03265e8497ac71d23521f1fe21ff095afa6dd094143451e9792179050e8a5a86cbe188610bdcd03535a578fefbc54eb4b032c56e
 EBUILD cucumber-core-11.1.0.ebuild 972 BLAKE2B ebf487ea78410af2471da446d0b675ce965ac2847eb0ffbe6495b6be4c326ffd23e9f51dcff4440f47fb98f4a6b39464d62da264d84e8aa74d8952a4cd7ecd5d SHA512 930d4fed011ce635902b08d2866bfd2c8360a1ec4772658d95aac4561aeba4bdad8c336c13496de3072a7cd3e790bba1ada07a7256bbf68c9e4683e9a3cce6e5
 MISC metadata.xml 375 BLAKE2B c7832a4f34f0d774b6d629ca76140e597b20dce63b2cbcb8abed5e71689b08f99d2a78da9d4bb6493fb1b8de5baf930b8b749df01f90b12a663286ca77440286 SHA512 e50fe917e05d882f55e69e8605f5bbac962e296965d50b53b8904d5f6917add58790ee31813cea02de19839ed3c7fcfb794fd5deb042dd82a2104f7a24700bf3
diff --git a/dev-util/cucumber-core/cucumber-core-11.0.0.ebuild b/dev-util/cucumber-core/cucumber-core-11.0.0.ebuild
index a965ad4cad7a..9e87f412f9c0 100644
--- a/dev-util/cucumber-core/cucumber-core-11.0.0.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-11.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz ->
 RUBY_S="cucumber-ruby-core-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-cucumber-expressions/Manifest b/dev-util/cucumber-cucumber-expressions/Manifest
index cc89fb9217dc..0646da9a7a32 100644
--- a/dev-util/cucumber-cucumber-expressions/Manifest
+++ b/dev-util/cucumber-cucumber-expressions/Manifest
@@ -5,5 +5,5 @@ DIST cucumber-cucumber-expressions-15.2.0.gem 25088 BLAKE2B 3e0a9283cdf1a9488826
 EBUILD cucumber-cucumber-expressions-12.1.3.ebuild 449 BLAKE2B bc21e435e61feb2df01c5f5eec667539cc03e7f4c38f31bab61b0db6fada30cd5ec75be06abec98d4120e95b581c6f0613a1708006e87e610a06e89d192d1daf SHA512 39e9f5b01a2e53b436bac3481b52ba8a0f4d7b6de6a71c38b8c05b5ff97c0adf3f53fdd6b956276df6bcde6ac89d001aab04d3a0d55a849a2bc8621338d90292
 EBUILD cucumber-cucumber-expressions-14.0.0.ebuild 449 BLAKE2B 82588c7d961ebd3258beccc708b0189ea09dd82e39f0efa99b8becdbda6677060c0f31da98626aecf1eb56fb85b8e34b747db2b7b41fb885e43a326131ed45fb SHA512 09e5caf6e7c9561d1886d81452d866832c2689850c48d5daf9eef210d7c3eba0d8de7d8ca5a7e537f82f0560a46d790e568a1fa8f3ab138926b213c68f2760f2
 EBUILD cucumber-cucumber-expressions-15.1.1.ebuild 456 BLAKE2B 2465d75eed743a1aee54b18f22a6f02378f73377a7dc2d1d9fce127e4445851c9075d48c4465454c764a7c0a4f8b69a55cfa77103a687ff8b30d547b8923a23d SHA512 de9589cee2bf99ed7ed9aed01e8a24b127072936ec3dfaa97cb807edbd8970d7d791045ad83ca2a7e8256f3bbb5faba35e90ce3f40da2897ebef6e3da35f2f0f
-EBUILD cucumber-cucumber-expressions-15.2.0.ebuild 456 BLAKE2B 2465d75eed743a1aee54b18f22a6f02378f73377a7dc2d1d9fce127e4445851c9075d48c4465454c764a7c0a4f8b69a55cfa77103a687ff8b30d547b8923a23d SHA512 de9589cee2bf99ed7ed9aed01e8a24b127072936ec3dfaa97cb807edbd8970d7d791045ad83ca2a7e8256f3bbb5faba35e90ce3f40da2897ebef6e3da35f2f0f
+EBUILD cucumber-cucumber-expressions-15.2.0.ebuild 449 BLAKE2B 82588c7d961ebd3258beccc708b0189ea09dd82e39f0efa99b8becdbda6677060c0f31da98626aecf1eb56fb85b8e34b747db2b7b41fb885e43a326131ed45fb SHA512 09e5caf6e7c9561d1886d81452d866832c2689850c48d5daf9eef210d7c3eba0d8de7d8ca5a7e537f82f0560a46d790e568a1fa8f3ab138926b213c68f2760f2
 MISC metadata.xml 300 BLAKE2B a639d71f26516f07d45281d1036eed4e67653b41ad4644ebee63601681a288f8de93effc46f684df4d152eb2914abfaeb745045b075127d36c1bcc6bdc67d1c7 SHA512 27af0d39315115a4483da0c3d2d84ee4c7fba5891ef61ba06c776b86bf068c4a60e3766fc8c1c522402480543919434910decee43b3847bbdcce556cd91f8473
diff --git a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-15.2.0.ebuild b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-15.2.0.ebuild
index feadb3db482f..6a40bda210f3 100644
--- a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-15.2.0.ebuild
+++ b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-15.2.0.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="a simpler alternative to Regular Expressions"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-gherkin/Manifest b/dev-util/cucumber-gherkin/Manifest
index f0364f627fa6..9559818794a1 100644
--- a/dev-util/cucumber-gherkin/Manifest
+++ b/dev-util/cucumber-gherkin/Manifest
@@ -1,5 +1,5 @@
 DIST cucumber-gherkin-22.0.0.tar.gz 9601890 BLAKE2B 71ad3b4c9917cb6c9e4e8d7769bc76f49f1e33d5aa46ad835eea01297d9e69c60c1249075aabfb529daa10996703e45dbb8dec4eebd149ae8637708f666a00f5 SHA512 ef5aca1bd0e30aac850c2e93fd6d30bb5e7a9504f4d1ad1f4072001abeb16aa7cbbc0bb2200dd9001080ed8d89a3f91eb5206874cf535e3ea4756e6e809a6c20
 DIST cucumber-gherkin-23.0.1.tar.gz 8404612 BLAKE2B 4a444afdf70804be9d97cf87c32960cbee705c97c90e4ef2d34479c1499a0fd1d97fa11114cc6354a765be667e542ec1a6b9f596778a954f4e1d9df80157f4df SHA512 fa968e92cb4617791d7df4e1d2a152b04ccd0b2aa0785e26264fa00ce722b026b0dc4b428acc0caf75d24196ba9689d85bbbc7f34c2a5c3dafecf84ab996383e
 EBUILD cucumber-gherkin-22.0.0.ebuild 788 BLAKE2B 56a234e9f04aceb9fab577c3f310aabdc67ffe014b0ffcc0c25aeba7db11fe9c8c842bfdbc88d39aea032ec9f0541f22099131f5a817e25b0ecde50d09cd1be3 SHA512 49823568a8192f818c016d401e62ef7d7b73db6aeb0cb51fb1d3a245e323a3c142f6606aaced9aa6e30fef9845f99af4ac0f6300f69f2ef5cd4822765e8f7a38
-EBUILD cucumber-gherkin-23.0.1.ebuild 795 BLAKE2B 40c6b91178c55fb7870ab028eeb952a1543c16c06d6d4aaab8b8473f36f6287257c27f74892127a97ce4775c1bef2ffbbeda78835a94e5963d0a699c297d8e20 SHA512 28d7a8eed5bcd3c34f826028c3e7bb977970161a98f77025f23dd7afb8c0e6df415410f241ce5edb7d59c9c61b0221db34badb839cf9f3a1c1260b2c4b260c6b
+EBUILD cucumber-gherkin-23.0.1.ebuild 788 BLAKE2B 272efaf678b0dae2d2d1d4ae67ff2f4cf794557da2d38b925bafd86cc1cb5035fd8d2885314067faba2bf699f8b50e8db655eeb0a8dd875d62ecc6db6fa12ead SHA512 dd3ecae0a577f078f05ca8799c2b3150be2d3f32a1db2378bad60f4c65dc887fdbbe2aff431a3788b3ff91ddf8c405664919226cad636cec9d8fd57e70afb95b
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-gherkin/cucumber-gherkin-23.0.1.ebuild b/dev-util/cucumber-gherkin/cucumber-gherkin-23.0.1.ebuild
index 7a689dd6358f..3296a8aeed38 100644
--- a/dev-util/cucumber-gherkin/cucumber-gherkin-23.0.1.ebuild
+++ b/dev-util/cucumber-gherkin/cucumber-gherkin-23.0.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/cucumber/common/archive/gherkin/v${PV}.tar.gz -> ${P
 RUBY_S="common-gherkin-v${PV}/gherkin/ruby"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
diff --git a/dev-util/cucumber-html-formatter/Manifest b/dev-util/cucumber-html-formatter/Manifest
index 0b853bcf1fb2..959cb59cbbb9 100644
--- a/dev-util/cucumber-html-formatter/Manifest
+++ b/dev-util/cucumber-html-formatter/Manifest
@@ -2,5 +2,5 @@ DIST cucumber-html-formatter-17.0.0.gem 434176 BLAKE2B 9bab7b11d2a17b6bb7fb1a812
 DIST cucumber-html-formatter-19.2.0.gem 478720 BLAKE2B 1f2f6b2f93d63207cb2bb6e23ad14d71eb06a8363c7af7f417e4755ffffb2beabe8502ed5d82a881c072b911a42cb1fc2f1809e7326c223c00c25a36482d052b SHA512 c5f1453677b4df5e9091721bbb15a522f5c91cbcb2cb11a8c1d8f2577d8b3b93810698447a1fe1f2b80dc52a1bf798ffcb876b2c728ceaf109f1997a2fdde249
 EBUILD cucumber-html-formatter-17.0.0-r1.ebuild 735 BLAKE2B e5ca1e30006a55beb76dc3f6565a5777c89872d3d7a50ddbae29658a78ec24ca0003c3382347dda3cd7f111fe7ad66f1077c1f6cea430fb680fb0ec026f724eb SHA512 e26e16f3abaf04d3049e473bfc34ef4618b51b15b0903f2e249634fee7b5b9c149063b867d4d19a0f5863c7c24199695f4029145f02b67dc3211a2c5d0b57df5
 EBUILD cucumber-html-formatter-17.0.0.ebuild 704 BLAKE2B 29616fce3908431d835aa648a448c50bd5d199e5bbb5a4e8fc7efeca21a5a443d143eec2d674fd7407d261e03d5df342030dd8e391104a75ab68f588db1d046b SHA512 a7b8cb61f15d74b69599fcacbc833fda58a5043b1b22b8accdbe8d38512c0e1942f7001d459179c9a10942c43e385cd3ca2c4a5662fef2a15ff3cb2c8a0da498
-EBUILD cucumber-html-formatter-19.2.0.ebuild 834 BLAKE2B 305b14e92a64c34ef202dc28a7582a856ea3b4785239a596ba2ef1ee7611041d5de731a2780b9d8f527a9debd9c3c2c0b4357a725bd4ee6c278bb5f002918eb0 SHA512 cb766cafaf1960cb8537476acfb44aafdca2cba1552bda574dbf96d2595884fce618394d11ec15b31cb81638cee30dc93feb8c47168ac94f6c8bf9e00b5f27b8
+EBUILD cucumber-html-formatter-19.2.0.ebuild 827 BLAKE2B d68245d50802cfa4c2cd02eedabb1802f641383664ddd2fe773aa4120a5a43bfed12ccded0a2a0ab5ca867af378d5bf61d443c8ad2a98fc8d79b6e674a38ca8e SHA512 e54da455489c703328741ea3044b0f5cba67a23a9bcf0869e2821ec103ecb27db1ba08b4a7bb8802844933e1e9cc1960a52e1069401c07256f4f6e4d784c6ac4
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-19.2.0.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-19.2.0.ebuild
index 930b696dd82a..f2d8ed1a88fe 100644
--- a/dev-util/cucumber-html-formatter/cucumber-html-formatter-19.2.0.ebuild
+++ b/dev-util/cucumber-html-formatter/cucumber-html-formatter-19.2.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="HTML formatter for Cucumber"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-messages/Manifest b/dev-util/cucumber-messages/Manifest
index df6c5c2dc442..606dac9cf45e 100644
--- a/dev-util/cucumber-messages/Manifest
+++ b/dev-util/cucumber-messages/Manifest
@@ -1,5 +1,5 @@
 DIST cucumber-messages-17.1.1.gem 21504 BLAKE2B 343bdb916c1e1a8cfa0aaaa4837d11064d51268a283b9c79b0ff249abe8066ef6a3d56d021d3b9d9b1d8a2dfc1495b08263dc325f6ac8a0e2dbd46281089cee7 SHA512 32d4740bd6aae8bf4273aac9974e181d32c4bd0be5883722ea38aa62df8b915504fd21a655111c03527d3fe1f31f0ec41ac637cb7293b753c7ec4eb6a97e7db9
 DIST cucumber-messages-18.0.0.gem 20992 BLAKE2B 292de17ef1b73ea2f35f3994bfbab14f206d8152fd885a7e6d351eaf67bb7ecfbbf8fd1a24ea1fc2cd42bbcde5290ec69c227db273193e897c5e4aebc555aa99 SHA512 52a7c3d8105a8b7abfd2914088ea2c9caa794451a53a50c8c6b98f36ad73947dd2e2f0925a06f2eae4019bd6e22b206670d51557149e50532580377c95a904be
 EBUILD cucumber-messages-17.1.1.ebuild 502 BLAKE2B 896fdac3fa1a9065da6983f3d15afa35b8e5a5e2cee7ac65027a77acfc8f89c86aa874d4b5abe03e6f0aad07bd54ce3e16b12e235b7717599315a227de89e94b SHA512 9fab5958fe1e1f2d8d4e0e23255cf3f5efc5e9d521d5f70582a0d5ca12ba0c6715c9f5b037be46757e2298aec3d729638e40cd2e5913ae45594a980144f8f3a7
-EBUILD cucumber-messages-18.0.0.ebuild 509 BLAKE2B eb2ad3c9bea55599804e55b57d9795311127fa8c112f264c50d976899aaf7b47c3737cccca0c8d5bf9c0951571ddcd7a9f4aa401bad43eccb189556f9a84e3ab SHA512 1e744811911d3b0e8a939d7fbf20cd60d1caaa21ea006cbcb461d2b42ff476934171ea0293dbaa4cadba4c26086110d4a0c02ad3908bc8946c63225d4590df04
+EBUILD cucumber-messages-18.0.0.ebuild 502 BLAKE2B 896fdac3fa1a9065da6983f3d15afa35b8e5a5e2cee7ac65027a77acfc8f89c86aa874d4b5abe03e6f0aad07bd54ce3e16b12e235b7717599315a227de89e94b SHA512 9fab5958fe1e1f2d8d4e0e23255cf3f5efc5e9d521d5f70582a0d5ca12ba0c6715c9f5b037be46757e2298aec3d729638e40cd2e5913ae45594a980144f8f3a7
 MISC metadata.xml 314 BLAKE2B b2b942eaa58ed22776f566b9e50e04e6ab0802ceb3b8a71f916d7899fc117ebf00cbc12775ea29661f6591c5e8bfae21cce49e89acb9a6a11e8c71679503b619 SHA512 99b7fcdcbbf0f360790757d2d004cd9ea981d344d092dd54c50b6658625021c8074044143680d3836392c6f53e64fb7dd3dd95c10b452f97c53e5f14b822d3b7
diff --git a/dev-util/cucumber-messages/cucumber-messages-18.0.0.ebuild b/dev-util/cucumber-messages/cucumber-messages-18.0.0.ebuild
index 7f2b3d224ac7..addbef80a1c0 100644
--- a/dev-util/cucumber-messages/cucumber-messages-18.0.0.ebuild
+++ b/dev-util/cucumber-messages/cucumber-messages-18.0.0.ebuild
@@ -15,5 +15,5 @@ DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication
 HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index c2dc1f86ecd3..e7a5bd82fd06 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,7 +1,3 @@
-DIST cucumber-rails-2.5.1.tar.gz 42456 BLAKE2B 91448ce88fdfed2e219a6c46b7915deeccb5678ceaaf57db06fc1348facff756b0c1dd67f6d8bcbc1b36ba555ca2d31167fa20c8b5f48138c018ef5d2f65bafc SHA512 2bb1748d9710998f974fc253ae03595d8e972593423d027840d2b437a0f13a60ec0df3cc2fb7d6e30c0003d414d093e4fd3c398e0fa27441ccb431f308f89405
-DIST cucumber-rails-2.6.0.tar.gz 42630 BLAKE2B 2fac80af5cc8d5cbe2ab445d56e58188e34fd86d05ec75893eaefb3d11e58d5f86e677f1349729d21b145912931620bd76ed4e9acbbd5cc124bdfbdae3f007ab SHA512 d691cdca0f4d8a5d7a0794f5a5a15102a244da476ebd8ccda0e1c2e3521f5553373ab4a3b9bcaca20d10fd4a8a836910a938ca09450eff6b39c4446dbc5be5c8
 DIST cucumber-rails-2.6.1.tar.gz 43079 BLAKE2B c45211c8a2375fc2b488d22fb74041e5dcf56027d6644721b5023b8ad9e68f07593c448acb88b7c0e51dcad7da0213d48726e20175ecd5fd04f16174e44b848a SHA512 dd2ed4afecf74e8aac0fa360d81a27407df999b041b21c597e9ac141422cb0ece89eaa74d8da9a4fc2858efaf242837d8237a9ceee44875cff2c50d288fad480
-EBUILD cucumber-rails-2.5.1.ebuild 1307 BLAKE2B dfdd93177aca8772a7627c5843bae145c9c81edad359bfbbe99a7d31cdc433f6e2c16eea7cfa82ad805378c41b62191f2a0f61e06488c6e8c38bee5c5c87fb82 SHA512 b3a55f93a54b7fc1e7f899eac7039a88c70930d820b3f0a894368bfd7fb35668ed746eb32d0fbcd7269893387be669e51f8e73af0eca8d3a3b4e0a23fe96fcff
-EBUILD cucumber-rails-2.6.0.ebuild 1301 BLAKE2B 5eccb0bec25819114fe9e22707f99da34899f8036bbc44bc964d656f6b85d75914ab04d9136fa653f06cd045345cee9bfe673dd91cefdb2fd5743c95f4ac40ca SHA512 e951c607696e0f4a02136dff50dc32de6e0867426a4d96bb141d419081b52a544227527289cb58a0da6abe0c2420999e60194d0f15953c4806be17230a77cf45
-EBUILD cucumber-rails-2.6.1.ebuild 1300 BLAKE2B 802511bc5fd194e52e03b9f26a68d4fcc0657793cea899b281c02d673bc19a75c82620a4adb26dbc00ea2e5ec3283527fc6dbdae28b911968056ff59b669b83f SHA512 5915c888191eca22ee1f488e93b0fa7466ca9a6c3b896a6f8bca10b2861215e988d2d6b79dff681b3425f32c434a20739df365183a98a2b7dbae5676bac4747a
+EBUILD cucumber-rails-2.6.1.ebuild 1307 BLAKE2B ed4d6b6a3c30fbbd083d88ae0749e9191246b76984f35270f167238fb27010e4ec3cd9e8c01d465d568e47c5cf3442d548b489cc6c6ac24a48fb9ddcbefa8b79 SHA512 9d57daaa777330f14b81825492f9dcd3102af15eb64f8cefc2cd6ea8cf1b6c54d953ac9c0df444b3f35d7288641c75b4abe2ea6f3a41d7863dc2d45c7cdc8100
 MISC metadata.xml 300 BLAKE2B a639d71f26516f07d45281d1036eed4e67653b41ad4644ebee63601681a288f8de93effc46f684df4d152eb2914abfaeb745045b075127d36c1bcc6bdc67d1c7 SHA512 27af0d39315115a4483da0c3d2d84ee4c7fba5891ef61ba06c776b86bf068c4a60e3766fc8c1c522402480543919434910decee43b3847bbdcce556cd91f8473
diff --git a/dev-util/cucumber-rails/cucumber-rails-2.5.1.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.5.1.ebuild
deleted file mode 100644
index 6bd4d98c8b7e..000000000000
--- a/dev-util/cucumber-rails/cucumber-rails-2.5.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-# There are also cucumber features. They require a Rails project with
-# factory girl which we don't have packaged yet.
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios for Rails"
-HOMEPAGE="https://cucumber.io/"
-SRC_URI="https://github.com/cucumber/cucumber-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-# Restrict tests since Appraisal is now mandatory to manage different
-# rails versions, even for the specs.
-RESTRICT="test"
-#ruby_add_bdepend "
-#	test? (
-#		>=dev-ruby/ammeter-0.2.2
-#		>=dev-ruby/rspec-rails-2.7.0:2
-#	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/capybara-2.18:* <dev-ruby/capybara-4:*
-	>=dev-util/cucumber-3.2 <dev-util/cucumber-8
-	>=dev-ruby/mime-types-3.3:3
-	>=dev-ruby/nokogiri-1.10
-	>=dev-ruby/rails-5.0:* <dev-ruby/rails-8:*
-	dev-ruby/rexml:3
-	>=dev-ruby/webrick-1.7:0
-"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e 's/2.4.0/2.5.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-util/cucumber-rails/cucumber-rails-2.6.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.6.0.ebuild
deleted file mode 100644
index 681ca08ad9f8..000000000000
--- a/dev-util/cucumber-rails/cucumber-rails-2.6.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-# There are also cucumber features. They require a Rails project with
-# factory girl which we don't have packaged yet.
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios for Rails"
-HOMEPAGE="https://cucumber.io/"
-SRC_URI="https://github.com/cucumber/cucumber-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-# Restrict tests since Appraisal is now mandatory to manage different
-# rails versions, even for the specs.
-RESTRICT="test"
-#ruby_add_bdepend "
-#	test? (
-#		>=dev-ruby/ammeter-0.2.2
-#		>=dev-ruby/rspec-rails-2.7.0:2
-#	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/capybara-2.18:* <dev-ruby/capybara-4:*
-	>=dev-util/cucumber-3.2 <dev-util/cucumber-9
-	>=dev-ruby/mime-types-3.3:3
-	>=dev-ruby/nokogiri-1.10
-	>=dev-ruby/rails-5.0:* <dev-ruby/rails-8:*
-	dev-ruby/rexml:3
-	>=dev-ruby/webrick-1.7:0
-"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	#sed -i -e 's/2.4.0/2.5.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-util/cucumber-rails/cucumber-rails-2.6.1.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.6.1.ebuild
index abe938d10275..20721cb04301 100644
--- a/dev-util/cucumber-rails/cucumber-rails-2.6.1.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-2.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 # There are also cucumber features. They require a Rails project with
 # factory girl which we don't have packaged yet.
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index cbbfbe5ab106..0453c8ec3253 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,5 +1,5 @@
 DIST cucumber-7.1.0.tar.gz 410595 BLAKE2B ee1fbca606479f1f07d64a5434051d8466d7056a326424a0235a6e4f860ed3cdc7862495156874b38631e6a0a1b70bda40deb6f5310f7bd6bdafe72c5faa8f2b SHA512 7c124110634259e83ba1986efacf85a73e9a6f36a7c262ba9842e85e73e359a50b5090489f656e5b503cac68e3db9905dd1834db1bfae9ee55e3a4d1b31a4adb
 DIST cucumber-8.0.0.tar.gz 412254 BLAKE2B 8e86ca726a85afeb6d80799c3b2cf633e4949bacb9ad65b41d3baf37f642b9032d57b4e66cca15cbababcdbe5541ce2cd0d23b113897dedbd7cbfb5c85283a00 SHA512 33e9abeb33c7924c3eedfcf477019a782cd813a004e35dcdeb0878b6dea920ba870023b6c8a60c8de810ff231378fa67969208611ce8e9199ae2611d3f6f1f99
 EBUILD cucumber-7.1.0.ebuild 2536 BLAKE2B 87c54cd1ecd24e957c322f3994728417bca331b432ae19df61eb08d2d728a93d02199d541c60f407691e695b44684b3d166eaa0d9990d7584a27ad70520860f7 SHA512 0577e95e76824c679f1ff86f84aa357ed0f004fa07c8f780ce184d076423a3a050384e387f231bcd1ab36bb0448c1f46d4f2e9b6c30485cf7ed140bf0bfbdcec
-EBUILD cucumber-8.0.0.ebuild 2570 BLAKE2B 68fb25422c4f58b7ae404192d51a47753ac23e0f86ca3c32893a3a066baf530beab89c80d4049c91b228f91ecc0bce1afcf9e2bc8607a7522c3b18dffefc877f SHA512 f2a4c13da5a7caebf483a95d7d361f06e3e7cf70fd3527bc0226d74b97c969db485e7a748904145e27a3f32a6a7ade1e47154b141aec47a187c2bec5605e23a8
+EBUILD cucumber-8.0.0.ebuild 2563 BLAKE2B 52f3985affbef319901f855a0bab09caafb5a4dddbc4d6c1dc3099696e827ef4242cabc4ff48513a80be3d95c812cfde26cb56f8010b50fecf5c83beb0905c83 SHA512 988bbab9d390c01e2d2953aca18e89552b40f4c3c053800bc4351269e9125d96d9c5355e878fa3210b57d6c7c9e1ceefff7b39fbc36ad67a10d6924bba20d462
 MISC metadata.xml 360 BLAKE2B b66a3bae14c4ddd0801c27b52bf5e6445329ac2e3a06d9aecdbdc86624700be85a67cac775f195d8c67de900660f8f612906c85394a0761b4a31e1863c8fb396 SHA512 03b7395abe6033b07ca481220061b5c52c5cb97af5a97e9b1631d37144c815bf9f192f3c973e7954ee1c32dee1db0134b9e9799b73d65be17094b9abd1fab9f0
diff --git a/dev-util/cucumber/cucumber-8.0.0.ebuild b/dev-util/cucumber/cucumber-8.0.0.ebuild
index e24cf82d6c86..708e0f2bceb9 100644
--- a/dev-util/cucumber/cucumber-8.0.0.ebuild
+++ b/dev-util/cucumber/cucumber-8.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 IUSE="examples test"