4 files changed, 2 insertions, 109 deletions
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index dd8b2dcc84cb..9a0dacb36a18 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -1,8 +1,5 @@
 DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
-DIST aruba-2.0.0.tar.gz 132762 BLAKE2B b06190d3a1698c5a2d295df16096b2bd587c60a9c428d35e8ad24204b71b7a3d86f5b52a5f601f57204903412508faad3d4032f1499d78a309a99df63e8a68e5 SHA512 214de8dd3dd29b46ddac2605bab5008ac9d9755eef53c140aea5f160aba60ed9ac71ac5e1410f59700ddd8a506faedf6b54d99682c875faeaecbb47ad8660435
 DIST aruba-2.1.0.tar.gz 130073 BLAKE2B 534bc67cbc4b5871a1bc6e37170586b3a5829e70d611dde9fe130a4cfdce98044c1a3fe29de961419a605eb4bbe8e21b8efb52a61aa8a2d2b2b9fa7e42bd3169 SHA512 f30d67ba94157eaf0477a09f4049174ff0cd6195b92c4121117775e56502178525eb5a7f69148e7f5531d6d4e67f4ecd9d840e693c38340a10819a19247021fa
-EBUILD aruba-0.6.2-r2.ebuild 967 BLAKE2B 6a11fa4ca7af64f825b1251d470190a64608279aa1f2735e1ffd458479e22e9ffa6739bef16d3e714cab5ec53a16fd31401d1a47c675538a5fe8b2480d48204b SHA512 c922d4e5a19162aefb55b4415547222d1b799bcb7f239e6e9167a96349c76804b569829b60f91289e781c1dd4211361ac7b3ef547be92a8b35712dd5075b6916
-EBUILD aruba-0.6.2-r3.ebuild 1051 BLAKE2B 7aa4bfdd944e743b7721738a5b2dae5adba9c582754c9801adba994035c9619cb6c47c260dab7db41aa5cc24ed0d88b861344d40c41b341177b5701d8dc5946f SHA512 f11548cc9a9dbdd573941ec250bd9f00241d013b719155d47d775051917f5cf8b74851a9b969454ff915a4252bf2c69aa4c252cf0106ea95711465ad660e9097
-EBUILD aruba-2.0.0.ebuild 2018 BLAKE2B a8cd9a16001d387a95bbcd76dc1d82aee2e36f907c8ed344d3bdef8055ef6987b0f01149c23100bb14bd4102e6ef7ad44d6c9003aacc1961f44f1e1e35cfd946 SHA512 a464afc8ce044abc9905999bd32187b7ec253a396cc0c6f34bf14c674870dde9386e39a05146ef58e2c00db60e5f12116564f180c2bc7e7fff41c9063a7035a3
+EBUILD aruba-0.6.2-r3.ebuild 1044 BLAKE2B 20631d4dc9c2dd8371b93f67c0aa1cc92a4fc3c16d84cc7eccc0d91bd3e60d02caa985ef01dc4b21b80fb8afdcc2b28d9b633dd7a4de15acef0d9ed993258a51 SHA512 4848be3d58ed4407dc55f7f6ae9267b92cb1ebad9dd12d1cf97fe9e50e813dc8d8ea3086db3ff5962041f8da160c04d983f34c8fafac5009c4f9dc911517e10e
 EBUILD aruba-2.1.0.ebuild 2108 BLAKE2B 0c66771968dd4cbbf2117bf342a418421d990e75dc781bb3400ae25d51c3f8ee5884da166331d24adeb10d9930faa920940dc3572ccc04a40dc586fc58bb7ba0 SHA512 3dcbd4b1e4673c2d74626080dd96866d41941e5014abd23b52fcc13518bff1f9c71becbdb35833be131da0bf942885158afb12cf6598599619bda27809a5f9d9
 MISC metadata.xml 297 BLAKE2B 013e79bd25020910ff023586ed3e1349ee1dcbf195b73c230133775c2fe031794f91fd7e54d4df43bfc61de716f452492f2b7af3ba7dbf7e04cf4a47ac16a00d SHA512 c57a4e881304d3bdc2001d4f221ec7d4789223fa36b104271ec9a2439e7730ccbfd349b16209ac6a59fe782618b14423cf3b7b345ef2a7d4944a535eaed75c9a
diff --git a/dev-util/aruba/aruba-0.6.2-r2.ebuild b/dev-util/aruba/aruba-0.6.2-r2.ebuild
deleted file mode 100644
index 2f0ef589dad6..000000000000
--- a/dev-util/aruba/aruba-0.6.2-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="cucumber"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber steps for driving out command line applications"
-HOMEPAGE="https://github.com/cucumber/aruba"
-LICENSE="MIT"
-
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="${DEPEND} test? ( sys-devel/bc )"
-RDEPEND="${RDEPEND}"
-
-ruby_add_rdepend "
-	>=dev-ruby/childprocess-0.3.6
-	>=dev-ruby/rspec-expectations-2.7:2
-	>=dev-util/cucumber-1.1.1"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.11:2 )"
-
-all_ruby_prepare() {
-	# Remove bundler-related code.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	rm Gemfile || die
-
-	# Remove references to git ls-files.
-	sed -i -e '/git ls-files/d' aruba.gemspec || die
-}
diff --git a/dev-util/aruba/aruba-0.6.2-r3.ebuild b/dev-util/aruba/aruba-0.6.2-r3.ebuild
index 0a34e9249182..8213a2f3b1cd 100644
--- a/dev-util/aruba/aruba-0.6.2-r3.ebuild
+++ b/dev-util/aruba/aruba-0.6.2-r3.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/aruba/aruba-2.0.0.ebuild b/dev-util/aruba/aruba-2.0.0.ebuild
deleted file mode 100644
index bb5e962bc411..000000000000
--- a/dev-util/aruba/aruba-2.0.0.ebuild
+++ /dev/null
@@ -1,64 +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"
-
-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"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-DEPEND="${DEPEND} test? ( sys-devel/bc )"
-RDEPEND="${RDEPEND}"
-
-ruby_add_rdepend "
-	=dev-ruby/bundler-2*
-	>=dev-ruby/childprocess-2.0 <dev-ruby/childprocess-5
-	>=dev-ruby/contracts-0.16.0 <dev-ruby/contracts-0.18
-	>=dev-ruby/rspec-expectations-3.4:3
-	dev-ruby/thor:1
-	>=dev-util/cucumber-2.4 <dev-util/cucumber-8
-	!<dev-util/aruba-1.1.2-r1"
-
-ruby_add_bdepend "test? ( 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/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid features with minor output differences
-	sed -i -e '/Use .aruba. with .Minitest./i@wip' features/01_getting_started_with_aruba/supported_testing_frameworks.feature || die
-	sed -i -e '/Create files for Minitest/i@wip' features/06_use_aruba_cli/initialize_project_with_aruba.feature || die
-
-	# Avoid feature that requires aruba to be installed already
-	rm -r features/03_testing_frameworks/cucumber/disable_bundler.feature || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	RUBYLIB="$(pwd)/lib" ruby-ng_cucumber
-}