gentoo resync : 25.08.2020

5 files changed, 69 insertions, 60 deletions

diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 2a4817f9ca88..11d3a0406861 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -1,7 +1,7 @@
-DIST aruba-0.14.12.gem 172032 BLAKE2B be19078caef5e0d1c50d0f0da0efdbfb6cc128d40605eccd8ec7e89ba655523f4c8a0ac11e59d347439be3ac8da64f7c3ce5ff761c07c716efbc2e51c3bf420e SHA512 f75adf0b4ed04a4516111d7cc5834807f940c517baf652dc8062450d7c284f11c9dc68216757e431a4e1fd084c50c2b0eb274c2d2c3e25795785a44b0a61e06d
 DIST aruba-0.14.14.gem 172544 BLAKE2B 085a0a030c5c4d1527e80ce004adeb80fc8a9eca8507211acaf49d947ed412aa54f1319104833a8fbb76d3ce5b77e84b35187234ee97060b51e8877519ed6249 SHA512 612b742bdf89e0272714d709a772eded1c61c654977bb58f7e6e5ef5a8b29dece848bf3c70aa6bc566e6c2a75b3e39e637fa5e37f869fbf4bf3d0997257df9f7
 DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
-EBUILD aruba-0.14.12.ebuild 1520 BLAKE2B 947a401829e02bc0b9aac249ebac01b06f8a80a2d1412a4b1886e89232b5ddc11b5c6899b77c7d95321a6ea71ddb54e02d7a8da7ef180d398649b0abaf35dd9e SHA512 2b105bb544644d01e88e6c6ce539b1bc91267ec1104be455585ddf47e3e775905883b29a0ea540dec9a436f8f77e2db754551b6b9ab8db8931d988635d667c80
-EBUILD aruba-0.14.14.ebuild 1520 BLAKE2B f30a8e3eb009dc14ed00cdb71decf87f46c34d3c98246adf58b3edf916d08de616135246e8968eef870d47a6f4fe85dbf37fa9d263fd5bfd1ec73665a65c9e3e SHA512 27b7f88ef244634ff9c1aca29f3c11c1cab9b5829f614c0a4450aec415b5d61e399c62bda3db9e6a5733b9639329e7f67b5c6a2773ca5382ccc2caebfc59b46e
-EBUILD aruba-0.6.2-r2.ebuild 988 BLAKE2B bf2e43c4a655e129fe796c6c4453394c6efac353c5979fd3b2837b4c122ff02d92999d1f3b15e6f566a05bda770216b8c89156197fbdd8d08fbdd071f50ecc79 SHA512 1e85cac5483b8c1bf49dc5079f4dccd98c7c7bc8072d7a2f21fc2e290c23563b50fd25fb60b7f19bb1a9b6ab7dabb299a06ff9542d9c8235855bfbdafcf97327
+DIST aruba-1.0.2.tar.gz 132977 BLAKE2B 762abef412a62e91931690a0a56ee1b04868c9f446f79e1c282e15c1ded1faf609d480e7fb032b09c3230e2d233b3cb0e09a58b2950c7a138f486c34339b8a0c SHA512 ff9161a94627e1bd123c00a0c3dd8624034b10741867d60c85264322e4ae5f2226d585d361fe8f2229003c187a1dff38c4278c359f018ca28cef1fd6efd26aa0
+EBUILD aruba-0.14.14.ebuild 1746 BLAKE2B 419b70985f18519c23aab2e13b006d867a19ae534fda30c9a4ab88a3df18bab5a38b74b5614c8fa00f1577acca27b90ab260c05de2da8700133d33c71edbc97f SHA512 84eb8be2f99c0e7a65a61450ed56ddf632565da6db96e1b10e5cd5dffeae24f476a765507a2e57fffa22a7d90447036967f66cd346bf03c7151c5797d6118140
+EBUILD aruba-0.6.2-r2.ebuild 966 BLAKE2B 5ac0fb744b55ea1931dfb419839b292bdea1a3191b2e2fe0d4cc913d4cd4cbef2829e581b40df28d7665e4cc5e8dcb9af43c8df8851b698040fe5af72b9ca357 SHA512 e58618308f98b565f103de437e5b2d4fafd1994dca8e3c9654300fe2dc474259cf7cb7c009a67cfd0c4d3c9b6846351a4b6807950756f6fab760e2f237843437
+EBUILD aruba-1.0.2.ebuild 1922 BLAKE2B f7d9aa054e862cf7aeef26a322a067ef8b279c8a96a472471aa0dd2a027c0e06d66908ede4730ccfeeec07c76dcc52657a497f7040d9b83104a60cee83d4f032 SHA512 e8451f0ec7ec1c9967dd0046050eb01b96ce616c55fb50ab98705595ad4b98b747df4be1c468da45163c710398d2de2b253d3b3ff58f042153f45e30664bc311
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-0.14.12.ebuild b/dev-util/aruba/aruba-0.14.12.ebuild
deleted file mode 100644
index 4397253389bd..000000000000
--- a/dev-util/aruba/aruba-0.14.12.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="cucumber"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_BINDIR="exe"
-
-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.6.3 <dev-ruby/childprocess-4
-	>=dev-ruby/contracts-0.9:0
-	>=dev-ruby/ffi-1.9
-	>=dev-ruby/rspec-expectations-2.99:2
-	>=dev-ruby/thor-0.19:0
-	>=dev-util/cucumber-1.3.19"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 >=dev-ruby/bcat-0.6.2 )"
-
-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 -i -e '1i require "time"' spec/spec_helper.rb || die
-
-	sed -i -e '/Scenario: Default value/i@wip' features/02_configure_aruba/home_directory.feature || die
-	sed -i -e '/Use ~ in path/i@wip' features/04_aruba_api/core/expand_path.feature || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	RUBYLIB="$(pwd)/lib" ruby-ng_cucumber
-}
diff --git a/dev-util/aruba/aruba-0.14.14.ebuild b/dev-util/aruba/aruba-0.14.14.ebuild
index 33c49702f362..9b29c27e1b64 100644
--- a/dev-util/aruba/aruba-0.14.14.ebuild
+++ b/dev-util/aruba/aruba-0.14.14.ebuild
@@ -30,7 +30,7 @@ ruby_add_rdepend "
 	>=dev-ruby/thor-0.19:0
 	>=dev-util/cucumber-1.3.19"
 
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 >=dev-ruby/bcat-0.6.2 )"
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
 
 all_ruby_prepare() {
 	# Remove bundler-related code.
@@ -43,8 +43,10 @@ all_ruby_prepare() {
 	rm -f features/support/simplecov_setup.rb || die
 	sed -i -e '1i require "time"' spec/spec_helper.rb || die
 
+	sed -i -e '/Use .aruba. with .Minitest./i@wip' features/01_getting_started_with_aruba/supported_testing_frameworks.feature || die
 	sed -i -e '/Scenario: Default value/i@wip' features/02_configure_aruba/home_directory.feature || die
 	sed -i -e '/Use ~ in path/i@wip' features/04_aruba_api/core/expand_path.feature || die
+	sed -i -e '/Create files for Minitest/i@wip' features/06_use_aruba_cli/initialize_project_with_aruba.feature || die
 }
 
 each_ruby_test() {
diff --git a/dev-util/aruba/aruba-0.6.2-r2.ebuild b/dev-util/aruba/aruba-0.6.2-r2.ebuild
index 67baaa3b42d8..fe3881d25c7f 100644
--- a/dev-util/aruba/aruba-0.6.2-r2.ebuild
+++ b/dev-util/aruba/aruba-0.6.2-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="cucumber"
@@ -28,7 +28,7 @@ ruby_add_rdepend "
 	>=dev-ruby/rspec-expectations-2.7:2
 	>=dev-util/cucumber-1.1.1"
 
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.11:2 >=dev-ruby/bcat-0.6.1 )"
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.11:2 )"
 
 all_ruby_prepare() {
 	# Remove bundler-related code.
diff --git a/dev-util/aruba/aruba-1.0.2.ebuild b/dev-util/aruba/aruba-1.0.2.ebuild
new file mode 100644
index 000000000000..e98d59761778
--- /dev/null
+++ b/dev-util/aruba/aruba-1.0.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+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 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+DEPEND="${DEPEND} test? ( sys-devel/bc )"
+RDEPEND="${RDEPEND}"
+
+ruby_add_rdepend "
+	>=dev-ruby/childprocess-2.0 <dev-ruby/childprocess-5
+	>=dev-ruby/contracts-0.16.0:0
+	>=dev-ruby/ffi-1.9
+	>=dev-ruby/rspec-expectations-3.4:3
+	dev-ruby/thor:1
+	>=dev-util/cucumber-2.4 <dev-util/cucumber-5"
+
+ruby_add_bdepend "test? ( 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 -i -e 's/git ls-files -z/find -print0/' ${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 '/Failed detection of exact multi-line output/i@wip' features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature || die
+	sed -i -e '/Create files for Minitest/i@wip' features/06_use_aruba_cli/initialize_project_with_aruba.feature || die
+
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	RUBYLIB="$(pwd)/lib" ruby-ng_cucumber
+}