gentoo resync : 30.06.2018

3 files changed, 3 insertions, 45 deletions

diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 6135081794f9..f0ec6217ed63 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -1,8 +1,6 @@
-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.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 996 BLAKE2B 80620a5bd3bdbc01901142c5feaffba15e3c95e2c55f38316af6f990c035e49dddcc76e15f11532dad444acac2aeb57151f72c22bce29d619382522faef064e5 SHA512 fea9848ac20fca8837763665d6771af000ead36a4552a24a55f42912374131b1f44999a3db2cb32716f3bbec50dc31f9baebe647edba1e003ca17dc8b0193171
 EBUILD aruba-0.6.2-r2.ebuild 985 BLAKE2B 157b93d1d0e018a7c58f07a839d06d4386392cc36df235880009ffc409b5c0dd9d17c78486f7512f4febf33000a33e6f9ddc6edbc08bda152655cbeccdac6d15 SHA512 5cee45c56b5118a10e681828d9e72fb3c81f4f9e67abf300b5b62210b9a456a0a9ea5264b47ee110060c5db1aacea7a6464a20ac5f96f43b3f0eaa20b9aac618
-EBUILD aruba-0.8.1.ebuild 1666 BLAKE2B 9aff62c204cd99a32b631cd3765d07fbe7a9751bdf2460085ad08102145159be2a5b5923c85aecc69c54584a8519f4cb046ff7639ccf3f623a7bfeab9aa55608 SHA512 738cbf69940544392993e84fdfa1d5f34423818e34e7fc301ae4c2378d03a5641c6783e83b6f71951e667f050f6c24c84e6075b30959e463508733004db9bdb9
+EBUILD aruba-0.8.1.ebuild 1672 BLAKE2B a01b44c435d4594b8f58c5a272c2443c40ff04d20fd186a51421dc4d11dfcb7a1d68ea96191dcf3772c8247635e4ee296101cdbc26e441d67127509574dfc827 SHA512 411dfa207e15afc3bf6d32a0bfd02c0cf2c2f1a054cedb90c768e0435890d590e5723d810884405e69697df84394a7a545bc8bc4628ac4f8ec3046d0bc99433f
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-0.5.4-r1.ebuild b/dev-util/aruba/aruba-0.5.4-r1.ebuild
deleted file mode 100644
index c1e026d110bd..000000000000
--- a/dev-util/aruba/aruba-0.5.4-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23"
-
-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-2.11:2 >=dev-ruby/bcat-0.6.1 )"
-
-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.8.1.ebuild b/dev-util/aruba/aruba-0.8.1.ebuild
index 5d89ae37b9e7..389a430d1663 100644
--- a/dev-util/aruba/aruba-0.8.1.ebuild
+++ b/dev-util/aruba/aruba-0.8.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="cucumber"
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE=""