2017-08-20 09:06:40 UTC

12 files changed, 60 insertions, 60 deletions

diff --git a/metadata/md5-cache/dev-util/aruba-0.5.4-r1 b/metadata/md5-cache/dev-util/aruba-0.5.4-r1
index 0aacaa2afe46..680532728ee7 100644
--- a/metadata/md5-cache/dev-util/aruba-0.5.4-r1
+++ b/metadata/md5-cache/dev-util/aruba-0.5.4-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby21] >=dev-util/cucumber-1.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby21] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby22] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( test? ( dev-util/cucumber[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby22] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Cucumber steps for driving out command line applications
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/aruba
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby21] >=dev-util/cucumber-1.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.5.4.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7025ef109ffd07e57c7df8b60b145c6d
diff --git a/metadata/md5-cache/dev-util/aruba-0.6.2 b/metadata/md5-cache/dev-util/aruba-0.6.2
index 259bc215ecd6..a00dcb495305 100644
--- a/metadata/md5-cache/dev-util/aruba-0.6.2
+++ b/metadata/md5-cache/dev-util/aruba-0.6.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby21] >=dev-util/cucumber-1.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby21] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby22] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( test? ( dev-util/cucumber[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby22] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Cucumber steps for driving out command line applications
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/aruba
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby21] >=dev-util/cucumber-1.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.6.2.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b29a4945c1ab659c6343c0cc7eac10f3
diff --git a/metadata/md5-cache/dev-util/aruba-0.6.2-r1 b/metadata/md5-cache/dev-util/aruba-0.6.2-r1
index 8f580de4f4e2..411b35450521 100644
--- a/metadata/md5-cache/dev-util/aruba-0.6.2-r1
+++ b/metadata/md5-cache/dev-util/aruba-0.6.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby21] >=dev-util/cucumber-1.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby23] >=dev-util/cucumber-1.1.1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby21] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby22] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby23] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( test? ( dev-util/cucumber[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby23] >=dev-util/cucumber-1.1.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby22] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby23] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Cucumber steps for driving out command line applications
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/aruba
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby21] >=dev-util/cucumber-1.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby23] >=dev-util/cucumber-1.1.1[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby23] >=dev-util/cucumber-1.1.1[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.6.2.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9227a7dd11208ea34d93561ea28707e4
diff --git a/metadata/md5-cache/dev-util/aruba-0.7.4 b/metadata/md5-cache/dev-util/aruba-0.7.4
index ec9c24b9ce89..9c86602f5850 100644
--- a/metadata/md5-cache/dev-util/aruba-0.7.4
+++ b/metadata/md5-cache/dev-util/aruba-0.7.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby21] >=dev-util/cucumber-1.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( test? ( dev-util/cucumber[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Cucumber steps for driving out command line applications
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/aruba
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby21] >=dev-util/cucumber-1.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.1[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.7.4.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d94bb0449c918dbb8666a88c060b8987
diff --git a/metadata/md5-cache/dev-util/aruba-0.8.1 b/metadata/md5-cache/dev-util/aruba-0.8.1
index f0410490642b..e953fc398289 100644
--- a/metadata/md5-cache/dev-util/aruba-0.8.1
+++ b/metadata/md5-cache/dev-util/aruba-0.8.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby21] =dev-ruby/childprocess-0*[ruby_targets_ruby21] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby21] >=dev-util/cucumber-1.3.19[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby22] =dev-ruby/childprocess-0*[ruby_targets_ruby22] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby22] >=dev-util/cucumber-1.3.19[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] >=dev-ruby/bcat-0.6.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/bcat-0.6.2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( test? ( dev-util/cucumber[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby22] =dev-ruby/childprocess-0*[ruby_targets_ruby22] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby22] >=dev-util/cucumber-1.3.19[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/bcat-0.6.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Cucumber steps for driving out command line applications
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/aruba
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby21] =dev-ruby/childprocess-0*[ruby_targets_ruby21] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby21] >=dev-util/cucumber-1.3.19[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby22] =dev-ruby/childprocess-0*[ruby_targets_ruby22] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby22] >=dev-util/cucumber-1.3.19[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby22] =dev-ruby/childprocess-0*[ruby_targets_ruby22] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby22] >=dev-util/cucumber-1.3.19[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.8.1.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b8047d16341a1d7cd352795683d4dd8d
diff --git a/metadata/md5-cache/dev-util/cucumber-1.3.20-r1 b/metadata/md5-cache/dev-util/cucumber-1.3.20-r1
index c976c73c62fe..9feb1e7d9cb5 100644
--- a/metadata/md5-cache/dev-util/cucumber-1.3.20-r1
+++ b/metadata/md5-cache/dev-util/cucumber-1.3.20-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-2.13.0[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby21] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby21] >=dev-util/aruba-0.5.2[ruby_targets_ruby21] >=dev-ruby/json-1.7[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] >=dev-util/cucumber-1.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.13.0[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby22] >=dev-util/aruba-0.5.2[ruby_targets_ruby22] >=dev-ruby/json-1.7[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] >=dev-util/cucumber-1.3[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby21] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby21] >=dev-ruby/gherkin-2.12.0:0[ruby_targets_ruby21] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby21] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] >=dev-ruby/gherkin-2.12.0:0[ruby_targets_ruby22] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby22] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.13.0[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby22] >=dev-util/aruba-0.5.2[ruby_targets_ruby22] >=dev-ruby/json-1.7[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] >=dev-util/cucumber-1.3[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] >=dev-ruby/gherkin-2.12.0:0[ruby_targets_ruby22] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby22] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Executable feature scenarios
 EAPI=5
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
-IUSE=examples test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=examples test test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby21] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby21] >=dev-ruby/gherkin-2.12.0:0[ruby_targets_ruby21] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby21] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] >=dev-ruby/gherkin-2.12.0:0[ruby_targets_ruby22] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby22] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] >=dev-ruby/gherkin-2.12.0:0[ruby_targets_ruby22] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby22] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-1.3.20.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=44817b8bbdf01016bb98ebd5eca559b9
diff --git a/metadata/md5-cache/dev-util/cucumber-2.4.0 b/metadata/md5-cache/dev-util/cucumber-2.4.0
index 78f1a353f472..0e1f7fcb97f2 100644
--- a/metadata/md5-cache/dev-util/cucumber-2.4.0
+++ b/metadata/md5-cache/dev-util/cucumber-2.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby21] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby21] >=dev-util/aruba-0.6.1[ruby_targets_ruby21] =dev-util/aruba-0.6*[ruby_targets_ruby21] >=dev-ruby/json-1.7[ruby_targets_ruby21] >=dev-util/cucumber-2[ruby_targets_ruby21] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby22] >=dev-util/aruba-0.6.1[ruby_targets_ruby22] =dev-util/aruba-0.6*[ruby_targets_ruby22] >=dev-ruby/json-1.7[ruby_targets_ruby22] >=dev-util/cucumber-2[ruby_targets_ruby22] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby21] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby21] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby21] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby21] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby21] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby21] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby22] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby22] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby22] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby22] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby22] >=dev-util/aruba-0.6.1[ruby_targets_ruby22] =dev-util/aruba-0.6*[ruby_targets_ruby22] >=dev-ruby/json-1.7[ruby_targets_ruby22] >=dev-util/cucumber-2[ruby_targets_ruby22] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby22] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby22] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby22] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby22] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Executable feature scenarios
 EAPI=5
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
-IUSE=examples test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=examples test test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby21] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby21] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby21] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby21] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby21] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby21] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby22] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby22] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby22] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby22] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby22] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby22] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby22] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby22] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-2.4.0.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c3db480882b9166392ccda2365d03cfa
diff --git a/metadata/md5-cache/dev-util/cucumber-2.4.0-r1 b/metadata/md5-cache/dev-util/cucumber-2.4.0-r1
index cb6b14330ef4..b9978514a735 100644
--- a/metadata/md5-cache/dev-util/cucumber-2.4.0-r1
+++ b/metadata/md5-cache/dev-util/cucumber-2.4.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby21] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby21] >=dev-util/aruba-0.6.1[ruby_targets_ruby21] =dev-util/aruba-0.6*[ruby_targets_ruby21] >=dev-ruby/json-1.7[ruby_targets_ruby21] >=dev-util/cucumber-2[ruby_targets_ruby21] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby22] >=dev-util/aruba-0.6.1[ruby_targets_ruby22] =dev-util/aruba-0.6*[ruby_targets_ruby22] >=dev-ruby/json-1.7[ruby_targets_ruby22] >=dev-util/cucumber-2[ruby_targets_ruby22] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby23] >=dev-util/aruba-0.6.1[ruby_targets_ruby23] =dev-util/aruba-0.6*[ruby_targets_ruby23] >=dev-ruby/json-1.7[ruby_targets_ruby23] >=dev-util/cucumber-2[ruby_targets_ruby23] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby21] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby21] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby21] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby21] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby21] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby21] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby22] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby22] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby22] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby22] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby22] >=dev-util/aruba-0.6.1[ruby_targets_ruby22] =dev-util/aruba-0.6*[ruby_targets_ruby22] >=dev-ruby/json-1.7[ruby_targets_ruby22] >=dev-util/cucumber-2[ruby_targets_ruby22] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby23] >=dev-util/aruba-0.6.1[ruby_targets_ruby23] =dev-util/aruba-0.6*[ruby_targets_ruby23] >=dev-ruby/json-1.7[ruby_targets_ruby23] >=dev-util/cucumber-2[ruby_targets_ruby23] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby22] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby22] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby22] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby22] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Executable feature scenarios
 EAPI=5
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
-IUSE=examples test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=examples test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby21] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby21] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby21] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby21] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby21] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby21] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby22] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby22] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby22] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby22] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby22] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby22] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby22] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby22] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] >=dev-util/cucumber-core-1.5.0:0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-2.4.0.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8524efad040c4551a2c277d7447087ef
diff --git a/metadata/md5-cache/dev-util/cucumber-core-1.5.0 b/metadata/md5-cache/dev-util/cucumber-core-1.5.0
index 6d15c2d1b0ad..c6839a1fad46 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-1.5.0
+++ b/metadata/md5-cache/dev-util/cucumber-core-1.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Executable feature scenarios
 EAPI=5
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gherkin-4.0:4[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-core-1.5.0.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0a816aa9da770118b48371b3a344366d
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-1.4.5 b/metadata/md5-cache/dev-util/cucumber-rails-1.4.5
index f1a06a252160..7e7ef2b96d27 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-1.4.5
+++ b/metadata/md5-cache/dev-util/cucumber-rails-1.4.5
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby21] <dev-util/cucumber-4[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby21] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby21] <dev-ruby/capybara-3:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby21] <dev-ruby/railties-5.1:*[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] <dev-ruby/mime-types-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby22] <dev-util/cucumber-4[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby22] <dev-ruby/capybara-3:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby22] <dev-ruby/railties-5.1:*[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-3:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] <dev-ruby/railties-5.1:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby22] <dev-util/cucumber-4[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby22] <dev-ruby/capybara-3:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby22] <dev-ruby/railties-5.1:*[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-3:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] <dev-ruby/railties-5.1:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Executable feature scenarios for Rails
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/cucumber/wikis
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby21] <dev-util/cucumber-4[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby21] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby21] <dev-ruby/capybara-3:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby21] <dev-ruby/railties-5.1:*[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] <dev-ruby/mime-types-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby22] <dev-util/cucumber-4[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby22] <dev-ruby/capybara-3:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby22] <dev-ruby/railties-5.1:*[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-3:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] <dev-ruby/railties-5.1:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby22] <dev-util/cucumber-4[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby22] <dev-ruby/capybara-3:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby22] <dev-ruby/railties-5.1:*[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-3:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] <dev-ruby/railties-5.1:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://rubygems/cucumber-rails-1.4.5.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8eb35dd378f43f902e72b953f6f5d339
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-1.5.0 b/metadata/md5-cache/dev-util/cucumber-rails-1.5.0
index 4731cde5f52d..dd3f4c780a5e 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-1.5.0
+++ b/metadata/md5-cache/dev-util/cucumber-rails-1.5.0
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby21] <dev-util/cucumber-4[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby21] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby21] <dev-ruby/capybara-3:*[ruby_targets_ruby21] >=dev-ruby/railties-4:*[ruby_targets_ruby21] <dev-ruby/railties-5.2:*[ruby_targets_ruby21] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby21] <dev-ruby/mime-types-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby22] <dev-util/cucumber-4[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby22] <dev-ruby/capybara-3:*[ruby_targets_ruby22] >=dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-5.2:*[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-3:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby22] <dev-util/cucumber-4[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby22] <dev-ruby/capybara-3:*[ruby_targets_ruby22] >=dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-5.2:*[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-3:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Executable feature scenarios for Rails
 EAPI=6
 HOMEPAGE=https://github.com/cucumber/cucumber/wikis
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby21] <dev-util/cucumber-4[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby21] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby21] <dev-ruby/capybara-3:*[ruby_targets_ruby21] >=dev-ruby/railties-4:*[ruby_targets_ruby21] <dev-ruby/railties-5.2:*[ruby_targets_ruby21] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby21] <dev-ruby/mime-types-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby22] <dev-util/cucumber-4[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby22] <dev-ruby/capybara-3:*[ruby_targets_ruby22] >=dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-5.2:*[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-3:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby22] <dev-util/cucumber-4[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby22] <dev-ruby/capybara-3:*[ruby_targets_ruby22] >=dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-5.2:*[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-3:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://rubygems/cucumber-rails-1.5.0.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6a321b58766759b15b5c6887012d0916
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1 b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1
index 032c07a63406..f6ecaf1aec70 100644
--- a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-util/cucumber[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Executable feature scenarios
 EAPI=5
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-wire-0.0.1.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8955e133e4db81130bff22d2cb2b23a9