4 files changed, 3 insertions, 74 deletions
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 36d1dcb74f6e..bac0eb8b7629 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -1,4 +1,3 @@
 DIST aruba-2.2.0.tar.gz 130616 BLAKE2B f2f359d5ba79232e575a240e6d278b936f17d532d01e58f840f537a4d1e6a3663c04b24636aa20fda64ac3eccd4111c61d2f18e26e8c18cef35c7eeaaf7d797b SHA512 e4802dd915062b61e0a536d31294165310ce80aca3e4560f59bb23fcb3e01ea73a547d3f5738d3590c33175fb55268fa69512fe8f33f7cea6b83070e26b7cfee
-DIST aruba-2.3.0.tar.gz 129322 BLAKE2B 024e9dd2a1b028111806dacb97178bd143e7d109b86641cbf5499298315e177dcd89faa62b655069956f3b85908c772f3188729b99c9b2701acfd7d14590292b SHA512 771fcb99f0ace5961343c75a7575383014a22393f9eafaa7a04fa58da93c499dbd60574f47d1484342202fd25af6e50920de6108b22ffd88407add3add8c6625
-DIST aruba-2.3.1.tar.gz 129489 BLAKE2B 7f63c6660de98321c90e005eea32e96b9ca307e4942672327ab878acde36d573378301f4c3a7fe6b7fa776754c91f7b652ea85e9a24d98c28cba568abd651307 SHA512 be3fa85fc6f86e2cf31ef239ebb485869cdd49350aaa9f4df842f3682b5b76cf373cb94204b98f59eb3a143588cd075fcc63311417e1a452a0608e88375e0922
 DIST aruba-2.3.2.tar.gz 129734 BLAKE2B 48f9a2b4a31b12d9fc33ec87dfd992775b4df40351b2d099da36ca79214fab18a8669ec2cd79cd321cc6e5daa75202ba7c6aae143218782539ab4cee7336e4fe SHA512 46a0143b6368c70407fd1f1f6998f3f36a2f046bcf2b15c85ab68598edbfd0081e1a65c65c23a5ae757fb48499e7ef3a5d0a7751414e8d8bf80dc90f13933c80
+DIST aruba-2.3.3.tar.gz 129792 BLAKE2B 70e38575c5c88b26ad8d826df6f87a6cbd4a14f4e56975e9b15caac6f72826e167c5c7ff08fe57292bb255dd194e4c6b3e0d8ab31b3a737131f503ee9c91bd9e SHA512 3b643e9e13ce31c73967b41629755b3270fd007d5bc66abfbf34465aa458a655d3eaa223e6769e37d3c75ebf2ae03ccf0972b5a7f076cbe69571317c5d6f560c
diff --git a/dev-util/aruba/aruba-2.3.0-r1.ebuild b/dev-util/aruba/aruba-2.3.0-r1.ebuild
deleted file mode 100644
index 0cbf0a65b015..000000000000
--- a/dev-util/aruba/aruba-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_RECIPE_TEST="cucumber"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber steps for driving out command line applications"
-HOMEPAGE="https://github.com/cucumber/aruba"
-SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test"
-
-DEPEND="test? ( app-alternatives/bc )"
-
-ruby_add_rdepend "
-	=dev-ruby/bundler-2*
-	>=dev-ruby/contracts-0.16.0 <dev-ruby/contracts-0.18
-	>=dev-util/cucumber-8.0 <dev-util/cucumber-10
-	>=dev-ruby/rspec-expectations-3.4:3
-	dev-ruby/thor:1
-"
-
-ruby_add_bdepend "test? ( >=dev-ruby/appraisal-2.4:2 dev-ruby/pry dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	# Remove bundler-related code.
-	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
-	#rm Gemfile || die
-
-	sed -i -e '/simplecov/I s:^:#:' \
-		-e '/Before/,/^end/ s:^:#:' \
-		spec/spec_helper.rb features/support/env.rb || die
-	rm -f features/support/simplecov_setup.rb || die
-
-	sed -e "s:_relative ': './:" \
-		-e 's/git ls-files -z/find * -print0/' \
-		-e '/\(kramdown\|pry-doc\|rake-manifest\|rubocop\|simplecov\|yard-junk\)/ s:^:#:' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid features with minor output differences
-	sed -e '/Use .aruba. with .Minitest./i\  @wip' \
-		-i features/01_getting_started_with_aruba/supported_testing_frameworks.feature || die
-	sed -e '/Create files for Minitest/i\  @wip' \
-		-i features/06_use_aruba_cli/initialize_project_with_aruba.feature || die
-	rm -f features/03_testing_frameworks/cucumber/steps/command/wait_for_output_of_command.feature || die
-
-	# Avoid feature that requires aruba to be installed already
-	rm -r features/03_testing_frameworks/cucumber/disable_bundler.feature || die
-
-	# Avoid feature that makes assumptions about physical block size
-	# that we cannot guarantee, bug #935294
-	rm -f features/04_aruba_api/filesystem/report_disk_usage.feature || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	RUBYLIB="$(pwd)/lib" ruby-ng_cucumber --tags "not @wip"
-}
diff --git a/dev-util/aruba/aruba-2.3.2.ebuild b/dev-util/aruba/aruba-2.3.2.ebuild
index 23c5d6b9ea28..69c830a4737c 100644
--- a/dev-util/aruba/aruba-2.3.2.ebuild
+++ b/dev-util/aruba/aruba-2.3.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 
 DEPEND="test? ( app-alternatives/bc )"
diff --git a/dev-util/aruba/aruba-2.3.1.ebuild b/dev-util/aruba/aruba-2.3.3.ebuild
index 23c5d6b9ea28..594bcd78bda2 100644
--- a/dev-util/aruba/aruba-2.3.1.ebuild
+++ b/dev-util/aruba/aruba-2.3.3.ebuild
@@ -26,7 +26,7 @@ IUSE="test"
 DEPEND="test? ( app-alternatives/bc )"
 
 ruby_add_rdepend "
-	=dev-ruby/bundler-2*
+	>=dev-ruby/bundler-1.17
 	>=dev-ruby/contracts-0.16.0 <dev-ruby/contracts-0.18
 	>=dev-util/cucumber-8.0 <dev-util/cucumber-11
 	>=dev-ruby/rspec-expectations-3.4:3