gentoo resync : 25.01.2018

4 files changed, 6 insertions, 59 deletions

diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 528e674d6df2..a21c386d559f 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -1,10 +1,8 @@
 DIST aruba-0.5.4.gem 69632 BLAKE2B 77e0c739681d4ff08430a63db9614568346328c1c0594ff0d07d9fc74539d08f56df57a826bd87ee2b78989dad24b9bee7e6bfad7c10277b07b67ce39c663dac SHA512 e783aedccd4be6915621cc1f0d8b61f8a2895204ff9e483fdbd4b34b6f32eaccc973938a5e507c5346f50f9f9166fc7b7a885700aa13c6c7b00ffdf0eed78720
 DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
-DIST aruba-0.7.4.gem 91648 BLAKE2B 6a71fc740bcaee845271f82f7ab36a9205df796aebcd1502466e65690f978a090df7e13ebec5d172d4562adf5c5fbbb7b68606511f704abb8371989eb0fc4b96 SHA512 f36f50b629a039c894b5a5e7e21dd37db2dacd0947c7288e254666110baa81975e1f2c0372fc20b915cdc6906715bbc10e0b078d3321c9d7c875da4b097de118
 DIST aruba-0.8.1.gem 121344 BLAKE2B 0b601a4d4bcd19159bb23b22b7975d1275ed2ab9c06e9ab550e11a151e953eba9ec4cc05280e69685a54b82996b4863b485a74f91d64270cc058f43272f6df6d SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f
 EBUILD aruba-0.5.4-r1.ebuild 978 BLAKE2B 87b1c5200542713b1e1aff8c42146bdc3cfa5984f9d44a358444a24554b88388b84d60ecb4abdb63198e64af0c6d7f3c462c2e39c11a54152936cb9af039ffae SHA512 6064116cef51005229e016cba328b1b63c96e5279c52f09ca76a89c1a62bb0e2e134d5cdc10a484ea37d849ac34d98763bf0fbf9a1b8f82ae53bfec364e5b1cd
 EBUILD aruba-0.6.2-r1.ebuild 982 BLAKE2B 7839b281c45698aff3ef137eea8036c56c535bf4f6585b387cd0db24f64a7ac7c951bc14fec294e8657db19e70055c1b9c04f6b36d487b83e1e7bdd39350b979 SHA512 b667c836becb888223fac9f30a5dd858501270995aa3e71cb77306c43051309b0114c6c56c152ceab70be1ca6c0b13c4dce99ff9f9189f0efceb61e49c8e371e
-EBUILD aruba-0.6.2.ebuild 992 BLAKE2B cc346c563facc83dfe092932401ac736c44b45a1cb35a58c256808a9487c667e05c4bd451c5c10e6eff1a254e0a9c110d0156e6509e4a62ad5e0d91bd2add6e2 SHA512 859b7b7a1da19ad4687c8362a4fbc0964063f1d5b2fae8b209604add856e974e3b8c6f17627d98a2307c79bf526876223cf2f90f984ea7983352922d0c3529a5
-EBUILD aruba-0.7.4.ebuild 1305 BLAKE2B 8b0a11f7586caf45f615b06fe75f546e04724f15588098ab32d177debb4cbf1a409bdfae016a865963fe2d920e6e8d5a32e7f2dd6a1c41507facd33d88833148 SHA512 a3922e5b3550e7b93582b5fea463f68a0064a9e4e2e56950d9f52720a019f663e0163c8acea68ea5fbe0c48ef615e1124cda8c566affce80e122fc7551f9f694
-EBUILD aruba-0.8.1.ebuild 1666 BLAKE2B bb7465c5483d989737a710dd8f5d357ddbcbff4b4fcf034c9011374df56d7af85c7407308084136719d6402bb9446c1b8e69d425a18556d024cac0dc95e9666c SHA512 d91882d6e4629d2e8e686e5f6393065e19d8bba990baac4e40234350779037689e3bbee8dccfe189520f5697e1879e07f4fd2d4e5d0fd8dd976c962875a9cfcd
+EBUILD aruba-0.6.2.ebuild 985 BLAKE2B fe9c02aed0fd268983ef592164fa53306fda96ce32d27ef3ea93090c3917da2f97030e2dd21777751d78cb0666d192c947f722f62aab70f15770ef85d19a9a3f SHA512 deb59f89b7ad08e033cad93b6075b9d72a89959fe72553feb3b4f66a458c0d4508a4833ac0e9ee7e0199910e5ecc7551f56b6c5183c68e3f4407bba22e2abf30
+EBUILD aruba-0.8.1.ebuild 1666 BLAKE2B 9aff62c204cd99a32b631cd3765d07fbe7a9751bdf2460085ad08102145159be2a5b5923c85aecc69c54584a8519f4cb046ff7639ccf3f623a7bfeab9aa55608 SHA512 738cbf69940544392993e84fdfa1d5f34423818e34e7fc301ae4c2378d03a5641c6783e83b6f71951e667f050f6c24c84e6075b30959e463508733004db9bdb9
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-0.6.2.ebuild b/dev-util/aruba/aruba-0.6.2.ebuild
index bfd66f5dc73e..f85d54a391d8 100644
--- a/dev-util/aruba/aruba-0.6.2.ebuild
+++ b/dev-util/aruba/aruba-0.6.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="cucumber"
diff --git a/dev-util/aruba/aruba-0.7.4.ebuild b/dev-util/aruba/aruba-0.7.4.ebuild
deleted file mode 100644
index db894883c98a..000000000000
--- a/dev-util/aruba/aruba-0.7.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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:3 >=dev-ruby/bcat-0.6.1 )"
-
-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
-
-	# Remove references to git ls-files.
-	sed -i -e '/git ls-files/d' aruba.gemspec || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	ruby-ng_cucumber
-}
diff --git a/dev-util/aruba/aruba-0.8.1.ebuild b/dev-util/aruba/aruba-0.8.1.ebuild
index 1110c6b99139..5d89ae37b9e7 100644
--- a/dev-util/aruba/aruba-0.8.1.ebuild
+++ b/dev-util/aruba/aruba-0.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="cucumber"