2017-08-20 09:06:40 UTC

1535 files changed, 7200 insertions, 7308 deletions

diff --git a/metadata/md5-cache/app-admin/mcollective-2.11.1 b/metadata/md5-cache/app-admin/mcollective-2.11.1
index 4ca7a37f2d0d..c39b8013753b 100644
--- a/metadata/md5-cache/app-admin/mcollective-2.11.1
+++ b/metadata/md5-cache/app-admin/mcollective-2.11.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 DESCRIPTION=Framework to build server orchestration or parallel job execution systems
 EAPI=5
 HOMEPAGE=http://marionette-collective.org/
-IUSE=doc +client elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
+IUSE=doc +client elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=dev-ruby/stomp ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=dev-ruby/stomp ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.11.1.tar.gz -> mcollective-2.11.1.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:- src_test:ruby-ng src_install:ruby-ng
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ef00ed8e299064f8e1950e45306af890
diff --git a/metadata/md5-cache/app-admin/mcollective-2.11.2 b/metadata/md5-cache/app-admin/mcollective-2.11.2
index fdc33cc8c52c..48f6a49d366d 100644
--- a/metadata/md5-cache/app-admin/mcollective-2.11.2
+++ b/metadata/md5-cache/app-admin/mcollective-2.11.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 DESCRIPTION=Framework to build server orchestration or parallel job execution systems
 EAPI=6
 HOMEPAGE=https://docs.puppet.com/mcollective/
-IUSE=doc +client elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
+IUSE=doc +client elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-ruby/stomp ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=dev-ruby/stomp ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.11.2.tar.gz -> mcollective-2.11.2.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:- src_test:ruby-ng src_install:ruby-ng
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a0db2bb3c24c978770c95aee54fd1751
diff --git a/metadata/md5-cache/app-admin/puppet-3.8.7-r1 b/metadata/md5-cache/app-admin/puppet-3.8.7-r1
index 9330fbcc111d..0b87aa5bc324 100644
--- a/metadata/md5-cache/app-admin/puppet-3.8.7-r1
+++ b/metadata/md5-cache/app-admin/puppet-3.8.7-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] >=dev-ruby/rgen-0.7.0[ruby_targets_ruby21] >=dev-ruby/facter-1.6.2[ruby_targets_ruby21] <dev-ruby/facter-3[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.7.0[ruby_targets_ruby22] >=dev-ruby/facter-1.6.2[ruby_targets_ruby22] <dev-ruby/facter-3[ruby_targets_ruby22] dev-ruby/json[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.7.0[ruby_targets_ruby23] >=dev-ruby/facter-1.6.2[ruby_targets_ruby23] <dev-ruby/facter-3[ruby_targets_ruby23] dev-ruby/json[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) emacs? ( virtual/emacs ) xemacs? ( app-editors/xemacs ) 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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.7.0[ruby_targets_ruby22] >=dev-ruby/facter-1.6.2[ruby_targets_ruby22] <dev-ruby/facter-3[ruby_targets_ruby22] dev-ruby/json[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.7.0[ruby_targets_ruby23] >=dev-ruby/facter-1.6.2[ruby_targets_ruby23] <dev-ruby/facter-3[ruby_targets_ruby23] dev-ruby/json[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) emacs? ( virtual/emacs ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A system automation and configuration management software
 EAPI=5
 HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
 LICENSE=Apache-2.0 GPL-2
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] >=dev-ruby/rgen-0.7.0[ruby_targets_ruby21] >=dev-ruby/facter-1.6.2[ruby_targets_ruby21] <dev-ruby/facter-3[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.7.0[ruby_targets_ruby22] >=dev-ruby/facter-1.6.2[ruby_targets_ruby22] <dev-ruby/facter-3[ruby_targets_ruby22] dev-ruby/json[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.7.0[ruby_targets_ruby23] >=dev-ruby/facter-1.6.2[ruby_targets_ruby23] <dev-ruby/facter-3[ruby_targets_ruby23] dev-ruby/json[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 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/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.7.0[ruby_targets_ruby22] >=dev-ruby/facter-1.6.2[ruby_targets_ruby22] <dev-ruby/facter-3[ruby_targets_ruby22] dev-ruby/json[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.7.0[ruby_targets_ruby23] >=dev-ruby/facter-1.6.2[ruby_targets_ruby23] <dev-ruby/facter-3[ruby_targets_ruby23] dev-ruby/json[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 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=http://downloads.puppetlabs.com/puppet/puppet-3.8.7.tar.gz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- 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_=elisp-common	19ff54b35acd0bf2a14831a308a57753	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	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
+_eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	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	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
 _md5_=19edff0f20544c22b84eac8906a195ad
diff --git a/metadata/md5-cache/app-admin/puppet-4.10.1 b/metadata/md5-cache/app-admin/puppet-4.10.1
index 8fae1e887b7f..110fa9aaa02f 100644
--- a/metadata/md5-cache/app-admin/puppet-4.10.1
+++ b/metadata/md5-cache/app-admin/puppet-4.10.1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) emacs? ( virtual/emacs ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) emacs? ( virtual/emacs ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A system automation and configuration management software.
 EAPI=5
 HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 ~hppa ~ppc x86
 LICENSE=Apache-2.0 GPL-2
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 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/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.10.1.tar.gz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- 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_=elisp-common	19ff54b35acd0bf2a14831a308a57753	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	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
+_eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	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	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
 _md5_=f45f5a28e449059ebaea4b0a69aa2168
diff --git a/metadata/md5-cache/app-admin/puppet-4.10.6 b/metadata/md5-cache/app-admin/puppet-4.10.6
index 841c7d795ed6..b978763cd248 100644
--- a/metadata/md5-cache/app-admin/puppet-4.10.6
+++ b/metadata/md5-cache/app-admin/puppet-4.10.6
@@ -1,17 +1,17 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ) xemacs? ( app-editors/xemacs ) 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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A system automation and configuration management software.
 EAPI=6
 HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~hppa ~ppc ~x86
 LICENSE=Apache-2.0 GPL-2
 PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 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/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 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=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.10.6.tar.gz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- 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	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
+_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	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
 _md5_=7883359baba0c9ea429e27e37d066baf
diff --git a/metadata/md5-cache/app-admin/puppet-4.8.1 b/metadata/md5-cache/app-admin/puppet-4.8.1
index cd2e60fd2cbb..6c7334c9fde8 100644
--- a/metadata/md5-cache/app-admin/puppet-4.8.1
+++ b/metadata/md5-cache/app-admin/puppet-4.8.1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) emacs? ( virtual/emacs ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) emacs? ( virtual/emacs ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A system automation and configuration management software.
 EAPI=5
 HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 hppa ~ppc ~x86
 LICENSE=Apache-2.0 GPL-2
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 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/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.8.1.tar.gz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- 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_=elisp-common	19ff54b35acd0bf2a14831a308a57753	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	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
+_eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	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	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
 _md5_=903da9c31bbe2013c265cd9a11380b3d
diff --git a/metadata/md5-cache/app-admin/puppet-5.0.1 b/metadata/md5-cache/app-admin/puppet-5.0.1
index 5429a65aa49c..64584a0e075f 100644
--- a/metadata/md5-cache/app-admin/puppet-5.0.1
+++ b/metadata/md5-cache/app-admin/puppet-5.0.1
@@ -1,17 +1,17 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] dev-ruby/hocon[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) test? ( dev-ruby/mocha[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=A system automation and configuration management software.
 EAPI=5
 HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~hppa ~ppc ~x86
 LICENSE=Apache-2.0 GPL-2
 PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] dev-ruby/hocon[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] dev-ruby/hocon[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 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/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 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=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-5.0.1.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- 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	user	e4b567c44272a719fabf53f0f885d3f7	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	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f22e7039c9a3e1eab546210dfa716e05
diff --git a/metadata/md5-cache/app-admin/puppet-5.1.0 b/metadata/md5-cache/app-admin/puppet-5.1.0
index 0b0ec1b96daa..0ce88f2d6dd6 100644
--- a/metadata/md5-cache/app-admin/puppet-5.1.0
+++ b/metadata/md5-cache/app-admin/puppet-5.1.0
@@ -1,17 +1,17 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] dev-ruby/hocon[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) test? ( dev-ruby/mocha[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=A system automation and configuration management software.
 EAPI=6
 HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~hppa ~ppc ~x86
 LICENSE=Apache-2.0 GPL-2
 PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] dev-ruby/hocon[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] dev-ruby/hocon[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 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/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 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=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-5.1.0.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- 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	user	e4b567c44272a719fabf53f0f885d3f7	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	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=64bcd855e8446f0816c91633f33d04d4
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.0.2 b/metadata/md5-cache/app-admin/puppet-lint-2.0.2
index 3556ee7b3ac4..8f065eaf4e44 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.0.2
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby21] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby22] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers: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? ( 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/rspec-its:1[ruby_targets_ruby22] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers:1[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=A linter for puppet DSL
 EAPI=5
 HOMEPAGE=http://puppet-lint.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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/puppet-lint-2.0.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_=f07968f96c08f5b0365371c03f446bab
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.1.0 b/metadata/md5-cache/app-admin/puppet-lint-2.1.0
index 3b5a18b81411..7053298b6ff6 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.1.0
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby21] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby21] dev-ruby/rspec-json_expectations[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby22] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby22] dev-ruby/rspec-json_expectations[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby23] dev-ruby/rspec-json_expectations[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/rspec-its:1[ruby_targets_ruby22] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby22] dev-ruby/rspec-json_expectations[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby23] dev-ruby/rspec-json_expectations[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=A linter for puppet DSL
 EAPI=5
 HOMEPAGE=http://puppet-lint.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/puppet-lint-2.1.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_=2aa3bdfd004ccef65138246957a5fabf
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.1.1 b/metadata/md5-cache/app-admin/puppet-lint-2.1.1
index a0fa4374fd33..210873448870 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.1.1
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby21] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby21] dev-ruby/rspec-json_expectations[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby22] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby22] dev-ruby/rspec-json_expectations[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby23] dev-ruby/rspec-json_expectations[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/rspec-its:1[ruby_targets_ruby22] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby22] dev-ruby/rspec-json_expectations[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby23] dev-ruby/rspec-json_expectations[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=A linter for puppet DSL
 EAPI=5
 HOMEPAGE=http://puppet-lint.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/puppet-lint-2.1.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_=67a39ea785beea1c142c5ecbe137150a
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.2.1 b/metadata/md5-cache/app-admin/puppet-lint-2.2.1
index 6faa775959e4..ec56b1cf74e0 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.2.1
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby21] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby21] dev-ruby/rspec-json_expectations[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby22] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby22] dev-ruby/rspec-json_expectations[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby23] dev-ruby/rspec-json_expectations[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/rspec-its:1[ruby_targets_ruby22] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby22] dev-ruby/rspec-json_expectations[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby23] dev-ruby/rspec-json_expectations[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=A linter for puppet DSL
 EAPI=5
 HOMEPAGE=http://puppet-lint.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/puppet-lint-2.2.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_=67a39ea785beea1c142c5ecbe137150a
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.3.0 b/metadata/md5-cache/app-admin/puppet-lint-2.3.0
index 7c3f1a3c0683..8f966b6d80cc 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.3.0
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby21] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby21] dev-ruby/rspec-json_expectations[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby22] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby22] dev-ruby/rspec-json_expectations[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby23] dev-ruby/rspec-json_expectations[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/rspec-its:1[ruby_targets_ruby22] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby22] dev-ruby/rspec-json_expectations[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby23] dev-ruby/rspec-json_expectations[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=A linter for puppet DSL
 EAPI=6
 HOMEPAGE=http://puppet-lint.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/puppet-lint-2.3.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_=3a98d930658690bc97d61ed90d7001f8
diff --git a/metadata/md5-cache/app-admin/r10k-1.5.1 b/metadata/md5-cache/app-admin/r10k-1.5.1
index b0df33c95e6c..25a99aad9395 100644
--- a/metadata/md5-cache/app-admin/r10k-1.5.1
+++ b/metadata/md5-cache/app-admin/r10k-1.5.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/colored-1.2[ruby_targets_ruby21] =dev-ruby/cri-2.7*[ruby_targets_ruby21] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby21] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby21] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby21] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby21] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby21] >=dev-ruby/multi_json-1.10[ruby_targets_ruby21] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] =dev-ruby/cri-2.7*[ruby_targets_ruby22] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby22] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby22] dev-ruby/json[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/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_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? ( ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] =dev-ruby/cri-2.7*[ruby_targets_ruby22] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby22] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby22] dev-ruby/json[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Puppet environment and module deployment
 EAPI=5
 HOMEPAGE=https://github.com/adrienthebo/r10k
-IUSE=+git test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=+git test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/colored-1.2[ruby_targets_ruby21] =dev-ruby/cri-2.7*[ruby_targets_ruby21] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby21] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby21] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby21] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby21] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby21] >=dev-ruby/multi_json-1.10[ruby_targets_ruby21] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] =dev-ruby/cri-2.7*[ruby_targets_ruby22] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby22] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby22] dev-ruby/json[ruby_targets_ruby22] ) git? ( >=dev-vcs/git-1.6.6 ) 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/colored-1.2[ruby_targets_ruby22] =dev-ruby/cri-2.7*[ruby_targets_ruby22] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby22] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby22] dev-ruby/json[ruby_targets_ruby22] ) git? ( >=dev-vcs/git-1.6.6 ) 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/r10k-1.5.1.gem
 _eclass_exported_funcs=pkg_postinst:- 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_=9b55e697a8822950097804b83b3b04fe
diff --git a/metadata/md5-cache/app-admin/r10k-1.5.1-r1 b/metadata/md5-cache/app-admin/r10k-1.5.1-r1
index b97f4cd6d9a8..bbaebc436bdb 100644
--- a/metadata/md5-cache/app-admin/r10k-1.5.1-r1
+++ b/metadata/md5-cache/app-admin/r10k-1.5.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/colored-1.2[ruby_targets_ruby21] =dev-ruby/cri-2.7*[ruby_targets_ruby21] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby21] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby21] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby21] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby21] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby21] >=dev-ruby/multi_json-1.10[ruby_targets_ruby21] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby21] >=dev-ruby/json-1.8:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] =dev-ruby/cri-2.7*[ruby_targets_ruby22] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby22] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby22] >=dev-ruby/json-1.8:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] =dev-ruby/cri-2.7*[ruby_targets_ruby23] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby23] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[ruby_targets_ruby23] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby23] >=dev-ruby/json-1.8:0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/archive-tar-minitar[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] =dev-ruby/cri-2.7*[ruby_targets_ruby22] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby22] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby22] >=dev-ruby/json-1.8:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] =dev-ruby/cri-2.7*[ruby_targets_ruby23] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby23] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[ruby_targets_ruby23] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby23] >=dev-ruby/json-1.8:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/archive-tar-minitar[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: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=Puppet environment and module deployment
 EAPI=5
 HOMEPAGE=https://github.com/adrienthebo/r10k
-IUSE=+git test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=+git test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/colored-1.2[ruby_targets_ruby21] =dev-ruby/cri-2.7*[ruby_targets_ruby21] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby21] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby21] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby21] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby21] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby21] >=dev-ruby/multi_json-1.10[ruby_targets_ruby21] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby21] >=dev-ruby/json-1.8:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] =dev-ruby/cri-2.7*[ruby_targets_ruby22] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby22] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby22] >=dev-ruby/json-1.8:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] =dev-ruby/cri-2.7*[ruby_targets_ruby23] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby23] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[ruby_targets_ruby23] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby23] >=dev-ruby/json-1.8:0[ruby_targets_ruby23] ) git? ( >=dev-vcs/git-1.6.6 ) 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/colored-1.2[ruby_targets_ruby22] =dev-ruby/cri-2.7*[ruby_targets_ruby22] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby22] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby22] >=dev-ruby/json-1.8:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] =dev-ruby/cri-2.7*[ruby_targets_ruby23] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby23] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[ruby_targets_ruby23] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby23] >=dev-ruby/json-1.8:0[ruby_targets_ruby23] ) git? ( >=dev-vcs/git-1.6.6 ) 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/r10k-1.5.1.gem
 _eclass_exported_funcs=pkg_postinst:- 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_=56ee8e2566f9b301bff67ea7e01ee1a8
diff --git a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3 b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
index c130121d2f85..1cfd2c529033 100644
--- a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
+++ b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 DESCRIPTION=Dictionary files for PRIME input method
 EAPI=5
 HOMEPAGE=http://taiyaki.org/prime/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
 KEYWORDS=alpha amd64 hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-2
-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 )
-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 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=http://prime.sourceforge.jp/src/prime-dict-1.0.0.tar.gz
 _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-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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=00dc926d1d7a13e4ce1742a26ba823c2
diff --git a/metadata/md5-cache/app-editors/diakonos-0.9.4 b/metadata/md5-cache/app-editors/diakonos-0.9.4
index b20e17d5a338..515bc365bb75 100644
--- a/metadata/md5-cache/app-editors/diakonos-0.9.4
+++ b/metadata/md5-cache/app-editors/diakonos-0.9.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/curses[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/curses[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/curses[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) test? ( dev-ruby/bacon[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/bacon[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 )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/curses[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/curses[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 DESCRIPTION=A Linux editor for the masses
 EAPI=5
 HOMEPAGE=http://diakonos.pist0s.ca
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/curses[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/curses[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/curses[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 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/curses[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/curses[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=http://diakonos.pist0s.ca/archives/diakonos-0.9.4.tar.bz2
 _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-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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=576d156efd2d7e65a461f27779b17e9f
diff --git a/metadata/md5-cache/app-emulation/lxd-2.16 b/metadata/md5-cache/app-emulation/lxd-2.16
index 97b8a997402c..cc53c26ebfd9 100644
--- a/metadata/md5-cache/app-emulation/lxd-2.16
+++ b/metadata/md5-cache/app-emulation/lxd-2.16
@@ -3,12 +3,12 @@ DEPEND=>=dev-lang/go-1.7.1 dev-libs/protobuf nls? ( sys-devel/gettext ) test? (
 DESCRIPTION=Fast, dense and secure container management
 EAPI=6
 HOMEPAGE=https://linuxcontainers.org/lxd/introduction/
-IUSE=+daemon nls test linguas_de linguas_el linguas_fr linguas_it linguas_ja linguas_nl linguas_ru linguas_sr linguas_sv linguas_tr
+IUSE=+daemon nls test linguas_de linguas_el linguas_fr linguas_it linguas_ja linguas_nl linguas_ru linguas_sr linguas_sv linguas_tr linguas_zh
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=daemon? ( app-arch/xz-utils >=app-emulation/lxc-2.0.7[seccomp] net-dns/dnsmasq[dhcp,ipv6] net-misc/rsync[xattr] sys-apps/iproute2[ipv6] sys-fs/squashfs-tools virtual/acl )
 SLOT=0
-SRC_URI=https://github.com/lxc/lxd/archive/.tar.gz -> lxd-2.16.tar.gz https://github.com/dustinkirkland/golang-petname/archive/1f4996aa8aa05ee066aaf9e3179d340b48c6da74.tar.gz -> github.com-dustinkirkland-golang-petname-1f4996aa8aa05ee066aaf9e3179d340b48c6da74.tar.gz https://github.com/golang/protobuf/archive/ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e.tar.gz -> github.com-golang-protobuf-ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e.tar.gz https://github.com/gorilla/mux/archive/ac112f7d75a0714af1bd86ab17749b31f7809640.tar.gz -> github.com-gorilla-mux-ac112f7d75a0714af1bd86ab17749b31f7809640.tar.gz https://github.com/gorilla/websocket/archive/a69d9f6de432e2c6b296a947d8a5ee88f68522cf.tar.gz -> github.com-gorilla-websocket-a69d9f6de432e2c6b296a947d8a5ee88f68522cf.tar.gz https://github.com/gosexy/gettext/archive/74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz -> github.com-gosexy-gettext-74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz https://github.com/jessevdk/go-flags/archive/6cf8f02b4ae8ba723ddc64dcfd403e530c06d927.tar.gz -> github.com-jessevdk-go-flags-6cf8f02b4ae8ba723ddc64dcfd403e530c06d927.tar.gz https://github.com/mattn/go-colorable/archive/ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b.tar.gz -> github.com-mattn-go-colorable-ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b.tar.gz https://github.com/mattn/go-runewidth/archive/97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz -> github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz https://github.com/mattn/go-sqlite3/archive/6654e412c3c7eabb310d920cf73a2102dbf8c632.tar.gz -> github.com-mattn-go-sqlite3-6654e412c3c7eabb310d920cf73a2102dbf8c632.tar.gz https://github.com/olekukonko/tablewriter/archive/be5337e7b39e64e5f91445ce7e721888dbab7387.tar.gz -> github.com-olekukonko-tablewriter-be5337e7b39e64e5f91445ce7e721888dbab7387.tar.gz https://github.com/pborman/uuid/archive/e790cca94e6cc75c7064b1332e63811d4aae1a53.tar.gz -> github.com-pborman-uuid-e790cca94e6cc75c7064b1332e63811d4aae1a53.tar.gz https://github.com/stretchr/testify/archive/890a5c3458b43e6104ff5da8dfa139d013d77544.tar.gz -> github.com-stretchr-testify-890a5c3458b43e6104ff5da8dfa139d013d77544.tar.gz https://github.com/syndtr/gocapability/archive/db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz -> github.com-syndtr-gocapability-db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz https://github.com/go-stack/stack/archive/817915b46b97fd7bb80e8ab6b69f01a53ac3eebf.tar.gz -> github.com-go-stack-stack-817915b46b97fd7bb80e8ab6b69f01a53ac3eebf.tar.gz https://github.com/mattn/go-isatty/archive/fc9e8d8ef48496124e79ae0df75490096eccf6fe.tar.gz -> github.com-mattn-go-isatty-fc9e8d8ef48496124e79ae0df75490096eccf6fe.tar.gz https://github.com/juju/errors/archive/c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz -> github.com-juju-errors-c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz https://github.com/golang/crypto/archive/b176d7def5d71bdd214203491f89843ed217f420.tar.gz -> github.com-golang-crypto-b176d7def5d71bdd214203491f89843ed217f420.tar.gz https://github.com/golang/net/archive/1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz -> github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz https://github.com/golang/sync/archive/f52d1811a62927559de87708c8913c1650ce4f26.tar.gz -> github.com-golang-sync-f52d1811a62927559de87708c8913c1650ce4f26.tar.gz https://github.com/golang/text/archive/e56139fd9c5bc7244c76116c68e500765bb6db6b.tar.gz -> github.com-golang-text-e56139fd9c5bc7244c76116c68e500765bb6db6b.tar.gz https://github.com/golang/tools/archive/84a35ef54dff3c5596983e180ec10919fc432242.tar.gz -> github.com-golang-tools-84a35ef54dff3c5596983e180ec10919fc432242.tar.gz https://github.com/golang/sys/archive/9f7170bcd8e9f4d3691c06401119c46a769a1e03.tar.gz -> github.com-golang-sys-9f7170bcd8e9f4d3691c06401119c46a769a1e03.tar.gz https://github.com/go-check/check/archive/20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz -> github.com-go-check-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz https://github.com/flosch/pongo2/archive/5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz -> github.com-flosch-pongo2-5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz https://github.com/inconshreveable/log15/archive/b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f.tar.gz -> github.com-inconshreveable-log15-b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f.tar.gz https://github.com/lxc/go-lxc/archive/1a2cf29ce27f74298fe70acbf817ca2f46cf7457.tar.gz -> github.com-lxc-go-lxc-1a2cf29ce27f74298fe70acbf817ca2f46cf7457.tar.gz https://github.com/go-tomb/tomb/archive/d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz -> github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz https://github.com/go-yaml/yaml/archive/eb3733d160e74a9c7e442f435eb3bea458e1d19f.tar.gz -> github.com-go-yaml-yaml-eb3733d160e74a9c7e442f435eb3bea458e1d19f.tar.gz
+SRC_URI=https://github.com/lxc/lxd/archive/lxd-2.16.tar.gz -> lxd-2.16.tar.gz https://github.com/dustinkirkland/golang-petname/archive/1f4996aa8aa05ee066aaf9e3179d340b48c6da74.tar.gz -> github.com-dustinkirkland-golang-petname-1f4996aa8aa05ee066aaf9e3179d340b48c6da74.tar.gz https://github.com/golang/protobuf/archive/ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e.tar.gz -> github.com-golang-protobuf-ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e.tar.gz https://github.com/gorilla/mux/archive/ac112f7d75a0714af1bd86ab17749b31f7809640.tar.gz -> github.com-gorilla-mux-ac112f7d75a0714af1bd86ab17749b31f7809640.tar.gz https://github.com/gorilla/websocket/archive/a69d9f6de432e2c6b296a947d8a5ee88f68522cf.tar.gz -> github.com-gorilla-websocket-a69d9f6de432e2c6b296a947d8a5ee88f68522cf.tar.gz https://github.com/gosexy/gettext/archive/74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz -> github.com-gosexy-gettext-74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz https://github.com/jessevdk/go-flags/archive/6cf8f02b4ae8ba723ddc64dcfd403e530c06d927.tar.gz -> github.com-jessevdk-go-flags-6cf8f02b4ae8ba723ddc64dcfd403e530c06d927.tar.gz https://github.com/mattn/go-colorable/archive/ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b.tar.gz -> github.com-mattn-go-colorable-ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b.tar.gz https://github.com/mattn/go-runewidth/archive/97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz -> github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz https://github.com/mattn/go-sqlite3/archive/6654e412c3c7eabb310d920cf73a2102dbf8c632.tar.gz -> github.com-mattn-go-sqlite3-6654e412c3c7eabb310d920cf73a2102dbf8c632.tar.gz https://github.com/olekukonko/tablewriter/archive/be5337e7b39e64e5f91445ce7e721888dbab7387.tar.gz -> github.com-olekukonko-tablewriter-be5337e7b39e64e5f91445ce7e721888dbab7387.tar.gz https://github.com/pborman/uuid/archive/e790cca94e6cc75c7064b1332e63811d4aae1a53.tar.gz -> github.com-pborman-uuid-e790cca94e6cc75c7064b1332e63811d4aae1a53.tar.gz https://github.com/stretchr/testify/archive/890a5c3458b43e6104ff5da8dfa139d013d77544.tar.gz -> github.com-stretchr-testify-890a5c3458b43e6104ff5da8dfa139d013d77544.tar.gz https://github.com/syndtr/gocapability/archive/db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz -> github.com-syndtr-gocapability-db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz https://github.com/go-stack/stack/archive/817915b46b97fd7bb80e8ab6b69f01a53ac3eebf.tar.gz -> github.com-go-stack-stack-817915b46b97fd7bb80e8ab6b69f01a53ac3eebf.tar.gz https://github.com/mattn/go-isatty/archive/fc9e8d8ef48496124e79ae0df75490096eccf6fe.tar.gz -> github.com-mattn-go-isatty-fc9e8d8ef48496124e79ae0df75490096eccf6fe.tar.gz https://github.com/juju/errors/archive/c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz -> github.com-juju-errors-c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz https://github.com/golang/crypto/archive/b176d7def5d71bdd214203491f89843ed217f420.tar.gz -> github.com-golang-crypto-b176d7def5d71bdd214203491f89843ed217f420.tar.gz https://github.com/golang/net/archive/1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz -> github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz https://github.com/golang/sync/archive/f52d1811a62927559de87708c8913c1650ce4f26.tar.gz -> github.com-golang-sync-f52d1811a62927559de87708c8913c1650ce4f26.tar.gz https://github.com/golang/text/archive/e56139fd9c5bc7244c76116c68e500765bb6db6b.tar.gz -> github.com-golang-text-e56139fd9c5bc7244c76116c68e500765bb6db6b.tar.gz https://github.com/golang/tools/archive/84a35ef54dff3c5596983e180ec10919fc432242.tar.gz -> github.com-golang-tools-84a35ef54dff3c5596983e180ec10919fc432242.tar.gz https://github.com/golang/sys/archive/9f7170bcd8e9f4d3691c06401119c46a769a1e03.tar.gz -> github.com-golang-sys-9f7170bcd8e9f4d3691c06401119c46a769a1e03.tar.gz https://github.com/go-check/check/archive/20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz -> github.com-go-check-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz https://github.com/flosch/pongo2/archive/5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz -> github.com-flosch-pongo2-5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz https://github.com/inconshreveable/log15/archive/b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f.tar.gz -> github.com-inconshreveable-log15-b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f.tar.gz https://github.com/lxc/go-lxc/archive/1a2cf29ce27f74298fe70acbf817ca2f46cf7457.tar.gz -> github.com-lxc-go-lxc-1a2cf29ce27f74298fe70acbf817ca2f46cf7457.tar.gz https://github.com/go-tomb/tomb/archive/d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz -> github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz https://github.com/go-yaml/yaml/archive/eb3733d160e74a9c7e442f435eb3bea458e1d19f.tar.gz -> github.com-go-yaml-yaml-eb3733d160e74a9c7e442f435eb3bea458e1d19f.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:linux-info src_unpack:golang-vcs-snapshot src_prepare:- src_compile:- src_test:- src_install:-
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	l10n	2c2e15383ba891d642f51896a7f0ecfe	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	15a3154d9241313a8b9b625618ce981b	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a0299cead5f4032d00b6211f995e5947
+_md5_=dbbf1d29a7f32be0454473fa89eb6a0a
diff --git a/metadata/md5-cache/app-emulation/vagrant-1.9.6 b/metadata/md5-cache/app-emulation/vagrant-1.9.6
index 92d6b0acb9ec..621220fb798f 100644
--- a/metadata/md5-cache/app-emulation/vagrant-1.9.6
+++ b/metadata/md5-cache/app-emulation/vagrant-1.9.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/mitchellh/vagrant/archive/v1.9.6.tar.gz -> vagrant-1.9.6.tar.gz
 _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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=0bd1c3054f328f3f68dd2a28421191fb
diff --git a/metadata/md5-cache/app-emulation/vagrant-1.9.7 b/metadata/md5-cache/app-emulation/vagrant-1.9.7
index c065e058fa41..25504bc56488 100644
--- a/metadata/md5-cache/app-emulation/vagrant-1.9.7
+++ b/metadata/md5-cache/app-emulation/vagrant-1.9.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/mitchellh/vagrant/archive/v1.9.7.tar.gz -> vagrant-1.9.7.tar.gz
 _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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=58a36f1463c8a0b06a20b75a190f19db
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.11-r1 b/metadata/md5-cache/app-misc/hivex-1.3.11-r1
index 57f8ebc3089c..ecce34bf7995 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.11-r1
+++ b/metadata/md5-cache/app-misc/hivex-1.3.11-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) dev-lang/perl perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby_targets_ruby21? ( ruby? ( dev-ruby/rake[ruby_targets_ruby21] virtual/rubygems[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( ruby? ( dev-ruby/rake[ruby_targets_ruby22] virtual/rubygems[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( ruby? ( virtual/rubygems[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( ruby? ( virtual/rubygems[ruby_targets_ruby22] ) ) ) >=app-portage/elt-patches-20170422 dev-lang/perl[-build(-)]
+DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) dev-lang/perl perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby_targets_ruby22? ( ruby? ( dev-ruby/rake[ruby_targets_ruby22] virtual/rubygems[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( ruby? ( virtual/rubygems[ruby_targets_ruby22] ) ) ) >=app-portage/elt-patches-20170422 dev-lang/perl[-build(-)]
 DESCRIPTION=Library for reading and writing Windows Registry 'hive' binary files
 EAPI=5
 HOMEPAGE=http://libguestfs.org
-IUSE=ocaml readline +perl python test static-libs ruby test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+IUSE=ocaml readline +perl python test static-libs ruby test elibc_FreeBSD ruby_targets_ruby22 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
-RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby_targets_ruby21? ( ruby? ( virtual/rubygems[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( ruby? ( virtual/rubygems[ruby_targets_ruby22] ) ) dev-lang/perl[-build(-)]
+RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby_targets_ruby22? ( ruby? ( virtual/rubygems[ruby_targets_ruby22] ) ) dev-lang/perl[-build(-)]
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.11.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_unpack:- src_prepare:- src_configure:- src_compile:- src_test:ruby-ng src_install:-
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-app	4b65c2afee485a204b0b22518141ae47	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-app	4b65c2afee485a204b0b22518141ae47	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7dd79988fe51c3856a32400042f20f5d
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.14 b/metadata/md5-cache/app-misc/hivex-1.3.14
index 369007133896..660f43f40c29 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.14
+++ b/metadata/md5-cache/app-misc/hivex-1.3.14
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby_targets_ruby21? ( ruby? ( dev-ruby/rake[ruby_targets_ruby21] virtual/rubygems[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( ruby? ( dev-ruby/rake[ruby_targets_ruby22] virtual/rubygems[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ruby? ( dev-ruby/rake[ruby_targets_ruby23] virtual/rubygems[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( ruby? ( virtual/rubygems[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( ruby? ( virtual/rubygems[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ruby? ( virtual/rubygems[ruby_targets_ruby23] ) ) ) dev-lang/perl:=
+DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby_targets_ruby22? ( ruby? ( dev-ruby/rake[ruby_targets_ruby22] virtual/rubygems[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ruby? ( dev-ruby/rake[ruby_targets_ruby23] virtual/rubygems[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( ruby? ( virtual/rubygems[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ruby? ( virtual/rubygems[ruby_targets_ruby23] ) ) ) dev-lang/perl:=
 DESCRIPTION=Library for reading and writing Windows Registry 'hive' binary files
 EAPI=6
 HOMEPAGE=http://libguestfs.org
-IUSE=ocaml readline +perl python test static-libs ruby test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+IUSE=ocaml readline +perl python test static-libs ruby test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby_targets_ruby21? ( ruby? ( virtual/rubygems[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( ruby? ( virtual/rubygems[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ruby? ( virtual/rubygems[ruby_targets_ruby23] ) ) dev-lang/perl:=
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) ruby? ( || ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ) )
+RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby_targets_ruby22? ( ruby? ( virtual/rubygems[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ruby? ( virtual/rubygems[ruby_targets_ruby23] ) ) dev-lang/perl:=
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) ruby? ( || ( ruby_targets_ruby22 ruby_targets_ruby23 ) )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.14.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_unpack:- src_prepare:ruby-ng src_configure:- src_compile:- src_test:ruby-ng src_install:-
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	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	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=75946812c6bd86d3029451547d3d8744
diff --git a/metadata/md5-cache/app-text/glark-1.10.5-r1 b/metadata/md5-cache/app-text/glark-1.10.5-r1
index 208ab28dabb1..b2b1fd4ba9d3 100644
--- a/metadata/md5-cache/app-text/glark-1.10.5-r1
+++ b/metadata/md5-cache/app-text/glark-1.10.5-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby21] >=dev-ruby/ragol-1.0.0[ruby_targets_ruby21] >=dev-ruby/rainbow-2.0.0:2[ruby_targets_ruby21] >=dev-ruby/riel-1.2.0[ruby_targets_ruby21] zip? ( dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby22] >=dev-ruby/ragol-1.0.0[ruby_targets_ruby22] >=dev-ruby/rainbow-2.0.0:2[ruby_targets_ruby22] >=dev-ruby/riel-1.2.0[ruby_targets_ruby22] zip? ( dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby23] >=dev-ruby/ragol-1.0.0[ruby_targets_ruby23] >=dev-ruby/rainbow-2.0.0:2[ruby_targets_ruby23] >=dev-ruby/riel-1.2.0[ruby_targets_ruby23] zip? ( dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rubyzip: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? ( 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/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=test? ( ruby_targets_ruby22? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby22] >=dev-ruby/ragol-1.0.0[ruby_targets_ruby22] >=dev-ruby/rainbow-2.0.0:2[ruby_targets_ruby22] >=dev-ruby/riel-1.2.0[ruby_targets_ruby22] zip? ( dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby23] >=dev-ruby/ragol-1.0.0[ruby_targets_ruby23] >=dev-ruby/rainbow-2.0.0:2[ruby_targets_ruby23] >=dev-ruby/riel-1.2.0[ruby_targets_ruby23] zip? ( dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rubyzip:1[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/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=File searcher similar to grep but with fancy output
 EAPI=5
 HOMEPAGE=https://github.com/jpace/glark
-IUSE=zip test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=zip test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=amd64 hppa ~ppc ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby21] >=dev-ruby/ragol-1.0.0[ruby_targets_ruby21] >=dev-ruby/rainbow-2.0.0:2[ruby_targets_ruby21] >=dev-ruby/riel-1.2.0[ruby_targets_ruby21] zip? ( dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby22] >=dev-ruby/ragol-1.0.0[ruby_targets_ruby22] >=dev-ruby/rainbow-2.0.0:2[ruby_targets_ruby22] >=dev-ruby/riel-1.2.0[ruby_targets_ruby22] zip? ( dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby23] >=dev-ruby/ragol-1.0.0[ruby_targets_ruby23] >=dev-ruby/rainbow-2.0.0:2[ruby_targets_ruby23] >=dev-ruby/riel-1.2.0[ruby_targets_ruby23] zip? ( dev-ruby/rubyzip: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/logue-1.0.0[ruby_targets_ruby22] >=dev-ruby/ragol-1.0.0[ruby_targets_ruby22] >=dev-ruby/rainbow-2.0.0:2[ruby_targets_ruby22] >=dev-ruby/riel-1.2.0[ruby_targets_ruby22] zip? ( dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby23] >=dev-ruby/ragol-1.0.0[ruby_targets_ruby23] >=dev-ruby/rainbow-2.0.0:2[ruby_targets_ruby23] >=dev-ruby/riel-1.2.0[ruby_targets_ruby23] zip? ( dev-ruby/rubyzip: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=https://github.com/jpace/glark/archive/v1.10.5.tar.gz -> glark-git-1.10.5.tgz
 _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_=d53319fd86f1a44e9c1d7a8d3745c17d
diff --git a/metadata/md5-cache/app-text/hyperestraier-1.4.13 b/metadata/md5-cache/app-text/hyperestraier-1.4.13
index 1085b3a3fbaf..3579ed85f31f 100644
--- a/metadata/md5-cache/app-text/hyperestraier-1.4.13
+++ b/metadata/md5-cache/app-text/hyperestraier-1.4.13
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) ruby? ( 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_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig java? ( >=virtual/jdk-1.4:* ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig java? ( >=virtual/jdk-1.4:* ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=a full-text search system for communities
 EAPI=6
 HOMEPAGE=http://fallabs.com/hyperestraier/
-IUSE=bzip2 debug java lzo mecab perl ruby +zlib elibc_FreeBSD java elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=bzip2 debug java lzo mecab perl ruby +zlib elibc_FreeBSD java elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) ruby? ( 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_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://fallabs.com/hyperestraier/hyperestraier-1.4.13.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-opt-2 pkg_setup:- src_unpack:ruby-ng src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=76e15e82538576d06e91a8ed9b99dc8e
diff --git a/metadata/md5-cache/app-text/jist-1.5.1-r1 b/metadata/md5-cache/app-text/jist-1.5.1-r1
index 76384c014440..e7036dad1ae2 100644
--- a/metadata/md5-cache/app-text/jist-1.5.1-r1
+++ b/metadata/md5-cache/app-text/jist-1.5.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/json:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/webmock:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock:0[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-ruby/json:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock:0[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=A ruby gem to publish a gist
 EAPI=5
 HOMEPAGE=https://github.com/ConradIrwin/jist
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/json:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:*[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/json:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:*[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/jist-1.5.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_=1d473228d53b27ff2017dad2009f6690
diff --git a/metadata/md5-cache/app-text/ronn-0.7.3-r3 b/metadata/md5-cache/app-text/ronn-0.7.3-r3
index 66a889ddfc14..13953511633d 100644
--- a/metadata/md5-cache/app-text/ronn-0.7.3-r3
+++ b/metadata/md5-cache/app-text/ronn-0.7.3-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby21] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby21] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby22] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby22] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby23] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby23] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby24] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby24] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby21] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby21] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby22] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby22] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby23] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby23] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby24] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby24] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby22] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby22] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby23] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby23] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby24] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby24] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby22] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby22] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby23] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby23] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby24] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby24] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Converts simple, human readable textfiles to roff for terminal display, and HTML
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/ronn/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-macos ~x64-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby21] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby21] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby22] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby22] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby23] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby23] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby24] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby24] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby22] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby22] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby23] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby23] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby24] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby24] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ronn-0.7.3.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_=e8622b40a31a27a258090c45125d90f9
diff --git a/metadata/md5-cache/app-text/webgen-1.4.0 b/metadata/md5-cache/app-text/webgen-1.4.0
index e0461bc6e2b6..768617f59b61 100644
--- a/metadata/md5-cache/app-text/webgen-1.4.0
+++ b/metadata/md5-cache/app-text/webgen-1.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) test? ( dev-ruby/kramdown[ruby_targets_ruby21] dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/rdiscount[ruby_targets_ruby21] >=dev-ruby/sass-3.2:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) test? ( dev-ruby/kramdown[ruby_targets_ruby22] dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] >=dev-ruby/sass-3.2:0[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby21] >=dev-ruby/systemu-2.5[ruby_targets_ruby21] >=dev-ruby/kramdown-1.3[ruby_targets_ruby21] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby21] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby21] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby22] >=dev-ruby/systemu-2.5[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby22] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby22] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby22] ) ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) test? ( dev-ruby/kramdown[ruby_targets_ruby22] dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] >=dev-ruby/sass-3.2:0[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby22] >=dev-ruby/systemu-2.5[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby22] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby22] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby22] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=A template-based static website generator
 EAPI=5
 HOMEPAGE=http://webgen.gettalong.org
-IUSE=builder highlight markdown test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=builder highlight markdown test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby21] >=dev-ruby/systemu-2.5[ruby_targets_ruby21] >=dev-ruby/kramdown-1.3[ruby_targets_ruby21] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby21] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby21] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby22] >=dev-ruby/systemu-2.5[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby22] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby22] ) markdown? ( dev-ruby/maruku[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/cmdparse-3.0.1:3[ruby_targets_ruby22] >=dev-ruby/systemu-2.5[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby22] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby22] ) markdown? ( dev-ruby/maruku[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/webgen-1.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_=ae84a4d8488f690704a42c0ea288a5b9
diff --git a/metadata/md5-cache/app-vim/command-t-4.0 b/metadata/md5-cache/app-vim/command-t-4.0
index 2a45d5d4ac3e..f4732f492545 100644
--- a/metadata/md5-cache/app-vim/command-t-4.0
+++ b/metadata/md5-cache/app-vim/command-t-4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 DESCRIPTION=vim plugin: fast file navigation for vim
 EAPI=5
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=3025 https://github.com/wincent/command-t
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/wincent/command-t/archive/4.0.tar.gz -> command-t-4.0.tar.gz
 _eclass_exported_funcs=pkg_postrm:vim-plugin pkg_postinst:vim-plugin 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-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
 _md5_=52e8b1b64fa20cc3f36226da69bc0dfa
diff --git a/metadata/md5-cache/dev-db/qdbm-1.8.78-r1 b/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
index 5b00ae6fef2e..31acabb4dedf 100644
--- a/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
+++ b/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) perl? ( dev-lang/perl ) ruby? ( 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_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) java? ( >=virtual/jdk-1.4:* ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) java? ( >=virtual/jdk-1.4:* ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Quick Database Manager
 EAPI=6
 HOMEPAGE=http://fallabs.com/qdbm/
-IUSE=bzip2 cxx debug java lzo perl ruby zlib elibc_FreeBSD java elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=bzip2 cxx debug java lzo perl ruby zlib elibc_FreeBSD java elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) perl? ( dev-lang/perl ) ruby? ( 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_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://fallabs.com/qdbm/qdbm-1.8.78.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-opt-2 pkg_setup:- src_unpack:ruby-ng src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0f3d281c6e5781a8dc90a7c6e06d08e4
diff --git a/metadata/md5-cache/dev-libs/Ice-3.5.1 b/metadata/md5-cache/dev-libs/Ice-3.5.1
index b003f0691981..945b766d31e4 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.5.1
+++ b/metadata/md5-cache/dev-libs/Ice-3.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://www.zeroc.com/download/Ice/3.5/Ice-3.5.1.tar.gz doc? ( http://www.zeroc.com/download/Ice/3.5/Ice-3.5.1.pdf )
 _eclass_exported_funcs=pkg_setup:- src_unpack:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b5e711bc9b083ebf6ee6523c9ea66ea6
diff --git a/metadata/md5-cache/dev-libs/Ice-3.6.3 b/metadata/md5-cache/dev-libs/Ice-3.6.3
index c2fe3416c290..1544c3385499 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.6.3
+++ b/metadata/md5-cache/dev-libs/Ice-3.6.3
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_
 SLOT=0/36
 SRC_URI=https://github.com/zeroc-ice/ice/archive/v3.6.3.tar.gz -> Ice-3.6.3.tar.gz doc? ( http://download.zeroc.com/Ice/3.6/Ice-3.6.3.pdf )
 _eclass_exported_funcs=pkg_setup:- src_unpack:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9568504734d77300fb3807390f4cb53d
diff --git a/metadata/md5-cache/dev-libs/Ice-3.6.3-r1 b/metadata/md5-cache/dev-libs/Ice-3.6.3-r1
index ce18ea661c98..d05d13f064d2 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.6.3-r1
+++ b/metadata/md5-cache/dev-libs/Ice-3.6.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_
 SLOT=0/36
 SRC_URI=https://github.com/zeroc-ice/ice/archive/v3.6.3.tar.gz -> Ice-3.6.3.tar.gz doc? ( http://download.zeroc.com/Ice/3.6/Ice-3.6.3.pdf )
 _eclass_exported_funcs=pkg_setup:- src_unpack:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=38811c6415b289421f1daa05e5219b92
diff --git a/metadata/md5-cache/dev-libs/libsolv-0.6.22 b/metadata/md5-cache/dev-libs/libsolv-0.6.22
index 85ff4907e920..d7842c5d83c0 100644
--- a/metadata/md5-cache/dev-libs/libsolv-0.6.22
+++ b/metadata/md5-cache/dev-libs/libsolv-0.6.22
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 py
 SLOT=0
 SRC_URI=https://github.com/openSUSE/libsolv/archive/0.6.22.tar.gz -> libsolv-0.6.22.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_unpack:perl-module src_prepare:- src_configure:- src_compile:- src_test:perl-module src_install:-
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ab21352c2c337bcf89ee63d6e4474408
diff --git a/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2 b/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
index a578edf614d3..64a3b26bbf25 100644
--- a/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
+++ b/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/dbf[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/dbf[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/dbf[ruby_targets_ruby23] dev-ruby/nokogiri[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/dbf[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/dbf[ruby_targets_ruby23] dev-ruby/nokogiri[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=Ruby data holder for OGC Simple Features
 EAPI=5
 HOMEPAGE=https://github.com/nofxx/georuby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=amd64 x86
 LICENSE=MIT
-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/georuby-2.5.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_=32818597e5acb98ae9eebb8816d35bdf
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
index 0d1bb3bc731f..5bedf7fe90c0 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Library which enable you to define abstract method in Ruby
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/abstract
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/abstract-1.0.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_=ceaa089ea6a6c29c46c0f8bc5d8b7c62
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.0.3 b/metadata/md5-cache/dev-ruby/actioncable-5.0.3
index 88d293196ba7..2af8e13035d7 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-5.0.3
+++ b/metadata/md5-cache/dev-ruby/actioncable-5.0.3
@@ -12,5 +12,5 @@ RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.3.tar.gz -> rails-5.0.3.tgz
 _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_=6e5a2449086df0f68abef4ffa6718e96
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.0.4 b/metadata/md5-cache/dev-ruby/actioncable-5.0.4
index 655e69001dbb..5c027193a584 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-5.0.4
+++ b/metadata/md5-cache/dev-ruby/actioncable-5.0.4
@@ -12,5 +12,5 @@ RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.4.tar.gz -> rails-5.0.4.tgz
 _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_=1c765cb65ec203d3177468f6959cbf74
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.0.5 b/metadata/md5-cache/dev-ruby/actioncable-5.0.5
index 8730994bfff0..7053779874ec 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-5.0.5
+++ b/metadata/md5-cache/dev-ruby/actioncable-5.0.5
@@ -12,5 +12,5 @@ RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.5.tar.gz -> rails-5.0.5.tgz
 _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_=1c765cb65ec203d3177468f6959cbf74
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.1.1 b/metadata/md5-cache/dev-ruby/actioncable-5.1.1
index 107bde7cfe07..1489ed05b526 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-5.1.1
+++ b/metadata/md5-cache/dev-ruby/actioncable-5.1.1
@@ -12,5 +12,5 @@ RESTRICT=test
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.1.tar.gz -> rails-5.1.1.tgz
 _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_=406ebd84888920ebbc857e720f3bc528
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.1.2 b/metadata/md5-cache/dev-ruby/actioncable-5.1.2
index 549032d11323..38a4428fc742 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-5.1.2
+++ b/metadata/md5-cache/dev-ruby/actioncable-5.1.2
@@ -12,5 +12,5 @@ RESTRICT=test
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
 _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_=ac8658fe9723443751818bf67eb9dafd
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.1.3 b/metadata/md5-cache/dev-ruby/actioncable-5.1.3
index d20d451ba08a..99695407f8b8 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-5.1.3
+++ b/metadata/md5-cache/dev-ruby/actioncable-5.1.3
@@ -12,5 +12,5 @@ RESTRICT=test
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.3.tar.gz -> rails-5.1.3.tgz
 _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_=ac8658fe9723443751818bf67eb9dafd
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-4.2.8 b/metadata/md5-cache/dev-ruby/actionmailer-4.2.8
index 0027bb94cb24..ff4a7009a578 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-4.2.8
+++ b/metadata/md5-cache/dev-ruby/actionmailer-4.2.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby21] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby21] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby21] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby21] =dev-ruby/mail-2*:*[ruby_targets_ruby21] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby22] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby23] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[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=test? ( ruby_targets_ruby22? ( ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby22] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby23] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[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=Framework for designing email-service layers
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails
-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 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby21] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby21] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby21] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby21] =dev-ruby/mail-2*:*[ruby_targets_ruby21] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby22] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby23] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5: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/actionpack-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby22] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby23] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5: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=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.8.tar.gz -> rails-4.2.8.tgz
 _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_=50f255ca3d7cb0ea703ec98a130ffe03
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-4.2.9 b/metadata/md5-cache/dev-ruby/actionmailer-4.2.9
index a733149963e1..74365dff580e 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-4.2.9
+++ b/metadata/md5-cache/dev-ruby/actionmailer-4.2.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby21] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby21] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby21] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby21] =dev-ruby/mail-2*:*[ruby_targets_ruby21] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby22] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby23] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby24] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby24] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby24] =dev-ruby/mail-2*:*[ruby_targets_ruby24] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby22] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby23] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby24] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby24] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby24] =dev-ruby/mail-2*:*[ruby_targets_ruby24] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Framework for designing email-service layers
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby21] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby21] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby21] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby21] =dev-ruby/mail-2*:*[ruby_targets_ruby21] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby22] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby23] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby24] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby24] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby24] =dev-ruby/mail-2*:*[ruby_targets_ruby24] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby22] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby23] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby24] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby24] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby24] =dev-ruby/mail-2*:*[ruby_targets_ruby24] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.9.tar.gz -> rails-4.2.9.tgz
 _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_=a1db5100fcb62d601039d48970c34a27
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.0.3 b/metadata/md5-cache/dev-ruby/actionmailer-5.0.3
index 2892ff4b4d5f..149d7e5b563b 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.0.3
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.3.tar.gz -> rails-5.0.3.tgz
 _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_=b2daf8aad96ef6ad98532173cfe5952a
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.0.4 b/metadata/md5-cache/dev-ruby/actionmailer-5.0.4
index 4b277eb7f71c..dfef0de97075 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.0.4
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.4.tar.gz -> rails-5.0.4.tgz
 _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_=d4ac497f4b7ca54a183a74f4bc9867db
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.0.5 b/metadata/md5-cache/dev-ruby/actionmailer-5.0.5
index b62c53a992f6..2e7da84790ba 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.0.5
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.5.tar.gz -> rails-5.0.5.tgz
 _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_=d4ac497f4b7ca54a183a74f4bc9867db
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.1.1 b/metadata/md5-cache/dev-ruby/actionmailer-5.1.1
index ebf1a44f146d..6b7bd17f4e7e 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.1.1
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.1.tar.gz -> rails-5.1.1.tgz
 _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_=316d2e7e55b03f02a6a5c9c166a3359c
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.1.2 b/metadata/md5-cache/dev-ruby/actionmailer-5.1.2
index dc015ce1b219..41b76e712a45 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.1.2
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
 _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_=e9e096425d70a3e649953018e7d6e3be
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.1.3 b/metadata/md5-cache/dev-ruby/actionmailer-5.1.3
index e6e63115491f..5a83ede87341 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.1.3
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.3.tar.gz -> rails-5.1.3.tgz
 _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_=e9e096425d70a3e649953018e7d6e3be
diff --git a/metadata/md5-cache/dev-ruby/actionpack-4.2.8 b/metadata/md5-cache/dev-ruby/actionpack-4.2.8
index 01701f19c0c0..2c9cd0b8bd6d 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-4.2.8
+++ b/metadata/md5-cache/dev-ruby/actionpack-4.2.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby21] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby21] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby21] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby21] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby21] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby22] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby23] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby21] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.2: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=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby22] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby23] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.2: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=Eases web-request routing, handling, and response
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails
-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 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby21] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby21] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby21] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby21] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby21] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby22] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby23] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5: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/activesupport-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby22] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby23] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5: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=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.8.tar.gz -> rails-4.2.8.tgz
 _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_=46d3bb5f1eb5309f900f269c7db306d0
diff --git a/metadata/md5-cache/dev-ruby/actionpack-4.2.9 b/metadata/md5-cache/dev-ruby/actionpack-4.2.9
index 5bc3323a27c2..ab353c025c62 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-4.2.9
+++ b/metadata/md5-cache/dev-ruby/actionpack-4.2.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby21] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby21] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby21] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby21] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby21] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby22] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby23] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby24] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby21] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby24] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby22] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby23] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby24] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby24] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Eases web-request routing, handling, and response
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby21] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby21] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby21] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby21] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby21] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby22] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby23] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby24] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby22] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby23] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby24] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.9.tar.gz -> rails-4.2.9.tgz
 _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_=a3fc21791a2d000b15bf6e011bedf111
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.0.3 b/metadata/md5-cache/dev-ruby/actionpack-5.0.3
index 3ce10921f722..f0578af1950d 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.0.3
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.3.tar.gz -> rails-5.0.3.tgz
 _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_=fe98da076f524451becf9b1681eab91c
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.0.4 b/metadata/md5-cache/dev-ruby/actionpack-5.0.4
index 4885e2493d29..f28167b32087 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.0.4
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.4.tar.gz -> rails-5.0.4.tgz
 _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_=5b92543b4d50b1ac83ab4a7932da8369
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.0.5 b/metadata/md5-cache/dev-ruby/actionpack-5.0.5
index 78df9d0ebec2..1a0689f6fd4f 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.0.5
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.5.tar.gz -> rails-5.0.5.tgz
 _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_=5b92543b4d50b1ac83ab4a7932da8369
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.1.1 b/metadata/md5-cache/dev-ruby/actionpack-5.1.1
index 64166ffaf6f5..5f86fdadf164 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.1.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.1.tar.gz -> rails-5.1.1.tgz
 _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_=562df8af157e59b1931a12de83bfd329
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.1.2 b/metadata/md5-cache/dev-ruby/actionpack-5.1.2
index f6da1e7110d1..0a032b50835c 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.1.2
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
 _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_=89d2bb58020961c017f2a9e10dbfe401
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.1.3 b/metadata/md5-cache/dev-ruby/actionpack-5.1.3
index c42f11b8d426..9326701400b7 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.1.3
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.3.tar.gz -> rails-5.1.3.tgz
 _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_=ed46e3889198e5fb730ebb999c0f9ed0
diff --git a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.1.1 b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.1.1
index 5604ce7a2bc0..4c0dee5855e6 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.1.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/activerecord-4.0.0[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activerecord-4.0.0[ruby_targets_ruby22] dev-ruby/mocha[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activerecord-4.0.0[ruby_targets_ruby22] dev-ruby/mocha[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=Action caching for Action Pack (removed from core in Rails 4.0)
 EAPI=5
 HOMEPAGE=https://github.com/rails/actionpack-action_caching
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0.0:*[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/actionpack-4.0.0:*[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/actionpack-action_caching-1.1.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_=4f1799d207ce00b6e5577f0c3ea74416
diff --git a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.0 b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.0
index 865fb807b7ed..dc011a53051e 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.0
+++ b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/activerecord-4.0.0[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activerecord-4.0.0[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activerecord-4.0.0[ruby_targets_ruby23] dev-ruby/mocha[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activerecord-4.0.0[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activerecord-4.0.0[ruby_targets_ruby23] dev-ruby/mocha[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=Action caching for Action Pack (removed from core in Rails 4.0)
 EAPI=5
 HOMEPAGE=https://github.com/rails/actionpack-action_caching
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0.0:*[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/actionpack-4.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0.0:*[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/actionpack-action_caching-1.2.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_=dd75666c678b6544fec313183d3af1a5
diff --git a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-1.0.2 b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-1.0.2
index aae981c04d78..a4218d496edc 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-1.0.2
+++ b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-1.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby21] <dev-ruby/actionpack-5:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby22] <dev-ruby/actionpack-5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby23] <dev-ruby/actionpack-5:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/activesupport-4.0.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activesupport-4.0.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activesupport-4.0.0[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby22] <dev-ruby/actionpack-5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby23] <dev-ruby/actionpack-5:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activesupport-4.0.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activesupport-4.0.0[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=XML parameters parser for Action Pack (removed from core in Rails 4.0)
 EAPI=5
 HOMEPAGE=https://github.com/rails/actionpack-xml_parser
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby21] <dev-ruby/actionpack-5:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby22] <dev-ruby/actionpack-5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby23] <dev-ruby/actionpack-5:*[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/actionpack-4.0.0:*[ruby_targets_ruby22] <dev-ruby/actionpack-5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0.0:*[ruby_targets_ruby23] <dev-ruby/actionpack-5:*[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=https://github.com/rails/actionpack-xml_parser/archive/v1.0.2.tar.gz -> actionpack-xml_parser-1.0.2.tar.gz
 _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_=52427845c180dbc079ba84d1150e67ab
diff --git a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.0 b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.0
index 2fb729c84260..62e522c64b24 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.0
+++ b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/rails/actionpack-xml_parser/archive/v2.0.0.tar.gz -> actionpack-xml_parser-2.0.0.tar.gz
 _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_=c95ca0f2c3b462df4891d0b3e9879caa
diff --git a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1 b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1
index 7556a22cf5e9..f2979b22d79c 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=https://github.com/rails/actionpack-xml_parser/archive/v2.0.1.tar.gz -> actionpack-xml_parser-2.0.1.tar.gz
 _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_=a30f81ac9fb4c125392311321cf81a99
diff --git a/metadata/md5-cache/dev-ruby/actionview-4.2.8 b/metadata/md5-cache/dev-ruby/actionview-4.2.8
index 599cdb0db579..023f765a84c7 100644
--- a/metadata/md5-cache/dev-ruby/actionview-4.2.8
+++ b/metadata/md5-cache/dev-ruby/actionview-4.2.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby21] >=dev-ruby/builder-3.1:*[ruby_targets_ruby21] =dev-ruby/builder-3*:*[ruby_targets_ruby21] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby21] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby21] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby21] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby21] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.8[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=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.8[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=Simple, battle-tested conventions and helpers for building web pages
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails/
-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 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby21] >=dev-ruby/builder-3.1:*[ruby_targets_ruby21] =dev-ruby/builder-3*:*[ruby_targets_ruby21] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby21] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby21] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5: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/activesupport-4.2.8[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5: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=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.8.tar.gz -> rails-4.2.8.tgz
 _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_=7bbeb778d00cdf7f67d0bb9bc00b9707
diff --git a/metadata/md5-cache/dev-ruby/actionview-4.2.9 b/metadata/md5-cache/dev-ruby/actionview-4.2.9
index de428bff4cb2..8c2158880629 100644
--- a/metadata/md5-cache/dev-ruby/actionview-4.2.9
+++ b/metadata/md5-cache/dev-ruby/actionview-4.2.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby21] >=dev-ruby/builder-3.1:*[ruby_targets_ruby21] =dev-ruby/builder-3*:*[ruby_targets_ruby21] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby21] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby21] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby24] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby21] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby21] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby24] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby24] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby24] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby21] >=dev-ruby/builder-3.1:*[ruby_targets_ruby21] =dev-ruby/builder-3*:*[ruby_targets_ruby21] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby21] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby21] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby24] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby24] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.9.tar.gz -> rails-4.2.9.tgz
 _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_=caa04b074898d142ea099cda93748c0b
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.0.3 b/metadata/md5-cache/dev-ruby/actionview-5.0.3
index f1b46aacd8a8..27bd118d66e7 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.0.3
+++ b/metadata/md5-cache/dev-ruby/actionview-5.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.3.tar.gz -> rails-5.0.3.tgz
 _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_=0b1f641f2728966dfa032f36e93c8385
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.0.4 b/metadata/md5-cache/dev-ruby/actionview-5.0.4
index ac8ca3e15467..13f2b53ab043 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.0.4
+++ b/metadata/md5-cache/dev-ruby/actionview-5.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.4.tar.gz -> rails-5.0.4.tgz
 _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_=994ce27f79a0f54f71a02ea17e26cbfa
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.0.5 b/metadata/md5-cache/dev-ruby/actionview-5.0.5
index 7de041451ade..a35d5ce1e5e2 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.0.5
+++ b/metadata/md5-cache/dev-ruby/actionview-5.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.5.tar.gz -> rails-5.0.5.tgz
 _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_=994ce27f79a0f54f71a02ea17e26cbfa
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.1.1 b/metadata/md5-cache/dev-ruby/actionview-5.1.1
index 268cff6bc830..1d1d2ef9da16 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.1.1
+++ b/metadata/md5-cache/dev-ruby/actionview-5.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.1.tar.gz -> rails-5.1.1.tgz
 _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_=2a474e51aaeb173357ac5e1b8e51ca10
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.1.2 b/metadata/md5-cache/dev-ruby/actionview-5.1.2
index 359e19f8de57..cdc399108efd 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.1.2
+++ b/metadata/md5-cache/dev-ruby/actionview-5.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
 _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_=f7d638237ec357aa26360c93c0b78d35
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.1.3 b/metadata/md5-cache/dev-ruby/actionview-5.1.3
index d83902dc8ffa..db8d1a2779f4 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.1.3
+++ b/metadata/md5-cache/dev-ruby/actionview-5.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.3.tar.gz -> rails-5.1.3.tgz
 _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_=f7d638237ec357aa26360c93c0b78d35
diff --git a/metadata/md5-cache/dev-ruby/activejob-4.2.8 b/metadata/md5-cache/dev-ruby/activejob-4.2.8
index e83c15c0cc8d..7bced6a45488 100644
--- a/metadata/md5-cache/dev-ruby/activejob-4.2.8
+++ b/metadata/md5-cache/dev-ruby/activejob-4.2.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby21] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[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=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[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=Job framework with pluggable queues
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails
-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 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby21] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.0[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/activesupport-4.2.8[ruby_targets_ruby22] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.0[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=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.8.tar.gz -> rails-4.2.8.tgz
 _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_=7b0b185032a297f58348c2e4653ea189
diff --git a/metadata/md5-cache/dev-ruby/activejob-4.2.9 b/metadata/md5-cache/dev-ruby/activejob-4.2.9
index d067c9403a10..28830c8e3479 100644
--- a/metadata/md5-cache/dev-ruby/activejob-4.2.9
+++ b/metadata/md5-cache/dev-ruby/activejob-4.2.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby21] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Job framework with pluggable queues
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby21] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.9.tar.gz -> rails-4.2.9.tgz
 _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_=c6abbe8b85110fb94e265b711d106533
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.0.3 b/metadata/md5-cache/dev-ruby/activejob-5.0.3
index d06bdbcbfa1d..7a5c7fae1b25 100644
--- a/metadata/md5-cache/dev-ruby/activejob-5.0.3
+++ b/metadata/md5-cache/dev-ruby/activejob-5.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.3.tar.gz -> rails-5.0.3.tgz
 _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_=4ca3200d13d978fa3bce1eca544c8706
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.0.4 b/metadata/md5-cache/dev-ruby/activejob-5.0.4
index 12aa1f18189d..fa2971d94ede 100644
--- a/metadata/md5-cache/dev-ruby/activejob-5.0.4
+++ b/metadata/md5-cache/dev-ruby/activejob-5.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.4.tar.gz -> rails-5.0.4.tgz
 _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_=efcb73b44a44ad3f9b77eae6b620e884
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.0.5 b/metadata/md5-cache/dev-ruby/activejob-5.0.5
index 26d6f4665955..b35afc2ae086 100644
--- a/metadata/md5-cache/dev-ruby/activejob-5.0.5
+++ b/metadata/md5-cache/dev-ruby/activejob-5.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.5.tar.gz -> rails-5.0.5.tgz
 _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_=efcb73b44a44ad3f9b77eae6b620e884
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.1.1 b/metadata/md5-cache/dev-ruby/activejob-5.1.1
index d9d00fceacf8..04a178af6204 100644
--- a/metadata/md5-cache/dev-ruby/activejob-5.1.1
+++ b/metadata/md5-cache/dev-ruby/activejob-5.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.1.tar.gz -> rails-5.1.1.tgz
 _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_=53bbc40a0ed18c119162187d52cdb430
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.1.2 b/metadata/md5-cache/dev-ruby/activejob-5.1.2
index 7da5d3292355..7abfce6f15ba 100644
--- a/metadata/md5-cache/dev-ruby/activejob-5.1.2
+++ b/metadata/md5-cache/dev-ruby/activejob-5.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
 _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_=a91730842733389bd1985b8fee8ad346
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.1.3 b/metadata/md5-cache/dev-ruby/activejob-5.1.3
index 238b16a90ec7..6f0436363d19 100644
--- a/metadata/md5-cache/dev-ruby/activejob-5.1.3
+++ b/metadata/md5-cache/dev-ruby/activejob-5.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.3.tar.gz -> rails-5.1.3.tgz
 _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_=a91730842733389bd1985b8fee8ad346
diff --git a/metadata/md5-cache/dev-ruby/activeldap-4.0.6 b/metadata/md5-cache/dev-ruby/activeldap-4.0.6
index a946b1793e3a..7c5b2e6acbe7 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-4.0.6
+++ b/metadata/md5-cache/dev-ruby/activeldap-4.0.6
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby21] dev-ruby/locale[ruby_targets_ruby21] dev-ruby/ruby-gettext[ruby_targets_ruby21] dev-ruby/gettext_i18n_rails[ruby_targets_ruby21] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby21] dev-ruby/ruby-net-ldap[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] dev-ruby/ruby-gettext[ruby_targets_ruby22] dev-ruby/gettext_i18n_rails[ruby_targets_ruby22] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby22] dev-ruby/ruby-net-ldap[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby23] dev-ruby/locale[ruby_targets_ruby23] dev-ruby/ruby-gettext[ruby_targets_ruby23] dev-ruby/gettext_i18n_rails[ruby_targets_ruby23] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby23] dev-ruby/ruby-net-ldap[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=test? ( ruby_targets_ruby22? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] dev-ruby/ruby-gettext[ruby_targets_ruby22] dev-ruby/gettext_i18n_rails[ruby_targets_ruby22] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby22] dev-ruby/ruby-net-ldap[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby23] dev-ruby/locale[ruby_targets_ruby23] dev-ruby/ruby-gettext[ruby_targets_ruby23] dev-ruby/gettext_i18n_rails[ruby_targets_ruby23] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby23] dev-ruby/ruby-net-ldap[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=ActiveLDAP provides an activerecord inspired object oriented interface to LDAP
 EAPI=5
 HOMEPAGE=https://github.com/activeldap/activeldap
-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=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby21] dev-ruby/locale[ruby_targets_ruby21] dev-ruby/ruby-gettext[ruby_targets_ruby21] dev-ruby/gettext_i18n_rails[ruby_targets_ruby21] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby21] dev-ruby/ruby-net-ldap[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] dev-ruby/ruby-gettext[ruby_targets_ruby22] dev-ruby/gettext_i18n_rails[ruby_targets_ruby22] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby22] dev-ruby/ruby-net-ldap[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby23] dev-ruby/locale[ruby_targets_ruby23] dev-ruby/ruby-gettext[ruby_targets_ruby23] dev-ruby/gettext_i18n_rails[ruby_targets_ruby23] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby23] dev-ruby/ruby-net-ldap[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/activemodel-4.0.0:*[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] dev-ruby/ruby-gettext[ruby_targets_ruby22] dev-ruby/gettext_i18n_rails[ruby_targets_ruby22] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby22] dev-ruby/ruby-net-ldap[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby23] dev-ruby/locale[ruby_targets_ruby23] dev-ruby/ruby-gettext[ruby_targets_ruby23] dev-ruby/gettext_i18n_rails[ruby_targets_ruby23] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby23] dev-ruby/ruby-net-ldap[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=4
 SRC_URI=mirror://rubygems/activeldap-4.0.6.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_=39d317beb8d7d932c5bbf40da735f6a9
diff --git a/metadata/md5-cache/dev-ruby/activeldap-5.1.0 b/metadata/md5-cache/dev-ruby/activeldap-5.1.0
index eecc7c489140..f7c054652173 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-5.1.0
+++ b/metadata/md5-cache/dev-ruby/activeldap-5.1.0
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby21] dev-ruby/locale[ruby_targets_ruby21] dev-ruby/ruby-gettext[ruby_targets_ruby21] dev-ruby/gettext_i18n_rails[ruby_targets_ruby21] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby21] dev-ruby/ruby-net-ldap[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] dev-ruby/ruby-gettext[ruby_targets_ruby22] dev-ruby/gettext_i18n_rails[ruby_targets_ruby22] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby22] dev-ruby/ruby-net-ldap[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby23] dev-ruby/locale[ruby_targets_ruby23] dev-ruby/ruby-gettext[ruby_targets_ruby23] dev-ruby/gettext_i18n_rails[ruby_targets_ruby23] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby23] dev-ruby/ruby-net-ldap[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=test? ( ruby_targets_ruby22? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] dev-ruby/ruby-gettext[ruby_targets_ruby22] dev-ruby/gettext_i18n_rails[ruby_targets_ruby22] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby22] dev-ruby/ruby-net-ldap[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby23] dev-ruby/locale[ruby_targets_ruby23] dev-ruby/ruby-gettext[ruby_targets_ruby23] dev-ruby/gettext_i18n_rails[ruby_targets_ruby23] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby23] dev-ruby/ruby-net-ldap[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=ActiveLDAP provides an activerecord inspired object oriented interface to LDAP
 EAPI=6
 HOMEPAGE=https://github.com/activeldap/activeldap
-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=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby21] dev-ruby/locale[ruby_targets_ruby21] dev-ruby/ruby-gettext[ruby_targets_ruby21] dev-ruby/gettext_i18n_rails[ruby_targets_ruby21] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby21] dev-ruby/ruby-net-ldap[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] dev-ruby/ruby-gettext[ruby_targets_ruby22] dev-ruby/gettext_i18n_rails[ruby_targets_ruby22] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby22] dev-ruby/ruby-net-ldap[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby23] dev-ruby/locale[ruby_targets_ruby23] dev-ruby/ruby-gettext[ruby_targets_ruby23] dev-ruby/gettext_i18n_rails[ruby_targets_ruby23] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby23] dev-ruby/ruby-net-ldap[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/activemodel-4.0.0:*[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] dev-ruby/ruby-gettext[ruby_targets_ruby22] dev-ruby/gettext_i18n_rails[ruby_targets_ruby22] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby22] dev-ruby/ruby-net-ldap[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby23] dev-ruby/locale[ruby_targets_ruby23] dev-ruby/ruby-gettext[ruby_targets_ruby23] dev-ruby/gettext_i18n_rails[ruby_targets_ruby23] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby23] dev-ruby/ruby-net-ldap[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=5
 SRC_URI=mirror://rubygems/activeldap-5.1.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_=a9f00271ab661fef76fb48d7fe76290e
diff --git a/metadata/md5-cache/dev-ruby/activemodel-4.2.8 b/metadata/md5-cache/dev-ruby/activemodel-4.2.8
index ee15997f7a31..73c6321160b4 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-4.2.8
+++ b/metadata/md5-cache/dev-ruby/activemodel-4.2.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.8:*[ruby_targets_ruby21] >=dev-ruby/builder-3.1:*[ruby_targets_ruby21] =dev-ruby/builder-3*:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.8:*[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8:*[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] >=dev-ruby/railties-4.2.0[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby21] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/railties-4.2.0[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] >=dev-ruby/bcrypt-ruby-3.1.7[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=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.8:*[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8:*[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/railties-4.2.0[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] >=dev-ruby/bcrypt-ruby-3.1.7[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=Toolkit for building modeling frameworks like Active Record and Active Resource
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails
-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 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.8:*[ruby_targets_ruby21] >=dev-ruby/builder-3.1:*[ruby_targets_ruby21] =dev-ruby/builder-3*:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.8:*[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8:*[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[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/activesupport-4.2.8:*[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8:*[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[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=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.8.tar.gz -> rails-4.2.8.tgz
 _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_=8f4a28a559652e3cce43efae972f11eb
diff --git a/metadata/md5-cache/dev-ruby/activemodel-4.2.9 b/metadata/md5-cache/dev-ruby/activemodel-4.2.9
index fa398c98df27..1de960ac5f46 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-4.2.9
+++ b/metadata/md5-cache/dev-ruby/activemodel-4.2.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.9:*[ruby_targets_ruby21] >=dev-ruby/builder-3.1:*[ruby_targets_ruby21] =dev-ruby/builder-3*:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9:*[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9:*[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9:*[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] >=dev-ruby/railties-4.2.0[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby21] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/railties-4.2.0[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/railties-4.2.0[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby24] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9:*[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9:*[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9:*[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/railties-4.2.0[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/railties-4.2.0[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby24] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.9:*[ruby_targets_ruby21] >=dev-ruby/builder-3.1:*[ruby_targets_ruby21] =dev-ruby/builder-3*:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9:*[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9:*[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9:*[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9:*[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9:*[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9:*[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.9.tar.gz -> rails-4.2.9.tgz
 _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_=8e69a72b3e028b053c683175027ee899
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.0.3 b/metadata/md5-cache/dev-ruby/activemodel-5.0.3
index 0129ba0f899d..165ccc6e3a19 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.0.3
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.3.tar.gz -> rails-5.0.3.tgz
 _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_=6fa869cbd5068b9a662bfb40b2e87575
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.0.4 b/metadata/md5-cache/dev-ruby/activemodel-5.0.4
index bd98a242f44f..b910f248621e 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.0.4
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.4.tar.gz -> rails-5.0.4.tgz
 _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_=0c512a2b8f741d7f9afe6d2aca7d2a23
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.0.5 b/metadata/md5-cache/dev-ruby/activemodel-5.0.5
index f4f70f685a9a..be6df97f376b 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.0.5
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.5.tar.gz -> rails-5.0.5.tgz
 _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_=0c512a2b8f741d7f9afe6d2aca7d2a23
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.1.1 b/metadata/md5-cache/dev-ruby/activemodel-5.1.1
index 6e7637847034..fe35238e3ed9 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.1.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.1.tar.gz -> rails-5.1.1.tgz
 _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_=8c5e77fc47631087fc36391fbbc39bd3
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.1.2 b/metadata/md5-cache/dev-ruby/activemodel-5.1.2
index 77c8efbb1a4d..bbae1e467a42 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.1.2
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
 _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_=66b625e4293ccf28e39401410e63e31c
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.1.3 b/metadata/md5-cache/dev-ruby/activemodel-5.1.3
index 7cdeca53c5c2..cd225c14fb25 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.1.3
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.3.tar.gz -> rails-5.1.3.tgz
 _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_=66b625e4293ccf28e39401410e63e31c
diff --git a/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.1 b/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.1
index e6fd906b4bce..9c088581fd96 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.0
 SRC_URI=https://github.com/rails/activemodel-serializers-xml/archive/v1.0.1.tar.gz -> activemodel-serializers-xml-1.0.1.tgz
 _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_=90ceb700204e95a4cb786fc1bf8e8608
diff --git a/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2 b/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2
index cedc264b36f4..6665a2668251 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2
+++ b/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.0
 SRC_URI=https://github.com/rails/activemodel-serializers-xml/archive/v1.0.2.tar.gz -> activemodel-serializers-xml-1.0.2.tgz
 _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_=84bc33463c0d8ccd82ade247db842055
diff --git a/metadata/md5-cache/dev-ruby/activerecord-4.2.8 b/metadata/md5-cache/dev-ruby/activerecord-4.2.8
index d514766b89c4..cedf8080b10a 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-4.2.8
+++ b/metadata/md5-cache/dev-ruby/activerecord-4.2.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby21] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby21] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby21] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby21] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby21] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby21] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby22] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby23] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby23] ) ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby21] ~dev-ruby/actionmailer-4.2.8[ruby_targets_ruby21] >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby21] dev-ruby/mocha:0.14[ruby_targets_ruby21] <dev-ruby/minitest-5.4:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionmailer-4.2.8[ruby_targets_ruby22] >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] <dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionmailer-4.2.8[ruby_targets_ruby23] >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] <dev-ruby/minitest-5.4:5[ruby_targets_ruby23] ) ) test? ( >=dev-db/sqlite-3.12.1 ) 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=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby22] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby23] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionmailer-4.2.8[ruby_targets_ruby22] >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] <dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionmailer-4.2.8[ruby_targets_ruby23] >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] <dev-ruby/minitest-5.4:5[ruby_targets_ruby23] ) ) test? ( >=dev-db/sqlite-3.12.1 ) 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=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails/
-IUSE=mysql postgres sqlite test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=mysql postgres sqlite test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby21] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby21] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby21] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby21] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby21] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby21] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby22] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby23] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.15.0[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/activesupport-4.2.8[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby22] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby23] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.15.0[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=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.8.tar.gz -> rails-4.2.8.tgz
 _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_=077184f5c987d29a8abad7b9f279f0ec
diff --git a/metadata/md5-cache/dev-ruby/activerecord-4.2.9 b/metadata/md5-cache/dev-ruby/activerecord-4.2.9
index bcab2cc9d7cd..2211a05c112e 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-4.2.9
+++ b/metadata/md5-cache/dev-ruby/activerecord-4.2.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby21] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby21] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby21] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby21] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby21] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby21] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby22] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby23] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby24] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby24] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby24] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby24] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby24] ) ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby21] ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby21] >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby21] dev-ruby/mocha:0.14[ruby_targets_ruby21] dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby22] >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby23] >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby24] >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] dev-ruby/minitest:5[ruby_targets_ruby24] ) ) test? ( >=dev-db/sqlite-3.12.1 ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby22] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby23] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby24] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby24] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby24] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby24] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby22] >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby23] >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby24] >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] dev-ruby/minitest:5[ruby_targets_ruby24] ) ) test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails/
-IUSE=mysql postgres sqlite test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=mysql postgres sqlite test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby21] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby21] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby21] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby21] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby21] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby21] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby22] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby23] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby24] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby24] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby24] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby24] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby22] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby23] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby24] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby24] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby24] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby24] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.9.tar.gz -> rails-4.2.9.tgz
 _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_=deb3b02d47f80faf6359e70f3fa85c47
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.0.3 b/metadata/md5-cache/dev-ruby/activerecord-5.0.3
index 23ba7413a982..d2dbee251aa5 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.0.3
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.3.tar.gz -> rails-5.0.3.tgz
 _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_=2a5c1d7aa3a99634ac8711de9e80aa01
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.0.4 b/metadata/md5-cache/dev-ruby/activerecord-5.0.4
index 8a9502a433d4..d6307ba27f64 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.0.4
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.4.tar.gz -> rails-5.0.4.tgz
 _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_=2cafb792aa0a77a455442b421cbed055
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.0.5 b/metadata/md5-cache/dev-ruby/activerecord-5.0.5
index 96f91155a1c9..f8e78f7daaee 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.0.5
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.5.tar.gz -> rails-5.0.5.tgz
 _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_=2cafb792aa0a77a455442b421cbed055
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.1.1 b/metadata/md5-cache/dev-ruby/activerecord-5.1.1
index 7f3b4304ea62..c1bdf919301c 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.1.1
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.1.tar.gz -> rails-5.1.1.tgz
 _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_=17c7855de552b520f054cea45f9570b2
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.1.2 b/metadata/md5-cache/dev-ruby/activerecord-5.1.2
index 5c4fc35c40b6..f602ab0ccc0a 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.1.2
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
 _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_=76b887014c65330f449689ffbc443886
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.1.3 b/metadata/md5-cache/dev-ruby/activerecord-5.1.3
index c2dc0bd94700..493af1fed50f 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.1.3
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.3.tar.gz -> rails-5.1.3.tgz
 _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_=76b887014c65330f449689ffbc443886
diff --git a/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4 b/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4
index 95dccf6008cf..8c59a9d6eafe 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4
+++ b/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] =dev-ruby/activerecord-4*[ruby_targets_ruby21] >=dev-ruby/minitest-3[ruby_targets_ruby21] >=dev-ruby/sqlite3-1.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] =dev-ruby/activerecord-4*[ruby_targets_ruby22] >=dev-ruby/minitest-3[ruby_targets_ruby22] >=dev-ruby/sqlite3-1.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] =dev-ruby/activerecord-4*[ruby_targets_ruby23] >=dev-ruby/minitest-3[ruby_targets_ruby23] >=dev-ruby/sqlite3-1.3[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/bundler[ruby_targets_ruby22] =dev-ruby/activerecord-4*[ruby_targets_ruby22] >=dev-ruby/minitest-3[ruby_targets_ruby22] >=dev-ruby/sqlite3-1.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] =dev-ruby/activerecord-4*[ruby_targets_ruby23] >=dev-ruby/minitest-3[ruby_targets_ruby23] >=dev-ruby/sqlite3-1.3[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=Used to extract and deprecate old-style finder option hashes in Active Record
 EAPI=5
 HOMEPAGE=https://github.com/rails
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=MIT
-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=1.0
 SRC_URI=https://github.com/rails/activerecord-deprecated_finders/archive/v1.0.4.tar.gz -> activerecord-deprecated_finders-1.0.4.tar.gz
 _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_=b8d5f0a28550ee911bb18b80dbee3b5e
diff --git a/metadata/md5-cache/dev-ruby/activeresource-4.1.0 b/metadata/md5-cache/dev-ruby/activeresource-4.1.0
index 68ab570d4a07..ac9f3478908c 100644
--- a/metadata/md5-cache/dev-ruby/activeresource-4.1.0
+++ b/metadata/md5-cache/dev-ruby/activeresource-4.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/activesupport-4*:*[ruby_targets_ruby21] =dev-ruby/activemodel-4*:*[ruby_targets_ruby21] >=dev-ruby/rails-observers-0.1.2:0.1[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] >=dev-ruby/mocha-0.13.0:0.13[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/activesupport-4*:*[ruby_targets_ruby22] =dev-ruby/activemodel-4*:*[ruby_targets_ruby22] >=dev-ruby/rails-observers-0.1.2:0.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.13.0:0.13[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=Think Active Record for web resources
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/activeresource/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/activesupport-4*:*[ruby_targets_ruby21] =dev-ruby/activemodel-4*:*[ruby_targets_ruby21] >=dev-ruby/rails-observers-0.1.2:0.1[ruby_targets_ruby21] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby22? ( =dev-ruby/activesupport-4*:*[ruby_targets_ruby22] =dev-ruby/activemodel-4*:*[ruby_targets_ruby22] >=dev-ruby/rails-observers-0.1.2:0.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=4.1
 SRC_URI=https://github.com/rails/activeresource/archive/v4.1.0.tar.gz -> activeresource-4.1.0.tgz
 _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
-_md5_=10b0c347db8b93998b58985c61c0f826
+_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_=24655558f1d2fe744394df54be84f829
diff --git a/metadata/md5-cache/dev-ruby/activeresource-5.0.0 b/metadata/md5-cache/dev-ruby/activeresource-5.0.0
index cc7081e36931..289bef36d65c 100644
--- a/metadata/md5-cache/dev-ruby/activeresource-5.0.0
+++ b/metadata/md5-cache/dev-ruby/activeresource-5.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/activeresource/archive/v5.0.0.tar.gz -> activeresource-5.0.0.tgz
 _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_=d74c359f88d3f1c6f28a416a7b172bbb
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.2.8 b/metadata/md5-cache/dev-ruby/activesupport-4.2.8
index 71e1cf0bbf3d..f952d152c4de 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-4.2.8
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.2.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby21] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby21] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby21] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby24] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby21] >=dev-ruby/builder-3.1.0[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] dev-ruby/mocha:0.14[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby22] >=dev-ruby/builder-3.1.0[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby23] >=dev-ruby/builder-3.1.0[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby24] >=dev-ruby/builder-3.1.0[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby24] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby22] >=dev-ruby/builder-3.1.0[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby23] >=dev-ruby/builder-3.1.0[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby24] >=dev-ruby/builder-3.1.0[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Utility Classes and Extension to the Standard Library
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby21] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby21] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby21] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby24] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby24] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.8.tar.gz -> rails-4.2.8.tgz
 _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_=db6640948f82599c5bf410782c3c6d89
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.2.9 b/metadata/md5-cache/dev-ruby/activesupport-4.2.9
index 9e74499fefeb..f54ee8d012c4 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-4.2.9
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.2.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby21] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby21] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby21] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby24] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby21] >=dev-ruby/builder-3.1.0[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] dev-ruby/mocha:0.14[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby22] >=dev-ruby/builder-3.1.0[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby23] >=dev-ruby/builder-3.1.0[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby24] >=dev-ruby/builder-3.1.0[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby24] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby22] >=dev-ruby/builder-3.1.0[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby23] >=dev-ruby/builder-3.1.0[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby24] >=dev-ruby/builder-3.1.0[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Utility Classes and Extension to the Standard Library
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby21] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby21] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby21] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby24] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby24] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.9.tar.gz -> rails-4.2.9.tgz
 _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_=2c98c659bd86b67d8499efc422b5bfa8
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.0.3 b/metadata/md5-cache/dev-ruby/activesupport-5.0.3
index 192e2968bbcd..4fe5ac690c72 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.0.3
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.3.tar.gz -> rails-5.0.3.tgz
 _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_=98dfcea2ed1216e2ce773aa9b706cffd
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.0.4 b/metadata/md5-cache/dev-ruby/activesupport-5.0.4
index d8b2859840ba..b2f6098954fa 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.0.4
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.4.tar.gz -> rails-5.0.4.tgz
 _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_=6557f26fd4b746bb723e2c5e8a9f175b
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.0.5 b/metadata/md5-cache/dev-ruby/activesupport-5.0.5
index 37ba4cf75a6f..497cb84712ce 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.0.5
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.5.tar.gz -> rails-5.0.5.tgz
 _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_=6557f26fd4b746bb723e2c5e8a9f175b
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.1.1 b/metadata/md5-cache/dev-ruby/activesupport-5.1.1
index fb444afe5b23..2a6fdde82b29 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.1.1
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.1.tar.gz -> rails-5.1.1.tgz
 _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_=f222f5c375e4ca20dc53eeb38df3dc06
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.1.2 b/metadata/md5-cache/dev-ruby/activesupport-5.1.2
index 7b3ab0dccfc7..3af01c1647ac 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.1.2
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
 _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_=c17ade88bf4b8eeef4171332556bfdac
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.1.3 b/metadata/md5-cache/dev-ruby/activesupport-5.1.3
index ad43aa23493a..e4c6e09c867e 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.1.3
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.3.tar.gz -> rails-5.1.3.tgz
 _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_=c17ade88bf4b8eeef4171332556bfdac
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.4 b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.4
index d8de1373a562..e0782745fe79 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.4
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/activerecord[ruby_targets_ruby21,sqlite] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/activerecord[ruby_targets_ruby22,sqlite] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/activerecord[ruby_targets_ruby23,sqlite] ) ) 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/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=test? ( ruby_targets_ruby22? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/activerecord[ruby_targets_ruby22,sqlite] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/activerecord[ruby_targets_ruby23,sqlite] ) ) 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/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=Capabilities for sorting and reordering a number of objects in a list
 EAPI=5
 HOMEPAGE=https://github.com/swanandp/acts_as_list
-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 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[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/activerecord-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[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=3
 SRC_URI=mirror://rubygems/acts_as_list-0.9.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_=a4c188c6517143c596c5ce36d0bafa80
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.5 b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.5
index b01ca5e07d1f..80ab6c27749b 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.5
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/activerecord[ruby_targets_ruby21,sqlite] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/activerecord[ruby_targets_ruby22,sqlite] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/activerecord[ruby_targets_ruby23,sqlite] ) ) 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/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=test? ( ruby_targets_ruby22? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/activerecord[ruby_targets_ruby22,sqlite] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/activerecord[ruby_targets_ruby23,sqlite] ) ) 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/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=Capabilities for sorting and reordering a number of objects in a list
 EAPI=5
 HOMEPAGE=https://github.com/swanandp/acts_as_list
-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 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[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/activerecord-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[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=3
 SRC_URI=mirror://rubygems/acts_as_list-0.9.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_=a4c188c6517143c596c5ce36d0bafa80
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.7 b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.7
index 1effce4ba5bb..cbded7072f57 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.7
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/activerecord[ruby_targets_ruby21,sqlite] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/activerecord[ruby_targets_ruby22,sqlite] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/activerecord[ruby_targets_ruby23,sqlite] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/activerecord[ruby_targets_ruby24,sqlite] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/activerecord[ruby_targets_ruby22,sqlite] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/activerecord[ruby_targets_ruby23,sqlite] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/activerecord[ruby_targets_ruby24,sqlite] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Capabilities for sorting and reordering a number of objects in a list
 EAPI=6
 HOMEPAGE=https://github.com/swanandp/acts_as_list
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/acts_as_list-0.9.7.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_=fd765959a6a0a382609caea07d2e026e
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.4.0-r1 b/metadata/md5-cache/dev-ruby/addressable-2.4.0-r1
index 4d4b05ff620d..e34a6716f2f2 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/addressable-2.4.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=A replacement for the URI implementation that is part of Ruby's standard library
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-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/addressable-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_=6e7045ba81d6231d494509776c9e803a
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.5.1 b/metadata/md5-cache/dev-ruby/addressable-2.5.1
index aeae5a157998..1d70676d6466 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.5.1
+++ b/metadata/md5-cache/dev-ruby/addressable-2.5.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/public_suffix-2.0.2:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/public_suffix-2.0.2:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/public_suffix-2.0.2:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/public_suffix-2.0.2:2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/public_suffix-2.0.2:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/public_suffix-2.0.2:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/public_suffix-2.0.2:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A replacement for the URI implementation that is part of Ruby's standard library
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/public_suffix-2.0.2:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/public_suffix-2.0.2:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/public_suffix-2.0.2:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/public_suffix-2.0.2:2[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/public_suffix-2.0.2:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/public_suffix-2.0.2:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/public_suffix-2.0.2:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/addressable-2.5.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_=96c7cab731c402beb28a8b5be4ff305e
diff --git a/metadata/md5-cache/dev-ruby/ae-1.8.2 b/metadata/md5-cache/dev-ruby/ae-1.8.2
index 72e6bbde4c0e..74235eccb58c 100644
--- a/metadata/md5-cache/dev-ruby/ae-1.8.2
+++ b/metadata/md5-cache/dev-ruby/ae-1.8.2
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Assertive Expressive is an assertions library designed for reuse
 EAPI=5
 HOMEPAGE=https://rubyworks.github.io/ae/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ae-1.8.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_=31057422dbdd82c98b4342ed605535a1
diff --git a/metadata/md5-cache/dev-ruby/afm-0.2.2 b/metadata/md5-cache/dev-ruby/afm-0.2.2
index 4dc9efeceb5e..19ebb758fa96 100644
--- a/metadata/md5-cache/dev-ruby/afm-0.2.2
+++ b/metadata/md5-cache/dev-ruby/afm-0.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A very simple library to read Adobe Font Metrics files
 EAPI=5
 HOMEPAGE=https://github.com/halfbyte/afm
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/afm-0.2.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_=437e486d8755e8f686087cd8f745f993
diff --git a/metadata/md5-cache/dev-ruby/akismet-1.0.2 b/metadata/md5-cache/dev-ruby/akismet-1.0.2
index 3d55aa11d3b0..54d1d12cc360 100644
--- a/metadata/md5-cache/dev-ruby/akismet-1.0.2
+++ b/metadata/md5-cache/dev-ruby/akismet-1.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/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? ( 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/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=A Ruby client for the Akismet API
 EAPI=5
 HOMEPAGE=https://github.com/jonahb/akismet
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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=https://github.com/jonahb/akismet/archive/v1.0.2.tar.gz -> akismet-1.0.2.tar.gz
 _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_=8d0a284da438acc9bae077faf126f9bf
diff --git a/metadata/md5-cache/dev-ruby/akismet-2.0.0 b/metadata/md5-cache/dev-ruby/akismet-2.0.0
index 8813bf80fefd..b75bced41368 100644
--- a/metadata/md5-cache/dev-ruby/akismet-2.0.0
+++ b/metadata/md5-cache/dev-ruby/akismet-2.0.0
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/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? ( 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/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=A Ruby client for the Akismet API
 EAPI=5
 HOMEPAGE=https://github.com/jonahb/akismet
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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 )
 RESTRICT=test
 SLOT=2
 SRC_URI=https://github.com/jonahb/akismet/archive/v2.0.0.tar.gz -> akismet-2.0.0.tar.gz
 _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_=f3de163550e8f828ca20c79b9cebc797
diff --git a/metadata/md5-cache/dev-ruby/allison-2.0.3-r3 b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
index ad0152adce01..0a74a7b4a1c2 100644
--- a/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
+++ b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A modern, pretty RDoc template
 EAPI=5
 HOMEPAGE=https://fauna.github.com/fauna/allison/files/README.html
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-solaris
 LICENSE=AFL-3.0
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/allison-2.0.3.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_=2d4a95b94a4a1077455649966a9a1ec3
diff --git a/metadata/md5-cache/dev-ruby/amatch-0.3.1 b/metadata/md5-cache/dev-ruby/amatch-0.3.1
index 09811ab60e82..51b79d1e8193 100644
--- a/metadata/md5-cache/dev-ruby/amatch-0.3.1
+++ b/metadata/md5-cache/dev-ruby/amatch-0.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/tins-1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Approximate Matching Extension for Ruby
 EAPI=6
 HOMEPAGE=https://flori.github.com/amatch/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/tins-1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/amatch-0.3.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_=31b158e3e102f53654412577e8ed71eb
diff --git a/metadata/md5-cache/dev-ruby/amatch-0.4.0 b/metadata/md5-cache/dev-ruby/amatch-0.4.0
index 26ee980a1e8e..de64cb88a35d 100644
--- a/metadata/md5-cache/dev-ruby/amatch-0.4.0
+++ b/metadata/md5-cache/dev-ruby/amatch-0.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/tins-1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Approximate Matching Extension for Ruby
 EAPI=6
 HOMEPAGE=https://flori.github.com/amatch/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/tins-1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) !app-misc/glimpse !app-text/agrep !dev-libs/tre 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) !app-misc/glimpse !app-text/agrep !dev-libs/tre ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/amatch-0.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_=fb7f6d362c11ba1b8ffe1a3d586f9ede
diff --git a/metadata/md5-cache/dev-ruby/ammeter-1.1.4 b/metadata/md5-cache/dev-ruby/ammeter-1.1.4
index f299f0a5cfe4..3326a7072f97 100644
--- a/metadata/md5-cache/dev-ruby/ammeter-1.1.4
+++ b/metadata/md5-cache/dev-ruby/ammeter-1.1.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby21] >=dev-ruby/uglifier-1.3[ruby_targets_ruby21] >=dev-ruby/rake-0.10[ruby_targets_ruby21] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby21] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby21] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby21] dev-util/cucumber[ruby_targets_ruby21] dev-util/aruba[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3[ruby_targets_ruby22] >=dev-ruby/rake-0.10[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby22] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby22] dev-util/cucumber[ruby_targets_ruby22] dev-util/aruba[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] dev-ruby/bundler[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/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3[ruby_targets_ruby22] >=dev-ruby/rake-0.10[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby22] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby22] dev-util/cucumber[ruby_targets_ruby22] dev-util/aruba[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Write specs for your Rails 3+ generators
 EAPI=5
 HOMEPAGE=https://github.com/alexrothenberg/ammeter
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] >=dev-ruby/rspec-rails-2.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/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] >=dev-ruby/rspec-rails-2.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/ammeter-1.1.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_=003c8ce82814967d746d464778447866
diff --git a/metadata/md5-cache/dev-ruby/ammeter-1.1.4-r1 b/metadata/md5-cache/dev-ruby/ammeter-1.1.4-r1
index 9497cd4926f2..6911f2f5b359 100644
--- a/metadata/md5-cache/dev-ruby/ammeter-1.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/ammeter-1.1.4-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby21] >=dev-ruby/uglifier-1.3[ruby_targets_ruby21] >=dev-ruby/rake-0.10[ruby_targets_ruby21] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby21] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby21] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby21] dev-util/cucumber[ruby_targets_ruby21] dev-util/aruba[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3[ruby_targets_ruby22] >=dev-ruby/rake-0.10[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby22] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby22] dev-util/cucumber[ruby_targets_ruby22] dev-util/aruba[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3[ruby_targets_ruby23] >=dev-ruby/rake-0.10[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby23] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby23] dev-util/cucumber[ruby_targets_ruby23] dev-util/aruba[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/bundler[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3[ruby_targets_ruby22] >=dev-ruby/rake-0.10[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby22] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby22] dev-util/cucumber[ruby_targets_ruby22] dev-util/aruba[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3[ruby_targets_ruby23] >=dev-ruby/rake-0.10[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby23] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby23] dev-util/cucumber[ruby_targets_ruby23] dev-util/aruba[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/bundler[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: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=Write specs for your Rails 3+ generators
 EAPI=5
 HOMEPAGE=https://github.com/alexrothenberg/ammeter
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] >=dev-ruby/rspec-rails-2.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/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] >=dev-ruby/rspec-rails-2.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/ammeter-1.1.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_=e82b38fec5082775a6bbbc74d93a6486
diff --git a/metadata/md5-cache/dev-ruby/amq-client-1.0.4 b/metadata/md5-cache/dev-ruby/amq-client-1.0.4
index 34706509513c..c71b0c8affe7 100644
--- a/metadata/md5-cache/dev-ruby/amq-client-1.0.4
+++ b/metadata/md5-cache/dev-ruby/amq-client-1.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby21] dev-ruby/eventmachine[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby22] dev-ruby/eventmachine[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby23] dev-ruby/eventmachine[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/evented-spec[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/evented-spec[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/evented-spec[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-ruby/amq-protocol-1.2.0[ruby_targets_ruby22] dev-ruby/eventmachine[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby23] dev-ruby/eventmachine[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/evented-spec[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/evented-spec[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=A fully-featured, low-level AMQP 0.9.1 client
 EAPI=5
 HOMEPAGE=https://github.com/ruby-amqp/amq-client
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby21] dev-ruby/eventmachine[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby22] dev-ruby/eventmachine[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby23] dev-ruby/eventmachine[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/amq-protocol-1.2.0[ruby_targets_ruby22] dev-ruby/eventmachine[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby23] dev-ruby/eventmachine[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/amq-client-1.0.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_=72a32e70fbbb595286269d661834b6e4
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2 b/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2
index 5216c41dfbb8..8e6d9df6f855 100644
--- a/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) 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_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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=An AMQP 0.9.1 serialization library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/ruby-amqp/amq-protocol
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/amq-protocol-1.9.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_=0433178fac17e4fdcf3723274942d2b1
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-2.1.0 b/metadata/md5-cache/dev-ruby/amq-protocol-2.1.0
index 69e5c74ab874..db70f0b3baba 100644
--- a/metadata/md5-cache/dev-ruby/amq-protocol-2.1.0
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-2.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[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: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/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[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: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=An AMQP 0.9.1 serialization library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/ruby-amqp/amq-protocol
-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 ~x86
 LICENSE=MIT
-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=2
 SRC_URI=mirror://rubygems/amq-protocol-2.1.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_=bb883c0dcad194cd6029e9703fb630d6
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-2.2.0 b/metadata/md5-cache/dev-ruby/amq-protocol-2.2.0
index 273cb27fa809..a38536407e43 100644
--- a/metadata/md5-cache/dev-ruby/amq-protocol-2.2.0
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-2.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An AMQP 0.9.1 serialization library for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/ruby-amqp/amq-protocol
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/amq-protocol-2.2.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_=b245c6ea57363fe06e744586320cfe1e
diff --git a/metadata/md5-cache/dev-ruby/amqp-1.6.0 b/metadata/md5-cache/dev-ruby/amqp-1.6.0
index bc4f4274c736..2ecdfce9e8c7 100644
--- a/metadata/md5-cache/dev-ruby/amqp-1.6.0
+++ b/metadata/md5-cache/dev-ruby/amqp-1.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/multi_json[ruby_targets_ruby21] dev-ruby/evented-spec[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/multi_json[ruby_targets_ruby22] dev-ruby/evented-spec[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/multi_json[ruby_targets_ruby23] dev-ruby/evented-spec[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby21] >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby22] >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby23] >=dev-ruby/amq-protocol-2.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/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=ruby_targets_ruby22? ( test? ( dev-ruby/multi_json[ruby_targets_ruby22] dev-ruby/evented-spec[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/multi_json[ruby_targets_ruby23] dev-ruby/evented-spec[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby22] >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby23] >=dev-ruby/amq-protocol-2.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/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=AMQP client implementation in Ruby/EventMachine
 EAPI=5
 HOMEPAGE=http://rubyamqp.info/
-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 ~x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby21] >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby22] >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby23] >=dev-ruby/amq-protocol-2.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/eventmachine-0.12.4[ruby_targets_ruby22] >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby23] >=dev-ruby/amq-protocol-2.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=1.4
 SRC_URI=mirror://rubygems/amqp-1.6.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_=31598ba919409ee6099fcf684efe59dd
diff --git a/metadata/md5-cache/dev-ruby/amqp-1.7.0 b/metadata/md5-cache/dev-ruby/amqp-1.7.0
index 42f160ea3f29..aff74498d487 100644
--- a/metadata/md5-cache/dev-ruby/amqp-1.7.0
+++ b/metadata/md5-cache/dev-ruby/amqp-1.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/multi_json[ruby_targets_ruby21] dev-ruby/evented-spec[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/multi_json[ruby_targets_ruby22] dev-ruby/evented-spec[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/multi_json[ruby_targets_ruby23] dev-ruby/evented-spec[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby21] >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby22] >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby23] >=dev-ruby/amq-protocol-2.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/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=ruby_targets_ruby22? ( test? ( dev-ruby/multi_json[ruby_targets_ruby22] dev-ruby/evented-spec[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/multi_json[ruby_targets_ruby23] dev-ruby/evented-spec[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby22] >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby23] >=dev-ruby/amq-protocol-2.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/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=AMQP client implementation in Ruby/EventMachine
 EAPI=5
 HOMEPAGE=http://rubyamqp.info/
-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 ~x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby21] >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby22] >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby23] >=dev-ruby/amq-protocol-2.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/eventmachine-0.12.4[ruby_targets_ruby22] >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby23] >=dev-ruby/amq-protocol-2.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=1.4
 SRC_URI=mirror://rubygems/amqp-1.7.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_=12fc3ab86ece39fa94c03412701e12a8
diff --git a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1 b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
index f02104ae4ba1..04764a4bf6c3 100644
--- a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
+++ b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Like your annoying friend that asks you questions all the time
 EAPI=5
 HOMEPAGE=http://solutious.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/annoy-0.5.6.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_=a4fcf248e9bc9e878c821b25bffca2c2
diff --git a/metadata/md5-cache/dev-ruby/ansi-1.5.0 b/metadata/md5-cache/dev-ruby/ansi-1.5.0
index da2dac2558fa..41b85f82fecf 100644
--- a/metadata/md5-cache/dev-ruby/ansi-1.5.0
+++ b/metadata/md5-cache/dev-ruby/ansi-1.5.0
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=The Ruby ANSI project is collection of ANSI escape codes for Ruby
 EAPI=5
 HOMEPAGE=https://rubyworks.github.io/ansi/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ansi-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_=24ce295ae50bf93b1fff5f947df184b5
diff --git a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.6.1 b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.6.1
index 7555209b372c..85023746efc8 100644
--- a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.6.1
+++ b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.6.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Provides POSIX tarchive management from Ruby programs
 EAPI=5
 HOMEPAGE=https://github.com/halostatue/minitar
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( BSD-2 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitar-0.6.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_=0ee0f2ad69d2b90ea76113aeaf3e9318
diff --git a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.6.1-r1 b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.6.1-r1
index f36fa03bfb10..4684f85133af 100644
--- a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.6.1-r1
+++ b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.6.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Provides POSIX tarchive management from Ruby programs
 EAPI=6
 HOMEPAGE=https://github.com/halostatue/minitar
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( BSD-2 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/halostatue/minitar/archive/v0.6.1.tar.gz -> archive-tar-minitar-0.6.1.tar.gz
 _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_=1177e577dd8b6c54caa08ac78193641d
diff --git a/metadata/md5-cache/dev-ruby/arel-5.0.1.20140414130214 b/metadata/md5-cache/dev-ruby/arel-5.0.1.20140414130214
index a3e9f72082ae..072df1c5cfe6 100644
--- a/metadata/md5-cache/dev-ruby/arel-5.0.1.20140414130214
+++ b/metadata/md5-cache/dev-ruby/arel-5.0.1.20140414130214
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] >=dev-ruby/minitest-5.3:5[ruby_targets_ruby21] >=dev-ruby/hoe-3.6[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/minitest-5.3:5[ruby_targets_ruby22] >=dev-ruby/hoe-3.6[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/minitest-5.3:5[ruby_targets_ruby23] >=dev-ruby/hoe-3.6[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/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/test-unit:2[ruby_targets_ruby22] >=dev-ruby/minitest-5.3:5[ruby_targets_ruby22] >=dev-ruby/hoe-3.6[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/minitest-5.3:5[ruby_targets_ruby23] >=dev-ruby/hoe-3.6[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/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=Arel is a Relational Algebra for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rails/arel
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=5.0
 SRC_URI=mirror://rubygems/arel-5.0.1.20140414130214.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_=5b03ee1c50fb408cfbaf4f97cde2dbe5
diff --git a/metadata/md5-cache/dev-ruby/arel-6.0.3 b/metadata/md5-cache/dev-ruby/arel-6.0.3
index aa5515632c83..752aab756cc4 100644
--- a/metadata/md5-cache/dev-ruby/arel-6.0.3
+++ b/metadata/md5-cache/dev-ruby/arel-6.0.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/minitest-5.4:5[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/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/test-unit:2[ruby_targets_ruby22] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/minitest-5.4:5[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/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=Arel is a Relational Algebra for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rails/arel
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=6.0
 SRC_URI=https://github.com/rails/arel/archive/v6.0.3.tar.gz -> arel-6.0.3.tar.gz
 _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_=6060eac729863c3c764879716934ca69
diff --git a/metadata/md5-cache/dev-ruby/arel-6.0.4 b/metadata/md5-cache/dev-ruby/arel-6.0.4
index bf53eaaa8ce1..9ca6f929c70b 100644
--- a/metadata/md5-cache/dev-ruby/arel-6.0.4
+++ b/metadata/md5-cache/dev-ruby/arel-6.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Arel is a Relational Algebra for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rails/arel
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=6.0
 SRC_URI=https://github.com/rails/arel/archive/v6.0.4.tar.gz -> arel-6.0.4.tar.gz
 _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_=9d32fc9275d1d1eb25f16a106638e381
diff --git a/metadata/md5-cache/dev-ruby/arel-7.1.4 b/metadata/md5-cache/dev-ruby/arel-7.1.4
index 963ce75f997f..6b7f71570aac 100644
--- a/metadata/md5-cache/dev-ruby/arel-7.1.4
+++ b/metadata/md5-cache/dev-ruby/arel-7.1.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Arel is a Relational Algebra for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rails/arel
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=7.0
 SRC_URI=https://github.com/rails/arel/archive/v7.1.4.tar.gz -> arel-7.1.4.tar.gz
 _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_=410a35b8c0cdb8c32659287d799af88c
diff --git a/metadata/md5-cache/dev-ruby/arel-8.0.0 b/metadata/md5-cache/dev-ruby/arel-8.0.0
index badb9b2a0f98..6ec05286a8b6 100644
--- a/metadata/md5-cache/dev-ruby/arel-8.0.0
+++ b/metadata/md5-cache/dev-ruby/arel-8.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Arel is a Relational Algebra for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rails/arel
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=8.0
 SRC_URI=https://github.com/rails/arel/archive/v8.0.0.tar.gz -> arel-8.0.0.tar.gz
 _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_=3da3c2bc9b8caf5c746ed03b4d8cbf57
diff --git a/metadata/md5-cache/dev-ruby/arel-helpers-2.3.0 b/metadata/md5-cache/dev-ruby/arel-helpers-2.3.0
index f56167a6ae96..35c2bb4d9595 100644
--- a/metadata/md5-cache/dev-ruby/arel-helpers-2.3.0
+++ b/metadata/md5-cache/dev-ruby/arel-helpers-2.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( || ( dev-ruby/activerecord:5.0[ruby_targets_ruby21] dev-ruby/activerecord:4.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( || ( dev-ruby/activerecord:5.0[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( || ( dev-ruby/activerecord:5.0[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] ) ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rr[ruby_targets_ruby21] dev-ruby/activerecord[ruby_targets_ruby21,sqlite] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rr[ruby_targets_ruby22] dev-ruby/activerecord[ruby_targets_ruby22,sqlite] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rr[ruby_targets_ruby23] dev-ruby/activerecord[ruby_targets_ruby23,sqlite] ) ) 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: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-ruby/activerecord:5.0[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( || ( dev-ruby/activerecord:5.0[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rr[ruby_targets_ruby22] dev-ruby/activerecord[ruby_targets_ruby22,sqlite] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rr[ruby_targets_ruby23] dev-ruby/activerecord[ruby_targets_ruby23,sqlite] ) ) 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: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=Tools to help construct database queries
 EAPI=5
 HOMEPAGE=https://github.com/camertron/arel-helpers
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( || ( dev-ruby/activerecord:5.0[ruby_targets_ruby21] dev-ruby/activerecord:4.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( || ( dev-ruby/activerecord:5.0[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( || ( dev-ruby/activerecord:5.0[ruby_targets_ruby23] dev-ruby/activerecord:4.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/activerecord:5.0[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( || ( dev-ruby/activerecord:5.0[ruby_targets_ruby23] dev-ruby/activerecord:4.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/arel-helpers-2.3.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_=5ba2b74a46ae4413d7673ac84f5b97df
diff --git a/metadata/md5-cache/dev-ruby/arel-helpers-2.4.0 b/metadata/md5-cache/dev-ruby/arel-helpers-2.4.0
index 029c20fb49ca..e8561d66bf29 100644
--- a/metadata/md5-cache/dev-ruby/arel-helpers-2.4.0
+++ b/metadata/md5-cache/dev-ruby/arel-helpers-2.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( || ( dev-ruby/activerecord:5.1[ruby_targets_ruby21] dev-ruby/activerecord:5.0[ruby_targets_ruby21] dev-ruby/activerecord:4.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( || ( dev-ruby/activerecord:5.1[ruby_targets_ruby22] dev-ruby/activerecord:5.0[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( || ( dev-ruby/activerecord:5.1[ruby_targets_ruby23] dev-ruby/activerecord:5.0[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( || ( dev-ruby/activerecord:5.1[ruby_targets_ruby24] dev-ruby/activerecord:5.0[ruby_targets_ruby24] dev-ruby/activerecord:4.2[ruby_targets_ruby24] ) ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rr[ruby_targets_ruby21] dev-ruby/activerecord[ruby_targets_ruby21,sqlite] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rr[ruby_targets_ruby22] dev-ruby/activerecord[ruby_targets_ruby22,sqlite] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rr[ruby_targets_ruby23] dev-ruby/activerecord[ruby_targets_ruby23,sqlite] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rr[ruby_targets_ruby24] dev-ruby/activerecord[ruby_targets_ruby24,sqlite] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( || ( dev-ruby/activerecord:5.1[ruby_targets_ruby22] dev-ruby/activerecord:5.0[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( || ( dev-ruby/activerecord:5.1[ruby_targets_ruby23] dev-ruby/activerecord:5.0[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( || ( dev-ruby/activerecord:5.1[ruby_targets_ruby24] dev-ruby/activerecord:5.0[ruby_targets_ruby24] dev-ruby/activerecord:4.2[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rr[ruby_targets_ruby22] dev-ruby/activerecord[ruby_targets_ruby22,sqlite] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rr[ruby_targets_ruby23] dev-ruby/activerecord[ruby_targets_ruby23,sqlite] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rr[ruby_targets_ruby24] dev-ruby/activerecord[ruby_targets_ruby24,sqlite] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Tools to help construct database queries
 EAPI=5
 HOMEPAGE=https://github.com/camertron/arel-helpers
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( || ( dev-ruby/activerecord:5.1[ruby_targets_ruby21] dev-ruby/activerecord:5.0[ruby_targets_ruby21] dev-ruby/activerecord:4.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( || ( dev-ruby/activerecord:5.1[ruby_targets_ruby22] dev-ruby/activerecord:5.0[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( || ( dev-ruby/activerecord:5.1[ruby_targets_ruby23] dev-ruby/activerecord:5.0[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( || ( dev-ruby/activerecord:5.1[ruby_targets_ruby24] dev-ruby/activerecord:5.0[ruby_targets_ruby24] dev-ruby/activerecord:4.2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( || ( dev-ruby/activerecord:5.1[ruby_targets_ruby22] dev-ruby/activerecord:5.0[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( || ( dev-ruby/activerecord:5.1[ruby_targets_ruby23] dev-ruby/activerecord:5.0[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( || ( dev-ruby/activerecord:5.1[ruby_targets_ruby24] dev-ruby/activerecord:5.0[ruby_targets_ruby24] dev-ruby/activerecord:4.2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/arel-helpers-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_=7dd8323ac53a6ba57afefa941e1a8049
diff --git a/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2 b/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2
index b63cbc5236c2..e127b4796fcf 100644
--- a/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Methods for encoding/decoding Adobe's binary-to-text encoding of the same name
 EAPI=5
 HOMEPAGE=https://github.com/datawraith/ascii85gem
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/Ascii85-1.0.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_=d4b93ac61ebc8a14784de0e5fea85aec
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.5-r1 b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.5-r1
index f19facb6e7a4..6a879f7dc231 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.5-r1
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.5-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-util/cucumber[ruby_targets_ruby21] dev-ruby/rspec-expectations:*[ruby_targets_ruby21] dev-ruby/asciimath[ruby_targets_ruby21] dev-ruby/coderay[ruby_targets_ruby21] dev-ruby/erubis[ruby_targets_ruby21] dev-ruby/haml[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/slim[ruby_targets_ruby21] dev-ruby/tilt[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] dev-ruby/rspec-expectations:*[ruby_targets_ruby22] dev-ruby/asciimath[ruby_targets_ruby22] dev-ruby/coderay[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/haml[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/slim[ruby_targets_ruby22] dev-ruby/tilt[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] dev-ruby/rspec-expectations:*[ruby_targets_ruby23] dev-ruby/asciimath[ruby_targets_ruby23] dev-ruby/coderay[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/haml[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/slim[ruby_targets_ruby23] dev-ruby/tilt[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/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-util/cucumber[ruby_targets_ruby22] dev-ruby/rspec-expectations:*[ruby_targets_ruby22] dev-ruby/asciimath[ruby_targets_ruby22] dev-ruby/coderay[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/haml[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/slim[ruby_targets_ruby22] dev-ruby/tilt[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] dev-ruby/rspec-expectations:*[ruby_targets_ruby23] dev-ruby/asciimath[ruby_targets_ruby23] dev-ruby/coderay[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/haml[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/slim[ruby_targets_ruby23] dev-ruby/tilt[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/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=Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats
 EAPI=5
 HOMEPAGE=https://github.com/asciidoctor/asciidoctor
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 arm ~arm64 ppc ppc64
 LICENSE=MIT
-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=https://github.com/asciidoctor/asciidoctor/archive/v1.5.5.tar.gz -> asciidoctor-1.5.5.tar.gz
 _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_=3907b33546d106863d588b7f575fdde4
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.6 b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.6
index eca869b65821..58d334c06d03 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.6
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-util/cucumber[ruby_targets_ruby21] dev-ruby/rspec-expectations:*[ruby_targets_ruby21] dev-ruby/asciimath[ruby_targets_ruby21] dev-ruby/coderay[ruby_targets_ruby21] dev-ruby/erubis[ruby_targets_ruby21] dev-ruby/haml[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/slim[ruby_targets_ruby21] dev-ruby/tilt[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] dev-ruby/rspec-expectations:*[ruby_targets_ruby22] dev-ruby/asciimath[ruby_targets_ruby22] dev-ruby/coderay[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/haml[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/slim[ruby_targets_ruby22] dev-ruby/tilt[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] dev-ruby/rspec-expectations:*[ruby_targets_ruby23] dev-ruby/asciimath[ruby_targets_ruby23] dev-ruby/coderay[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/haml[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/slim[ruby_targets_ruby23] dev-ruby/tilt[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/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-util/cucumber[ruby_targets_ruby22] dev-ruby/rspec-expectations:*[ruby_targets_ruby22] dev-ruby/asciimath[ruby_targets_ruby22] dev-ruby/coderay[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/haml[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/slim[ruby_targets_ruby22] dev-ruby/tilt[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] dev-ruby/rspec-expectations:*[ruby_targets_ruby23] dev-ruby/asciimath[ruby_targets_ruby23] dev-ruby/coderay[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/haml[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/slim[ruby_targets_ruby23] dev-ruby/tilt[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/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=Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats
 EAPI=6
 HOMEPAGE=https://github.com/asciidoctor/asciidoctor
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=MIT
-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=https://github.com/asciidoctor/asciidoctor/archive/v1.5.6.tar.gz -> asciidoctor-1.5.6.tar.gz
 _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_=c71d1ee4dd2cb5000ad7611235732325
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.6.1 b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.6.1
index bd3af5726d74..03355eea2e65 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.6.1
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.6.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] dev-ruby/rspec-expectations:*[ruby_targets_ruby21] dev-ruby/asciimath[ruby_targets_ruby21] dev-ruby/coderay[ruby_targets_ruby21] dev-ruby/erubis[ruby_targets_ruby21] dev-ruby/haml[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/slim[ruby_targets_ruby21] dev-ruby/tilt[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] dev-ruby/rspec-expectations:*[ruby_targets_ruby22] dev-ruby/asciimath[ruby_targets_ruby22] dev-ruby/coderay[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/haml[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/slim[ruby_targets_ruby22] dev-ruby/tilt[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] dev-ruby/rspec-expectations:*[ruby_targets_ruby23] dev-ruby/asciimath[ruby_targets_ruby23] dev-ruby/coderay[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/haml[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/slim[ruby_targets_ruby23] dev-ruby/tilt[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/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-util/cucumber[ruby_targets_ruby22] dev-ruby/rspec-expectations:*[ruby_targets_ruby22] dev-ruby/asciimath[ruby_targets_ruby22] dev-ruby/coderay[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/haml[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/slim[ruby_targets_ruby22] dev-ruby/tilt[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] dev-ruby/rspec-expectations:*[ruby_targets_ruby23] dev-ruby/asciimath[ruby_targets_ruby23] dev-ruby/coderay[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/haml[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/slim[ruby_targets_ruby23] dev-ruby/tilt[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/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=Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats
 EAPI=6
 HOMEPAGE=https://github.com/asciidoctor/asciidoctor
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=MIT
-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=https://github.com/asciidoctor/asciidoctor/archive/v1.5.6.1.tar.gz -> asciidoctor-1.5.6.1.tar.gz
 _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_=c71d1ee4dd2cb5000ad7611235732325
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.4 b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.4
index 2f0257ceeebb..91f5ee958abf 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.4
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/asciidoctor-1.5.0[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/asciidoctor-1.5.0[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=A set of Asciidoctor extensions that enable you to add diagrams
 EAPI=5
 HOMEPAGE=https://github.com/asciidoctor/asciidoctor-diagram
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/asciidoctor-1.5.0[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/asciidoctor-1.5.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/asciidoctor-1.5.0[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=https://github.com/asciidoctor/asciidoctor-diagram/archive/v1.5.4.tar.gz -> asciidoctor-diagram-1.5.4.tar.gz
 _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_=b47e88af90a2d09645314a9d7344832c
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.5 b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.5
index e77586434e4b..35c79b61a126 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.5
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/asciidoctor-1.5*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/asciidoctor-1.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/asciidoctor-1.5*[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=test? ( ruby_targets_ruby22? ( =dev-ruby/asciidoctor-1.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/asciidoctor-1.5*[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=A set of Asciidoctor extensions that enable you to add diagrams
 EAPI=6
 HOMEPAGE=https://github.com/asciidoctor/asciidoctor-diagram
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/asciidoctor-1.5*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/asciidoctor-1.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/asciidoctor-1.5*[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/asciidoctor-1.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/asciidoctor-1.5*[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=https://github.com/asciidoctor/asciidoctor-diagram/archive/v1.5.5.tar.gz -> asciidoctor-diagram-1.5.5.tar.gz
 _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_=ff55432cf8b5be47f196cfa5347a9bd6
diff --git a/metadata/md5-cache/dev-ruby/asciimath-1.0.4 b/metadata/md5-cache/dev-ruby/asciimath-1.0.4
index 8df73a16bc63..b167ee58c855 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-1.0.4
+++ b/metadata/md5-cache/dev-ruby/asciimath-1.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A pure Ruby AsciiMath parsing and conversion library
 EAPI=5
 HOMEPAGE=https://github.com/pepijnve/asciimath
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 arm ~arm64 ppc ppc64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/asciimath-1.0.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_=a337ec6be1abcd6ce4464f34051430b8
diff --git a/metadata/md5-cache/dev-ruby/ast-2.2.0 b/metadata/md5-cache/dev-ruby/ast-2.2.0
index fb614a976b5a..29e5695e760a 100644
--- a/metadata/md5-cache/dev-ruby/ast-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ast-2.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=A library for working with abstract syntax trees
 EAPI=5
 HOMEPAGE=https://github.com/whitequark/ast
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/ast-2.2.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_=3d148482a5387dd049cdd7cef33ff984
diff --git a/metadata/md5-cache/dev-ruby/ast-2.3.0 b/metadata/md5-cache/dev-ruby/ast-2.3.0
index 973f113505fb..53422e3286c0 100644
--- a/metadata/md5-cache/dev-ruby/ast-2.3.0
+++ b/metadata/md5-cache/dev-ruby/ast-2.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A library for working with abstract syntax trees
 EAPI=5
 HOMEPAGE=https://github.com/whitequark/ast
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ast-2.3.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_=e6ee201b02a2cf6e45f10963802f3351
diff --git a/metadata/md5-cache/dev-ruby/astrolabe-1.3.1 b/metadata/md5-cache/dev-ruby/astrolabe-1.3.1
index 25a519711ad3..f52925fdb0ec 100644
--- a/metadata/md5-cache/dev-ruby/astrolabe-1.3.1
+++ b/metadata/md5-cache/dev-ruby/astrolabe-1.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An object-oriented AST extension for Parser
 EAPI=5
 HOMEPAGE=https://github.com/yujinakayama/astrolabe
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/astrolabe-1.3.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_=cab2d8a44a64fb603bc7e42478fe33f9
diff --git a/metadata/md5-cache/dev-ruby/async_sinatra-1.2.1 b/metadata/md5-cache/dev-ruby/async_sinatra-1.2.1
index 0799480eeb68..94e610a254af 100644
--- a/metadata/md5-cache/dev-ruby/async_sinatra-1.2.1
+++ b/metadata/md5-cache/dev-ruby/async_sinatra-1.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby21] >=dev-ruby/minitest-5.6:5[ruby_targets_ruby21] >=dev-ruby/eventmachine-0.12.11[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby22] >=dev-ruby/minitest-5.6:5[ruby_targets_ruby22] >=dev-ruby/eventmachine-0.12.11[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby23] >=dev-ruby/minitest-5.6:5[ruby_targets_ruby23] >=dev-ruby/eventmachine-0.12.11[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby21] >=dev-ruby/rack-1.4.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby22] >=dev-ruby/rack-1.4.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby23] >=dev-ruby/rack-1.4.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? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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/hoe-3.13[ruby_targets_ruby22] >=dev-ruby/minitest-5.6:5[ruby_targets_ruby22] >=dev-ruby/eventmachine-0.12.11[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby23] >=dev-ruby/minitest-5.6:5[ruby_targets_ruby23] >=dev-ruby/eventmachine-0.12.11[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby22] >=dev-ruby/rack-1.4.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby23] >=dev-ruby/rack-1.4.1:*[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Asynchronous response API for Sinatra and Thin
 EAPI=5
 HOMEPAGE=https://github.com/raggi/async_sinatra
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby21] >=dev-ruby/rack-1.4.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby22] >=dev-ruby/rack-1.4.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby23] >=dev-ruby/rack-1.4.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/sinatra-1.3.2[ruby_targets_ruby22] >=dev-ruby/rack-1.4.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby23] >=dev-ruby/rack-1.4.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=https://github.com/raggi/async_sinatra/archive/v1.2.1.tar.gz -> async_sinatra-1.2.1-git.tgz
 _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_=861c99218aef7995bd820af913e24814
diff --git a/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0 b/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0
index 5e5cd8b15af4..870310815a90 100644
--- a/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0
+++ b/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby21] >=dev-ruby/minitest-5.6:5[ruby_targets_ruby21] >=dev-ruby/eventmachine-0.12.11[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby22] >=dev-ruby/minitest-5.6:5[ruby_targets_ruby22] >=dev-ruby/eventmachine-0.12.11[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby23] >=dev-ruby/minitest-5.6:5[ruby_targets_ruby23] >=dev-ruby/eventmachine-0.12.11[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby21] >=dev-ruby/rack-1.4.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby22] >=dev-ruby/rack-1.4.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby23] >=dev-ruby/rack-1.4.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? ( 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/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/hoe-3.13[ruby_targets_ruby22] >=dev-ruby/minitest-5.6:5[ruby_targets_ruby22] >=dev-ruby/eventmachine-0.12.11[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby23] >=dev-ruby/minitest-5.6:5[ruby_targets_ruby23] >=dev-ruby/eventmachine-0.12.11[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby22] >=dev-ruby/rack-1.4.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby23] >=dev-ruby/rack-1.4.1:*[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/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=Asynchronous response API for Sinatra and Thin
 EAPI=6
 HOMEPAGE=https://github.com/raggi/async_sinatra
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby21] >=dev-ruby/rack-1.4.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby22] >=dev-ruby/rack-1.4.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby23] >=dev-ruby/rack-1.4.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/sinatra-1.3.2[ruby_targets_ruby22] >=dev-ruby/rack-1.4.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby23] >=dev-ruby/rack-1.4.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=https://github.com/raggi/async_sinatra/archive/v1.3.0.tar.gz -> async_sinatra-1.3.0-git.tgz
 _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_=8b8864dde1bd622ab559165cdc889525
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.99 b/metadata/md5-cache/dev-ruby/atomic-1.1.99
index 4ebf17b91ac5..99dc20178b87 100644
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.99
+++ b/metadata/md5-cache/dev-ruby/atomic-1.1.99
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An atomic reference implementation for JRuby, Rubinius, and MRI
 EAPI=5
 HOMEPAGE=https://github.com/headius/ruby-atomic
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/atomic-1.1.99.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_=1115bde45269105d54c5917cd4a6acb8
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-6.7.7.2 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-6.7.7.2
index 45a75dced86c..3c51b568085e 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-6.7.7.2
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-6.7.7.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/execjs:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-ruby/rails[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] dev-ruby/rspec-rails[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rails[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rspec-rails[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[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=test? ( ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-ruby/rails[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rspec-rails[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[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=Add vendor prefixes to CSS rules using values from the Can I Use website
 EAPI=6
 HOMEPAGE=https://github.com/ai/autoprefixer-rails
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/execjs:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[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/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[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=6
 SRC_URI=mirror://rubygems/autoprefixer-rails-6.7.7.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_=8c482803ac6de98b3dedd75607a2b73c
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.1.3 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.1.3
index 959f370eea76..032ded90c045 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.1.3
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.1.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/execjs:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rails[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] dev-ruby/rspec-rails[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rspec-rails[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[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=test? ( ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rspec-rails[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[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=Add vendor prefixes to CSS rules using values from the Can I Use website
 EAPI=6
 HOMEPAGE=https://github.com/ai/autoprefixer-rails
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/execjs:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[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/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[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=7
 SRC_URI=mirror://rubygems/autoprefixer-rails-7.1.1.3.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_=1aa43bb38a5ef821f0baf7e835195376
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.1 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.1
index f2e9a94f9d29..42f61eeab8e0 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.1
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/execjs:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rails[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] dev-ruby/rspec-rails[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rspec-rails[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[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=test? ( ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rspec-rails[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[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=Add vendor prefixes to CSS rules using values from the Can I Use website
 EAPI=6
 HOMEPAGE=https://github.com/ai/autoprefixer-rails
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/execjs:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[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/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[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=7
 SRC_URI=mirror://rubygems/autoprefixer-rails-7.1.2.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_=1aa43bb38a5ef821f0baf7e835195376
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.2 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.2
index 4feb509845ec..f376e3c680ba 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.2
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/execjs:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rails[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] dev-ruby/rspec-rails[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rspec-rails[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[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=test? ( ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rspec-rails[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[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=Add vendor prefixes to CSS rules using values from the Can I Use website
 EAPI=6
 HOMEPAGE=https://github.com/ai/autoprefixer-rails
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/execjs:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[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/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[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=7
 SRC_URI=mirror://rubygems/autoprefixer-rails-7.1.2.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_=1aa43bb38a5ef821f0baf7e835195376
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.3 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.3
index fa8e516088aa..a289e850bcc1 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.3
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/execjs:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rails[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] dev-ruby/rspec-rails[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rspec-rails[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[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=test? ( ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rspec-rails[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[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=Add vendor prefixes to CSS rules using values from the Can I Use website
 EAPI=6
 HOMEPAGE=https://github.com/ai/autoprefixer-rails
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/execjs:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[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/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[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=7
 SRC_URI=mirror://rubygems/autoprefixer-rails-7.1.2.3.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_=1aa43bb38a5ef821f0baf7e835195376
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.4 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.4
index 6ddfaf27c8fb..d1e188b65576 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.4
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/execjs:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rails[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] dev-ruby/rspec-rails[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rspec-rails[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[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=test? ( ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rspec-rails[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[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=Add vendor prefixes to CSS rules using values from the Can I Use website
 EAPI=6
 HOMEPAGE=https://github.com/ai/autoprefixer-rails
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/execjs:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[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/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[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=7
 SRC_URI=mirror://rubygems/autoprefixer-rails-7.1.2.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_=1aa43bb38a5ef821f0baf7e835195376
diff --git a/metadata/md5-cache/dev-ruby/awesome_print-1.7.0 b/metadata/md5-cache/dev-ruby/awesome_print-1.7.0
index 95be11eeb3c3..695aa4d2fdaa 100644
--- a/metadata/md5-cache/dev-ruby/awesome_print-1.7.0
+++ b/metadata/md5-cache/dev-ruby/awesome_print-1.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri[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: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/nokogiri[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri[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: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=Library to pretty print Ruby objects in full color with proper indentation
 EAPI=5
 HOMEPAGE=https://github.com/awesome-print/awesome_print
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~alpha ~amd64 ~hppa ~ppc64 ~x86 ~x86-fbsd
 LICENSE=MIT
-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=https://github.com/awesome-print/awesome_print/archive/v1.7.0.tar.gz -> awesome_print-1.7.0.tar.gz
 _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_=52356483e0a5499b72620f9bcdbee524
diff --git a/metadata/md5-cache/dev-ruby/awesome_print-1.8.0 b/metadata/md5-cache/dev-ruby/awesome_print-1.8.0
index 71d93b79dfae..646de00abb3c 100644
--- a/metadata/md5-cache/dev-ruby/awesome_print-1.8.0
+++ b/metadata/md5-cache/dev-ruby/awesome_print-1.8.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri[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: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/nokogiri[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri[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: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=Library to pretty print Ruby objects in full color with proper indentation
 EAPI=6
 HOMEPAGE=https://github.com/awesome-print/awesome_print
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~alpha ~amd64 ~hppa ~ppc64 ~x86 ~x86-fbsd
 LICENSE=MIT
-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=https://github.com/awesome-print/awesome_print/archive/v1.8.0.tar.gz -> awesome_print-1.8.0.tar.gz
 _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_=aa83fc98aca5729eda635d790442bc7b
diff --git a/metadata/md5-cache/dev-ruby/aws-s3-0.6.3 b/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
index 98487d26d116..87b3d054b848 100644
--- a/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
+++ b/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/xml-simple[ruby_targets_ruby21] dev-ruby/builder[ruby_targets_ruby21] dev-ruby/mime-types[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/xml-simple[ruby_targets_ruby22] dev-ruby/builder[ruby_targets_ruby22] dev-ruby/mime-types[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/xml-simple[ruby_targets_ruby23] dev-ruby/builder[ruby_targets_ruby23] dev-ruby/mime-types[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/flexmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/flexmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/flexmock[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/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=test? ( ruby_targets_ruby22? ( dev-ruby/xml-simple[ruby_targets_ruby22] dev-ruby/builder[ruby_targets_ruby22] dev-ruby/mime-types[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/xml-simple[ruby_targets_ruby23] dev-ruby/builder[ruby_targets_ruby23] dev-ruby/mime-types[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/flexmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/flexmock[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/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=Client library for Amazon's Simple Storage Service's REST API
 EAPI=5
 HOMEPAGE=http://amazon.rubyforge.org/
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/xml-simple[ruby_targets_ruby21] dev-ruby/builder[ruby_targets_ruby21] dev-ruby/mime-types[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/xml-simple[ruby_targets_ruby22] dev-ruby/builder[ruby_targets_ruby22] dev-ruby/mime-types[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/xml-simple[ruby_targets_ruby23] dev-ruby/builder[ruby_targets_ruby23] dev-ruby/mime-types[ruby_targets_ruby23] virtual/ruby-ssl[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/xml-simple[ruby_targets_ruby22] dev-ruby/builder[ruby_targets_ruby22] dev-ruby/mime-types[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/xml-simple[ruby_targets_ruby23] dev-ruby/builder[ruby_targets_ruby23] dev-ruby/mime-types[ruby_targets_ruby23] virtual/ruby-ssl[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/aws-s3-0.6.3.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_=463ca57d377c90b9d768a4c51bba0876
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-1.66.0 b/metadata/md5-cache/dev-ruby/aws-sdk-1.66.0
index 8961669fb483..23a7ed35c17d 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-1.66.0
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-1.66.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/json-1.4:*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] >=dev-ruby/json-1.4:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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_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? ( ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] >=dev-ruby/json-1.4:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Official SDK for Amazon Web Services
 EAPI=5
 HOMEPAGE=http://aws.amazon.com/sdkforruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/json-1.4:*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] >=dev-ruby/json-1.4:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.4[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? ( virtual/ruby-ssl[ruby_targets_ruby22] >=dev-ruby/json-1.4:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.4[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=https://github.com/aws/aws-sdk-ruby/archive/v1.66.0.tar.gz -> aws-sdk-ruby-1.66.0.tar.gz
 _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_=62636934c6724f77248d0b242690949a
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-2.5.11 b/metadata/md5-cache/dev-ruby/aws-sdk-2.5.11
index db0ddc8fece9..02cc5bb65e49 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-2.5.11
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-2.5.11
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ~dev-ruby/aws-sdk-resources-2.5.11[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ~dev-ruby/aws-sdk-resources-2.5.11[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[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? ( ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ~dev-ruby/aws-sdk-resources-2.5.11[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Official SDK for Amazon Web Services
 EAPI=5
 HOMEPAGE=http://aws.amazon.com/sdkforruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ~dev-ruby/aws-sdk-resources-2.5.11[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ~dev-ruby/aws-sdk-resources-2.5.11[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? ( virtual/ruby-ssl[ruby_targets_ruby22] ~dev-ruby/aws-sdk-resources-2.5.11[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=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.5.11.tar.gz -> aws-sdk-ruby-2.5.11.tar.gz
 _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_=5286139a3ac72b75852103a2fccc3fb9
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-2.6.50 b/metadata/md5-cache/dev-ruby/aws-sdk-2.6.50
index e33fd7a50f55..90a1e90c7b13 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-2.6.50
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-2.6.50
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ~dev-ruby/aws-sdk-resources-2.6.50[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ~dev-ruby/aws-sdk-resources-2.6.50[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ~dev-ruby/aws-sdk-resources-2.6.50[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? ( 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? ( virtual/ruby-ssl[ruby_targets_ruby22] ~dev-ruby/aws-sdk-resources-2.6.50[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ~dev-ruby/aws-sdk-resources-2.6.50[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? ( 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=Official SDK for Amazon Web Services
 EAPI=5
 HOMEPAGE=http://aws.amazon.com/sdkforruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ~dev-ruby/aws-sdk-resources-2.6.50[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ~dev-ruby/aws-sdk-resources-2.6.50[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ~dev-ruby/aws-sdk-resources-2.6.50[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? ( virtual/ruby-ssl[ruby_targets_ruby22] ~dev-ruby/aws-sdk-resources-2.6.50[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ~dev-ruby/aws-sdk-resources-2.6.50[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=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.6.50.tar.gz -> aws-sdk-ruby-2.6.50.tar.gz
 _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_=b53eb38f6468f707576da178104ea8d6
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-2.8.14 b/metadata/md5-cache/dev-ruby/aws-sdk-2.8.14
index cd77525b781e..3cdd2d3f7a53 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-2.8.14
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-2.8.14
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ~dev-ruby/aws-sdk-resources-2.8.14[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ~dev-ruby/aws-sdk-resources-2.8.14[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ~dev-ruby/aws-sdk-resources-2.8.14[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? ( 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? ( virtual/ruby-ssl[ruby_targets_ruby22] ~dev-ruby/aws-sdk-resources-2.8.14[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ~dev-ruby/aws-sdk-resources-2.8.14[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? ( 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=Official SDK for Amazon Web Services
 EAPI=5
 HOMEPAGE=https://aws.amazon.com/sdkforruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ~dev-ruby/aws-sdk-resources-2.8.14[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ~dev-ruby/aws-sdk-resources-2.8.14[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ~dev-ruby/aws-sdk-resources-2.8.14[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? ( virtual/ruby-ssl[ruby_targets_ruby22] ~dev-ruby/aws-sdk-resources-2.8.14[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ~dev-ruby/aws-sdk-resources-2.8.14[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=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.8.14.tar.gz -> aws-sdk-ruby-2.8.14.tar.gz
 _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_=a90c4ac7c9da2e10b831fec3b63692dc
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-2.9.44 b/metadata/md5-cache/dev-ruby/aws-sdk-2.9.44
index 2ef6e4b33285..e6de17f56b4f 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-2.9.44
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-2.9.44
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ~dev-ruby/aws-sdk-resources-2.9.44[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ~dev-ruby/aws-sdk-resources-2.9.44[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ~dev-ruby/aws-sdk-resources-2.9.44[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? ( 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? ( virtual/ruby-ssl[ruby_targets_ruby22] ~dev-ruby/aws-sdk-resources-2.9.44[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ~dev-ruby/aws-sdk-resources-2.9.44[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? ( 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=Official SDK for Amazon Web Services
 EAPI=6
 HOMEPAGE=https://aws.amazon.com/sdkforruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ~dev-ruby/aws-sdk-resources-2.9.44[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ~dev-ruby/aws-sdk-resources-2.9.44[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ~dev-ruby/aws-sdk-resources-2.9.44[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? ( virtual/ruby-ssl[ruby_targets_ruby22] ~dev-ruby/aws-sdk-resources-2.9.44[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ~dev-ruby/aws-sdk-resources-2.9.44[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=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.9.44.tar.gz -> aws-sdk-ruby-2.9.44.tar.gz
 _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_=21542c86a8ac762e700df0e6293875ac
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.5.11 b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.5.11
index bba611c917b8..6a1c8b401fa3 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.5.11
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.5.11
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/jmespath:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/jmespath:1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/webmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( dev-ruby/jmespath:1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Official SDK for Amazon Web Services
 EAPI=5
 HOMEPAGE=http://aws.amazon.com/sdkforruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/jmespath:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/jmespath: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/jmespath: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=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.5.11.tar.gz -> aws-sdk-ruby-2.5.11.tar.gz
 _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_=b65f06d5554c811e6756afb1b5ce4f8c
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.6.50 b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.6.50
index cbe84149136c..8c13816fdce8 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.6.50
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.6.50
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/aws-sigv4[ruby_targets_ruby21] dev-ruby/jmespath:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/aws-sigv4[ruby_targets_ruby22] dev-ruby/jmespath:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/aws-sigv4[ruby_targets_ruby23] dev-ruby/jmespath:1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/webmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock[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=test? ( ruby_targets_ruby22? ( dev-ruby/aws-sigv4[ruby_targets_ruby22] dev-ruby/jmespath:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/aws-sigv4[ruby_targets_ruby23] dev-ruby/jmespath:1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock[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=Official SDK for Amazon Web Services
 EAPI=5
 HOMEPAGE=http://aws.amazon.com/sdkforruby
-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
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/aws-sigv4[ruby_targets_ruby21] dev-ruby/jmespath:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/aws-sigv4[ruby_targets_ruby22] dev-ruby/jmespath:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/aws-sigv4[ruby_targets_ruby23] dev-ruby/jmespath: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/aws-sigv4[ruby_targets_ruby22] dev-ruby/jmespath:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/aws-sigv4[ruby_targets_ruby23] dev-ruby/jmespath: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=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.6.50.tar.gz -> aws-sdk-ruby-2.6.50.tar.gz
 _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_=d4a63672f12a3c512e5ef65f2cf2ac73
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.8.14 b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.8.14
index 938acf88f192..3853ac8243fc 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.8.14
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.8.14
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/aws-sigv4[ruby_targets_ruby21] dev-ruby/jmespath:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/aws-sigv4[ruby_targets_ruby22] dev-ruby/jmespath:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/aws-sigv4[ruby_targets_ruby23] dev-ruby/jmespath:1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/webmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock[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=test? ( ruby_targets_ruby22? ( dev-ruby/aws-sigv4[ruby_targets_ruby22] dev-ruby/jmespath:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/aws-sigv4[ruby_targets_ruby23] dev-ruby/jmespath:1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock[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=Official SDK for Amazon Web Services
 EAPI=5
 HOMEPAGE=https://aws.amazon.com/sdkforruby
-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
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/aws-sigv4[ruby_targets_ruby21] dev-ruby/jmespath:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/aws-sigv4[ruby_targets_ruby22] dev-ruby/jmespath:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/aws-sigv4[ruby_targets_ruby23] dev-ruby/jmespath: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/aws-sigv4[ruby_targets_ruby22] dev-ruby/jmespath:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/aws-sigv4[ruby_targets_ruby23] dev-ruby/jmespath: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=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.8.14.tar.gz -> aws-sdk-ruby-2.8.14.tar.gz
 _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_=b5f3381e0932af9d1721e149ec39372e
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.9.44 b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.9.44
index 5b9e8b8aafc2..854eb5fe5972 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.9.44
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.9.44
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/aws-sigv4[ruby_targets_ruby21] dev-ruby/jmespath:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/aws-sigv4[ruby_targets_ruby22] dev-ruby/jmespath:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/aws-sigv4[ruby_targets_ruby23] dev-ruby/jmespath:1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/webmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock[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=test? ( ruby_targets_ruby22? ( dev-ruby/aws-sigv4[ruby_targets_ruby22] dev-ruby/jmespath:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/aws-sigv4[ruby_targets_ruby23] dev-ruby/jmespath:1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock[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=Official SDK for Amazon Web Services
 EAPI=6
 HOMEPAGE=https://aws.amazon.com/sdkforruby
-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
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/aws-sigv4[ruby_targets_ruby21] dev-ruby/jmespath:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/aws-sigv4[ruby_targets_ruby22] dev-ruby/jmespath:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/aws-sigv4[ruby_targets_ruby23] dev-ruby/jmespath: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/aws-sigv4[ruby_targets_ruby22] dev-ruby/jmespath:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/aws-sigv4[ruby_targets_ruby23] dev-ruby/jmespath: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=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.9.44.tar.gz -> aws-sdk-ruby-2.9.44.tar.gz
 _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_=724752d99c887571e21906ef16c39a2b
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.5.11 b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.5.11
index cac7be574bfc..69082413b604 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.5.11
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.5.11
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/aws-sdk-core-2.5.11[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/aws-sdk-core-2.5.11[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( ~dev-ruby/aws-sdk-core-2.5.11[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Official SDK for Amazon Web Services
 EAPI=5
 HOMEPAGE=http://aws.amazon.com/sdkforruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/aws-sdk-core-2.5.11[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/aws-sdk-core-2.5.11[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/aws-sdk-core-2.5.11[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=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.5.11.tar.gz -> aws-sdk-ruby-2.5.11.tar.gz
 _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_=5b31ad1dcdda5388462849771657e810
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.6.50 b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.6.50
index 0b5c280a4a25..735367a8c6eb 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.6.50
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.6.50
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/aws-sdk-core-2.6.50[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/aws-sdk-core-2.6.50[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/aws-sdk-core-2.6.50[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-ruby/webmock[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/webmock[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/webmock[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=test? ( ruby_targets_ruby22? ( ~dev-ruby/aws-sdk-core-2.6.50[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/aws-sdk-core-2.6.50[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-ruby/webmock[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/webmock[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=Official SDK for Amazon Web Services
 EAPI=5
 HOMEPAGE=http://aws.amazon.com/sdkforruby
-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
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/aws-sdk-core-2.6.50[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/aws-sdk-core-2.6.50[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/aws-sdk-core-2.6.50[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/aws-sdk-core-2.6.50[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/aws-sdk-core-2.6.50[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=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.6.50.tar.gz -> aws-sdk-ruby-2.6.50.tar.gz
 _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_=31455d24bafe75cc1097fc7cbecbfaa6
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.8.14 b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.8.14
index 6e711b1825ac..7c53fd9e3a20 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.8.14
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.8.14
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/aws-sdk-core-2.8.14[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/aws-sdk-core-2.8.14[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/aws-sdk-core-2.8.14[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-ruby/webmock[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/webmock[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/webmock[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=test? ( ruby_targets_ruby22? ( ~dev-ruby/aws-sdk-core-2.8.14[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/aws-sdk-core-2.8.14[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-ruby/webmock[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/webmock[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=Official SDK for Amazon Web Services
 EAPI=5
 HOMEPAGE=https://aws.amazon.com/sdkforruby
-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
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/aws-sdk-core-2.8.14[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/aws-sdk-core-2.8.14[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/aws-sdk-core-2.8.14[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/aws-sdk-core-2.8.14[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/aws-sdk-core-2.8.14[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=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.8.14.tar.gz -> aws-sdk-ruby-2.8.14.tar.gz
 _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_=bcc2c5da95e5ad756160dacdd4d6cb51
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.9.44 b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.9.44
index 5bf8567608fa..09defd6e22b5 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.9.44
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.9.44
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/aws-sdk-core-2.9.44[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/aws-sdk-core-2.9.44[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/aws-sdk-core-2.9.44[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-ruby/webmock[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/webmock[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/webmock[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=test? ( ruby_targets_ruby22? ( ~dev-ruby/aws-sdk-core-2.9.44[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/aws-sdk-core-2.9.44[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-ruby/webmock[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/webmock[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=Official SDK for Amazon Web Services
 EAPI=6
 HOMEPAGE=https://aws.amazon.com/sdkforruby
-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
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/aws-sdk-core-2.9.44[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/aws-sdk-core-2.9.44[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/aws-sdk-core-2.9.44[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/aws-sdk-core-2.9.44[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/aws-sdk-core-2.9.44[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=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.9.44.tar.gz -> aws-sdk-ruby-2.9.44.tar.gz
 _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_=662b46c5844ccd3e87e96e31af8fbf66
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.0.0 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.0.0
index 9099530a7bcc..aa5d055a3fd5 100644
--- a/metadata/md5-cache/dev-ruby/aws-sigv4-1.0.0
+++ b/metadata/md5-cache/dev-ruby/aws-sigv4-1.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Amazon Web Services Signature Version 4 signing library
 EAPI=5
 HOMEPAGE=http://aws.amazon.com/sdkforruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/aws-sigv4-1.0.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_=915ee4518cb15386a06fa6e28cab66da
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.0.1 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.0.1
index 3e51699225e6..bf4880d1d724 100644
--- a/metadata/md5-cache/dev-ruby/aws-sigv4-1.0.1
+++ b/metadata/md5-cache/dev-ruby/aws-sigv4-1.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Amazon Web Services Signature Version 4 signing library
 EAPI=5
 HOMEPAGE=http://aws.amazon.com/sdkforruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/aws-sigv4-1.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_=915ee4518cb15386a06fa6e28cab66da
diff --git a/metadata/md5-cache/dev-ruby/axiom-types-0.1.1 b/metadata/md5-cache/dev-ruby/axiom-types-0.1.1
index 824e20931be4..2d1489e2b6cf 100644
--- a/metadata/md5-cache/dev-ruby/axiom-types-0.1.1
+++ b/metadata/md5-cache/dev-ruby/axiom-types-0.1.1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby21] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby21] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby21] <dev-ruby/ice_nine-0.12[ruby_targets_ruby21] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby21] <dev-ruby/thread_safe-1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby22] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby22] <dev-ruby/ice_nine-0.12[ruby_targets_ruby22] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby22] <dev-ruby/thread_safe-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby23] <dev-ruby/ice_nine-0.12[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby23] <dev-ruby/thread_safe-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? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby22] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby22] <dev-ruby/ice_nine-0.12[ruby_targets_ruby22] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby22] <dev-ruby/thread_safe-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby23] <dev-ruby/ice_nine-0.12[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby23] <dev-ruby/thread_safe-1[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=Define types with optional constraints for use within axiom and other libraries
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/axiom-types https://github.com/dkubb/axiom-types
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby21] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby21] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby21] <dev-ruby/ice_nine-0.12[ruby_targets_ruby21] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby21] <dev-ruby/thread_safe-1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby22] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby22] <dev-ruby/ice_nine-0.12[ruby_targets_ruby22] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby22] <dev-ruby/thread_safe-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby23] <dev-ruby/ice_nine-0.12[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby23] <dev-ruby/thread_safe-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/descendants_tracker-0.0.4[ruby_targets_ruby22] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby22] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby22] <dev-ruby/ice_nine-0.12[ruby_targets_ruby22] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby22] <dev-ruby/thread_safe-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] >=dev-ruby/ice_nine-0.11.0[ruby_targets_ruby23] <dev-ruby/ice_nine-0.12[ruby_targets_ruby23] >=dev-ruby/thread_safe-0.3.1[ruby_targets_ruby23] <dev-ruby/thread_safe-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/axiom-types-0.1.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_=6f23ed46233ce8b4090fd74f2bf8e7de
diff --git a/metadata/md5-cache/dev-ruby/backports-3.8.0 b/metadata/md5-cache/dev-ruby/backports-3.8.0
index 8a228a0b7f66..95c998c6b59e 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.8.0
+++ b/metadata/md5-cache/dev-ruby/backports-3.8.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rails[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[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/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/rails[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[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/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=Backports of Ruby features for older Ruby
 EAPI=6
 HOMEPAGE=https://github.com/marcandre/backports
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/backports-3.8.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_=f33817349120241bcec33c319131a76f
diff --git a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2 b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
index 976452b68fbb..66aa8fa314fd 100644
--- a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Small RSpec clone weighing less than 350 LoC
 EAPI=5
 HOMEPAGE=http://chneukirchen.org/repos/bacon
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/bacon-1.2.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_=8c1af60050efe613434293d80305e6fc
diff --git a/metadata/md5-cache/dev-ruby/barby-0.6.3-r1 b/metadata/md5-cache/dev-ruby/barby-0.6.3-r1
index 677d985ca5ae..7139dfec1365 100644
--- a/metadata/md5-cache/dev-ruby/barby-0.6.3-r1
+++ b/metadata/md5-cache/dev-ruby/barby-0.6.3-r1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby21] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby22] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby22] ) ) ) test? ( ruby_targets_ruby21? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby21] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby21] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby22] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby22] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby22] ) ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) test? ( media-gfx/imagemagick[png] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby22] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby22] ) ) ) test? ( ruby_targets_ruby22? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby22] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby22] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby22] ) ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) test? ( media-gfx/imagemagick[png] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=Ruby barcode generator that doesn't rely on 3rd party libraries
 EAPI=5
 HOMEPAGE=http://toretore.eu/barby/
-IUSE=test qrcode rmagick prawn png cairo test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test qrcode rmagick prawn png cairo test test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby21] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby22] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby21] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby21] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby22] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby22] ) prawn? ( dev-ruby/prawn:*[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? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby22] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby22] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby22] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=prawn? ( test )
 SLOT=0
 SRC_URI=https://github.com/toretore/barby/archive/v0.6.3.tar.gz -> barby-0.6.3.tar.gz
 _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_=fc4336bc0bd831a3bbc2442a3a35dcfe
diff --git a/metadata/md5-cache/dev-ruby/barby-0.6.4 b/metadata/md5-cache/dev-ruby/barby-0.6.4
index 638c1168951f..620489acd5b7 100644
--- a/metadata/md5-cache/dev-ruby/barby-0.6.4
+++ b/metadata/md5-cache/dev-ruby/barby-0.6.4
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby21] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby22] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby22] ) ) ) test? ( ruby_targets_ruby21? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby21] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby21] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby22] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby22] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby22] ) ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) test? ( media-gfx/imagemagick[png] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby22] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby22] ) ) ) test? ( ruby_targets_ruby22? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby22] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby22] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby22] ) ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) test? ( media-gfx/imagemagick[png] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=Ruby barcode generator that doesn't rely on 3rd party libraries
 EAPI=5
 HOMEPAGE=http://toretore.eu/barby/
-IUSE=test qrcode rmagick prawn png cairo test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test qrcode rmagick prawn png cairo test test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby21] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby22] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby21] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby21] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby22] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby22] ) prawn? ( dev-ruby/prawn:*[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? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby22] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby22] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby22] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=prawn? ( test )
 SLOT=0
 SRC_URI=https://github.com/toretore/barby/archive/v0.6.4.tar.gz -> barby-0.6.4.tar.gz
 _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_=fc4336bc0bd831a3bbc2442a3a35dcfe
diff --git a/metadata/md5-cache/dev-ruby/barby-0.6.5 b/metadata/md5-cache/dev-ruby/barby-0.6.5
index feaa3b1539c7..af3b3c830d60 100644
--- a/metadata/md5-cache/dev-ruby/barby-0.6.5
+++ b/metadata/md5-cache/dev-ruby/barby-0.6.5
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby21] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby22] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby22] ) ) ) test? ( ruby_targets_ruby21? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby21] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby21] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby22] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby22] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby22] ) ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) test? ( media-gfx/imagemagick[png] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby22] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby22] ) ) ) test? ( ruby_targets_ruby22? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby22] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby22] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby22] ) ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) test? ( media-gfx/imagemagick[png] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=Ruby barcode generator that doesn't rely on 3rd party libraries
 EAPI=5
 HOMEPAGE=http://toreto.re/barby/
-IUSE=test qrcode rmagick prawn png cairo test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test qrcode rmagick prawn png cairo test test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby21] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby22] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby21] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby21] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby22] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby22] ) prawn? ( dev-ruby/prawn:*[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? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby22] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby22] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby22] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=prawn? ( test )
 SLOT=0
 SRC_URI=https://github.com/toretore/barby/archive/v0.6.5.tar.gz -> barby-0.6.5.tar.gz
 _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_=ba50aaad1936ecb59a0dfc6be8980e62
diff --git a/metadata/md5-cache/dev-ruby/base32-0.3.2 b/metadata/md5-cache/dev-ruby/base32-0.3.2
index 28a7e17e85a7..c34b417c9713 100644
--- a/metadata/md5-cache/dev-ruby/base32-0.3.2
+++ b/metadata/md5-cache/dev-ruby/base32-0.3.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A library which provides base32 decoding and encoding
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/base32 https://github.com/stesla/base32
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/base32-0.3.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_=d76fe7397944a43aa5b5bd3a2537677e
diff --git a/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2 b/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2
index e41199b3c07d..827b65f6e71c 100644
--- a/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2
+++ b/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( app-text/ronn[ruby_targets_ruby21] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[ruby_targets_ruby23] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( app-text/ronn[ruby_targets_ruby24] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[ruby_targets_ruby23] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( app-text/ronn[ruby_targets_ruby24] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Pipe to browser utility for use at the shell and within editors
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/bcat
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=!!<app-accessibility/speech-tools-2.1-r3 ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=!!<app-accessibility/speech-tools-2.1-r3 ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/bcat-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_=c3c726f8b37985e7649b115a100569ae
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11
index 4b9b61ba07bb..d882a5b97116 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=An easy way to keep your users' passwords secure
 EAPI=5
 HOMEPAGE=https://github.com/codahale/bcrypt-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bcrypt-3.1.11.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_=1474c71d7f1adcbaf835e6d420892683
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11-r1 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11-r1
index d9378560354f..28b30f262f3a 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11-r1
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.11-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An easy way to keep your users' passwords secure
 EAPI=5
 HOMEPAGE=https://github.com/codahale/bcrypt-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/bcrypt-3.1.11.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_=1419d047ad51294ad725c5b903bc5763
diff --git a/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0 b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0
index 59d8096c8609..98f8a7f53d53 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0
+++ b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/bcrypt_pbkdf-1.0.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_=014c664f41ed4e5e881555868481ee9d
diff --git a/metadata/md5-cache/dev-ruby/best_in_place-3.1.0 b/metadata/md5-cache/dev-ruby/best_in_place-3.1.0
index 59a7dfa32e19..fb175f8aca01 100644
--- a/metadata/md5-cache/dev-ruby/best_in_place-3.1.0
+++ b/metadata/md5-cache/dev-ruby/best_in_place-3.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/actionpack-3.2:*[ruby_targets_ruby21] >=dev-ruby/railties-3.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-3.2:*[ruby_targets_ruby22] >=dev-ruby/railties-3.2:*[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rdiscount[ruby_targets_ruby21] dev-ruby/rspec-rails:3[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby21] >=dev-ruby/capybara-1.1.2:0[ruby_targets_ruby21] >=dev-ruby/rails-3.2[ruby_targets_ruby21] >=dev-ruby/sqlite3-1.3.4-r1[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/rspec-rails:3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/capybara-1.1.2:0[ruby_targets_ruby22] >=dev-ruby/rails-3.2[ruby_targets_ruby22] >=dev-ruby/sqlite3-1.3.4-r1[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionpack-3.2:*[ruby_targets_ruby22] >=dev-ruby/railties-3.2:*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/rspec-rails:3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/capybara-1.1.2:0[ruby_targets_ruby22] >=dev-ruby/rails-3.2[ruby_targets_ruby22] >=dev-ruby/sqlite3-1.3.4-r1[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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=In-place editor helper for Rails 3
 EAPI=5
 HOMEPAGE=https://github.com/bernat/best_in_place
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-3.2:*[ruby_targets_ruby21] >=dev-ruby/railties-3.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-3.2:*[ruby_targets_ruby22] >=dev-ruby/railties-3.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/actionpack-3.2:*[ruby_targets_ruby22] >=dev-ruby/railties-3.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=3
 SRC_URI=mirror://rubygems/best_in_place-3.1.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	virtualx	171580f737f5aaf18fcb456548588066
+_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	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=425d9542e29d128c9df05d06ffb29123
diff --git a/metadata/md5-cache/dev-ruby/best_in_place-3.1.1 b/metadata/md5-cache/dev-ruby/best_in_place-3.1.1
index 21fccf5e97af..50cb533bb85c 100644
--- a/metadata/md5-cache/dev-ruby/best_in_place-3.1.1
+++ b/metadata/md5-cache/dev-ruby/best_in_place-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/actionpack-3.2:*[ruby_targets_ruby21] >=dev-ruby/railties-3.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-3.2:*[ruby_targets_ruby22] >=dev-ruby/railties-3.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-3.2:*[ruby_targets_ruby23] >=dev-ruby/railties-3.2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rdiscount[ruby_targets_ruby21] dev-ruby/rspec-rails:3[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby21] >=dev-ruby/capybara-1.1.2[ruby_targets_ruby21] >=dev-ruby/rails-3.2[ruby_targets_ruby21] >=dev-ruby/sqlite3-1.3.4-r1[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/rspec-rails:3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/capybara-1.1.2[ruby_targets_ruby22] >=dev-ruby/rails-3.2[ruby_targets_ruby22] >=dev-ruby/sqlite3-1.3.4-r1[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/rspec-rails:3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2[ruby_targets_ruby23] >=dev-ruby/rails-3.2[ruby_targets_ruby23] >=dev-ruby/sqlite3-1.3.4-r1[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionpack-3.2:*[ruby_targets_ruby22] >=dev-ruby/railties-3.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-3.2:*[ruby_targets_ruby23] >=dev-ruby/railties-3.2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/rspec-rails:3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/capybara-1.1.2[ruby_targets_ruby22] >=dev-ruby/rails-3.2[ruby_targets_ruby22] >=dev-ruby/sqlite3-1.3.4-r1[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/rspec-rails:3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2[ruby_targets_ruby23] >=dev-ruby/rails-3.2[ruby_targets_ruby23] >=dev-ruby/sqlite3-1.3.4-r1[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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=In-place editor helper for Rails 3
 EAPI=6
 HOMEPAGE=https://github.com/bernat/best_in_place
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-3.2:*[ruby_targets_ruby21] >=dev-ruby/railties-3.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-3.2:*[ruby_targets_ruby22] >=dev-ruby/railties-3.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-3.2:*[ruby_targets_ruby23] >=dev-ruby/railties-3.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/actionpack-3.2:*[ruby_targets_ruby22] >=dev-ruby/railties-3.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-3.2:*[ruby_targets_ruby23] >=dev-ruby/railties-3.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=3
 SRC_URI=mirror://rubygems/best_in_place-3.1.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	virtualx	171580f737f5aaf18fcb456548588066
+_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	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=77536874a5344849d819a51e5b0d3627
diff --git a/metadata/md5-cache/dev-ruby/bindata-2.4.0 b/metadata/md5-cache/dev-ruby/bindata-2.4.0
index 21d3d4a6bcf0..2944672f0c6c 100644
--- a/metadata/md5-cache/dev-ruby/bindata-2.4.0
+++ b/metadata/md5-cache/dev-ruby/bindata-2.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Parsing Binary Data in Ruby
 EAPI=6
 HOMEPAGE=https://github.com/dmendel/bindata
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD-2
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2.4.0
 SRC_URI=mirror://rubygems/bindata-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_=22e3e442314d429feb77d0c7d21f9bc7
diff --git a/metadata/md5-cache/dev-ruby/bindex-0.5.0 b/metadata/md5-cache/dev-ruby/bindex-0.5.0
index 31a1f604d60c..264d824d3803 100644
--- a/metadata/md5-cache/dev-ruby/bindex-0.5.0
+++ b/metadata/md5-cache/dev-ruby/bindex-0.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Bindings for your Ruby exceptions
 EAPI=6
 HOMEPAGE=https://github.com/gsamokovarov/bindex
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/bindex-0.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_=5cc3e56435abf24b5a7f9abbc1fdc8a8
diff --git a/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2 b/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2
index 05dfd1fd95fd..e7b63b69433e 100644
--- a/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2
+++ b/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Retrieve the binding of a method's caller
 EAPI=5
 HOMEPAGE=https://github.com/banister/binding_of_caller
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/binding_of_caller-0.7.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_=2b0d5ba1e78fc6e7d144e3c81cccc08c
diff --git a/metadata/md5-cache/dev-ruby/bit-struct-0.15.0 b/metadata/md5-cache/dev-ruby/bit-struct-0.15.0
index bd07754db0cc..ab881bfa2af0 100644
--- a/metadata/md5-cache/dev-ruby/bit-struct-0.15.0
+++ b/metadata/md5-cache/dev-ruby/bit-struct-0.15.0
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Library for packed binary data stored in ruby Strings
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/sshkey
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Ruby-BSD
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/bit-struct-0.15.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_=655da76d961ee21c84769441b25ebad2
diff --git a/metadata/md5-cache/dev-ruby/bit-struct-0.16 b/metadata/md5-cache/dev-ruby/bit-struct-0.16
index ff6bde429661..924b947396a8 100644
--- a/metadata/md5-cache/dev-ruby/bit-struct-0.16
+++ b/metadata/md5-cache/dev-ruby/bit-struct-0.16
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Library for packed binary data stored in ruby Strings
 EAPI=6
 HOMEPAGE=https://github.com/vjoel/bit-struct
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Ruby-BSD
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/bit-struct-0.16.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_=5fae1dbb5e1d0b27ecd4fa3ab6bd9fb2
diff --git a/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4 b/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4
index 5adcb4b90917..3161d28ce8a9 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4
+++ b/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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: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=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: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=Base class with almost all of the methods from Object and Kernel being removed
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/blankslate
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha ~amd64 ~x86 ~ppc ~ppc64
 LICENSE=MIT
-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 )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://rubygems/blankslate-2.1.2.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_=828a25e09787f8d62e7a89e901d77c75
diff --git a/metadata/md5-cache/dev-ruby/blankslate-3.1.3 b/metadata/md5-cache/dev-ruby/blankslate-3.1.3
index 322d86e20ab9..e17c9ebb0998 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-3.1.3
+++ b/metadata/md5-cache/dev-ruby/blankslate-3.1.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Base class with almost all of the methods from Object and Kernel being removed
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/blankslate
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/blankslate-3.1.3.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_=6edde1eedfea8e35b83354fc22747e25
diff --git a/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r3 b/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r3
index e9c16f703b8f..8d4def6a06fa 100644
--- a/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r3
+++ b/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=doc? ( dev-lang/perl ) ruby_targets_ruby21? ( dev-ruby/hoe[ruby_targets_ruby21] test? ( dev-ruby/diff-lcs[ruby_targets_ruby21] dev-ruby/tidy-ext[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/hoe[ruby_targets_ruby22] test? ( dev-ruby/diff-lcs[ruby_targets_ruby22] dev-ruby/tidy-ext[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/hoe[ruby_targets_ruby23] test? ( dev-ruby/diff-lcs[ruby_targets_ruby23] dev-ruby/tidy-ext[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/hoe[ruby_targets_ruby24] test? ( dev-ruby/diff-lcs[ruby_targets_ruby24] dev-ruby/tidy-ext[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=doc? ( dev-lang/perl ) ruby_targets_ruby22? ( dev-ruby/hoe[ruby_targets_ruby22] test? ( dev-ruby/diff-lcs[ruby_targets_ruby22] dev-ruby/tidy-ext[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/hoe[ruby_targets_ruby23] test? ( dev-ruby/diff-lcs[ruby_targets_ruby23] dev-ruby/tidy-ext[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/hoe[ruby_targets_ruby24] test? ( dev-ruby/diff-lcs[ruby_targets_ruby24] dev-ruby/tidy-ext[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Ruby implementation of Markdown
 EAPI=5
 HOMEPAGE=http://www.deveiate.org/projects/BlueCloth
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/bluecloth-2.2.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_=dd4e882223ff3d7773098281b57bbaa1
diff --git a/metadata/md5-cache/dev-ruby/bogus-0.1.6 b/metadata/md5-cache/dev-ruby/bogus-0.1.6
index baa9d4a951d9..f81a2651efb9 100644
--- a/metadata/md5-cache/dev-ruby/bogus-0.1.6
+++ b/metadata/md5-cache/dev-ruby/bogus-0.1.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ensuring that the things you stub or mock actually exist
 EAPI=6
 HOMEPAGE=https://github.com/psyho/bogus
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/dependor-0.0.4[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/bogus-0.1.6.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_=fc33d4a71055f32a712735d4c2f95a5a
diff --git a/metadata/md5-cache/dev-ruby/bones-3.8.4-r1 b/metadata/md5-cache/dev-ruby/bones-3.8.4-r1
index 4f0da733fb47..416a41bbfcf3 100644
--- a/metadata/md5-cache/dev-ruby/bones-3.8.4-r1
+++ b/metadata/md5-cache/dev-ruby/bones-3.8.4-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/builder:*[ruby_targets_ruby21] >=dev-ruby/loquacious-1.9.1[ruby_targets_ruby21] >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby21] =dev-ruby/rake-12*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/builder:*[ruby_targets_ruby22] >=dev-ruby/loquacious-1.9.1[ruby_targets_ruby22] >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby22] =dev-ruby/rake-12*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/builder:*[ruby_targets_ruby23] >=dev-ruby/loquacious-1.9.1[ruby_targets_ruby23] >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby23] =dev-ruby/rake-12*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/builder:*[ruby_targets_ruby24] >=dev-ruby/loquacious-1.9.1[ruby_targets_ruby24] >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby24] =dev-ruby/rake-12*[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/builder:*[ruby_targets_ruby22] >=dev-ruby/loquacious-1.9.1[ruby_targets_ruby22] >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby22] =dev-ruby/rake-12*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/builder:*[ruby_targets_ruby23] >=dev-ruby/loquacious-1.9.1[ruby_targets_ruby23] >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby23] =dev-ruby/rake-12*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/builder:*[ruby_targets_ruby24] >=dev-ruby/loquacious-1.9.1[ruby_targets_ruby24] >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby24] =dev-ruby/rake-12*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Tool that creates new Ruby projects from a code skeleton
 EAPI=5
 HOMEPAGE=https://github.com/TwP/bones
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/builder:*[ruby_targets_ruby21] >=dev-ruby/loquacious-1.9.1[ruby_targets_ruby21] >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby21] =dev-ruby/rake-12*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/builder:*[ruby_targets_ruby22] >=dev-ruby/loquacious-1.9.1[ruby_targets_ruby22] >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby22] =dev-ruby/rake-12*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/builder:*[ruby_targets_ruby23] >=dev-ruby/loquacious-1.9.1[ruby_targets_ruby23] >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby23] =dev-ruby/rake-12*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/builder:*[ruby_targets_ruby24] >=dev-ruby/loquacious-1.9.1[ruby_targets_ruby24] >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby24] =dev-ruby/rake-12*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/builder:*[ruby_targets_ruby22] >=dev-ruby/loquacious-1.9.1[ruby_targets_ruby22] >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby22] =dev-ruby/rake-12*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/builder:*[ruby_targets_ruby23] >=dev-ruby/loquacious-1.9.1[ruby_targets_ruby23] >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby23] =dev-ruby/rake-12*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/builder:*[ruby_targets_ruby24] >=dev-ruby/loquacious-1.9.1[ruby_targets_ruby24] >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby24] =dev-ruby/rake-12*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/bones-3.8.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_=f238f547e178ded90d1ebf2ce3d9cfae
diff --git a/metadata/md5-cache/dev-ruby/bourne-1.6.0 b/metadata/md5-cache/dev-ruby/bourne-1.6.0
index dcf1955241b2..7edc7854ef07 100644
--- a/metadata/md5-cache/dev-ruby/bourne-1.6.0
+++ b/metadata/md5-cache/dev-ruby/bourne-1.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/mocha-1.1:1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mocha-1.1:1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mocha-1.1:1.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mocha-1.1:1.0[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/mocha-1.1:1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mocha-1.1:1.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mocha-1.1:1.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Extends mocha to allow tracking and querying of stub and mock invocations
 EAPI=5
 HOMEPAGE=https://github.com/thoughtbot/bourne
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/mocha-1.1:1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mocha-1.1:1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mocha-1.1:1.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mocha-1.1:1.0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/mocha-1.1:1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mocha-1.1:1.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mocha-1.1:1.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/bourne-1.6.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_=78429c41310de13e4bfad2d6ea3241e6
diff --git a/metadata/md5-cache/dev-ruby/brass-1.2.1 b/metadata/md5-cache/dev-ruby/brass-1.2.1
index 70cab8f08573..42d2e48b2692 100644
--- a/metadata/md5-cache/dev-ruby/brass-1.2.1
+++ b/metadata/md5-cache/dev-ruby/brass-1.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=BRASS is a very basic assertions framework for Ruby
 EAPI=5
 HOMEPAGE=https://rubyworks.github.io/brass/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/brass-1.2.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_=95568f9fb9c06f29a1d90cb5754762e4
diff --git a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2 b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
index 074eef1eaa8a..be00d634225f 100644
--- a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
+++ b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A binary search library for Ruby
 EAPI=5
 HOMEPAGE=http://0xcc.net/ruby-bsearch/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/bsearch-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_=e714c207ce6d14bc24a3e06a34cf6caf
diff --git a/metadata/md5-cache/dev-ruby/bson-3.2.6 b/metadata/md5-cache/dev-ruby/bson-3.2.6
index da0d0365be30..457d8e561481 100644
--- a/metadata/md5-cache/dev-ruby/bson-3.2.6
+++ b/metadata/md5-cache/dev-ruby/bson-3.2.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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_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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)
 EAPI=5
 HOMEPAGE=http://www.mongodb.org/
-IUSE=test doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test doc elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=APSL-2
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v3.2.6.tar.gz -> bson-3.2.6.tar.gz
 _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_=950baddf95dfc40214c74981d92010ff
diff --git a/metadata/md5-cache/dev-ruby/bson-4.1.1 b/metadata/md5-cache/dev-ruby/bson-4.1.1
index 905b2f1c72c3..7aa64522164d 100644
--- a/metadata/md5-cache/dev-ruby/bson-4.1.1
+++ b/metadata/md5-cache/dev-ruby/bson-4.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)
 EAPI=5
 HOMEPAGE=http://www.mongodb.org/
-IUSE=test doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=test doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=APSL-2
-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=4
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.1.1.tar.gz -> bson-4.1.1.tar.gz
 _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_=c0079eba56a1107fe4dca5dae5260f7f
diff --git a/metadata/md5-cache/dev-ruby/bson-4.2.0 b/metadata/md5-cache/dev-ruby/bson-4.2.0
index 7c9b3c11684e..01a4ded10ce1 100644
--- a/metadata/md5-cache/dev-ruby/bson-4.2.0
+++ b/metadata/md5-cache/dev-ruby/bson-4.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)
 EAPI=5
 HOMEPAGE=http://www.mongodb.org/
-IUSE=test doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=test doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=APSL-2
-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=4
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.2.0.tar.gz -> bson-4.2.0.tar.gz
 _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_=c0079eba56a1107fe4dca5dae5260f7f
diff --git a/metadata/md5-cache/dev-ruby/bson-4.2.1 b/metadata/md5-cache/dev-ruby/bson-4.2.1
index 125875e80562..2b65108bff87 100644
--- a/metadata/md5-cache/dev-ruby/bson-4.2.1
+++ b/metadata/md5-cache/dev-ruby/bson-4.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)
 EAPI=5
 HOMEPAGE=http://www.mongodb.org/
-IUSE=test doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=test doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=APSL-2
-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=4
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.2.1.tar.gz -> bson-4.2.1.tar.gz
 _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_=e14f37dd7b00f27f2dbceb4e885fd119
diff --git a/metadata/md5-cache/dev-ruby/bson-4.2.2 b/metadata/md5-cache/dev-ruby/bson-4.2.2
index fc0b1f0033f1..b4a5b5d6c21a 100644
--- a/metadata/md5-cache/dev-ruby/bson-4.2.2
+++ b/metadata/md5-cache/dev-ruby/bson-4.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)
 EAPI=6
 HOMEPAGE=http://www.mongodb.org/
-IUSE=test doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=APSL-2
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.2.2.tar.gz -> bson-4.2.2.tar.gz
 _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_=e41270a2c1b8b9d8f68328ce0a0929c4
diff --git a/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1 b/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
index 6b90ee34368a..9fdb5d00deb0 100644
--- a/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Statefully split input data by a specifiable token
 EAPI=5
 HOMEPAGE=https://github.com/sferik/buftok
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/buftok-0.2.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_=583e72cacd530dc511bd044f9eedf65c
diff --git a/metadata/md5-cache/dev-ruby/builder-3.0.4-r2 b/metadata/md5-cache/dev-ruby/builder-3.0.4-r2
index 8c0b7b70ae73..d4fe256ee818 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.0.4-r2
+++ b/metadata/md5-cache/dev-ruby/builder-3.0.4-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=A builder to facilitate programatic generation of XML markup
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/builder/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/builder-3.0.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
-_md5_=44d904834af527cc013c1c2bc84ae3ec
+_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_=2b7a4f5485b4b7190c259eec78036623
diff --git a/metadata/md5-cache/dev-ruby/builder-3.2.2-r1 b/metadata/md5-cache/dev-ruby/builder-3.2.2-r1
index 6e0d3f9526da..3e8212abefb6 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/builder-3.2.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A builder to facilitate programatic generation of XML markup
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/builder/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=3.2
 SRC_URI=mirror://rubygems/builder-3.2.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_=3bec8316809179ece8ce3b45c112b438
diff --git a/metadata/md5-cache/dev-ruby/builder-3.2.3 b/metadata/md5-cache/dev-ruby/builder-3.2.3
index 8a305f550abf..b744287ccc53 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.2.3
+++ b/metadata/md5-cache/dev-ruby/builder-3.2.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A builder to facilitate programatic generation of XML markup
 EAPI=5
 HOMEPAGE=http://onestepback.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3.2
 SRC_URI=mirror://rubygems/builder-3.2.3.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_=34dfb22573905a4eb84f4582369c39d5
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.12.5 b/metadata/md5-cache/dev-ruby/bundler-1.12.5
index 61b1aea797f9..ce9e731cb76b 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.12.5
+++ b/metadata/md5-cache/dev-ruby/bundler-1.12.5
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) ) ruby_targets_ruby21? ( doc? ( app-text/ronn[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[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=test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[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=An easy way to vendor gem dependencies
 EAPI=5
 HOMEPAGE=https://github.com/carlhuda/bundler
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) dev-vcs/git 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? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) dev-vcs/git 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=0
 SRC_URI=https://github.com/carlhuda/bundler/archive/v1.12.5.tar.gz -> bundler-1.12.5.tar.gz
 _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_=756c5669f12323d6f223b272d31337d4
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.12.6 b/metadata/md5-cache/dev-ruby/bundler-1.12.6
index 4d37b743f38b..bff4c3cfcd85 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.12.6
+++ b/metadata/md5-cache/dev-ruby/bundler-1.12.6
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) ) ruby_targets_ruby21? ( doc? ( app-text/ronn[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[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=test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[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=An easy way to vendor gem dependencies
 EAPI=5
 HOMEPAGE=https://github.com/carlhuda/bundler
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) dev-vcs/git 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? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) dev-vcs/git 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=0
 SRC_URI=https://github.com/carlhuda/bundler/archive/v1.12.6.tar.gz -> bundler-1.12.6.tar.gz
 _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_=8c288df5b41790c1edb735029ef1d238
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.13.7 b/metadata/md5-cache/dev-ruby/bundler-1.13.7
index d004cbec5aec..795d13beee68 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.13.7
+++ b/metadata/md5-cache/dev-ruby/bundler-1.13.7
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( doc? ( app-text/ronn[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( app-text/ronn[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( app-text/ronn[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An easy way to vendor gem dependencies
 EAPI=5
 HOMEPAGE=https://github.com/carlhuda/bundler
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) dev-vcs/git 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) dev-vcs/git ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/carlhuda/bundler/archive/v1.13.7.tar.gz -> bundler-1.13.7.tar.gz
 _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_=e318b115588ba9f5461d396a79e84569
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.14.6 b/metadata/md5-cache/dev-ruby/bundler-1.14.6
index 69738e0b995a..3756828d041e 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.14.6
+++ b/metadata/md5-cache/dev-ruby/bundler-1.14.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( doc? ( app-text/ronn[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( app-text/ronn[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( app-text/ronn[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An easy way to vendor gem dependencies
 EAPI=6
 HOMEPAGE=https://github.com/carlhuda/bundler
-IUSE=+doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=+doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) dev-vcs/git 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) dev-vcs/git ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/bundler-1.14.6.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_=71a2f9e9e45fba7aa4c54d0b65ea05b8
diff --git a/metadata/md5-cache/dev-ruby/bundler-audit-0.5.0 b/metadata/md5-cache/dev-ruby/bundler-audit-0.5.0
index dc0c28448700..48f01bb99b55 100644
--- a/metadata/md5-cache/dev-ruby/bundler-audit-0.5.0
+++ b/metadata/md5-cache/dev-ruby/bundler-audit-0.5.0
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby21] >=dev-ruby/bundler-1.2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby22] >=dev-ruby/bundler-1.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby23] >=dev-ruby/bundler-1.2:0[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby22] >=dev-ruby/bundler-1.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby23] >=dev-ruby/bundler-1.2:0[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=Provides patch-level verification for Bundled apps
 EAPI=5
 HOMEPAGE=https://github.com/rubysec/bundler-audit
-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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby21] >=dev-ruby/bundler-1.2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby22] >=dev-ruby/bundler-1.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby23] >=dev-ruby/bundler-1.2:0[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/thor-0.18:0[ruby_targets_ruby22] >=dev-ruby/bundler-1.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby23] >=dev-ruby/bundler-1.2:0[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=0
 SRC_URI=mirror://rubygems/bundler-audit-0.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_=7d3b9923cf5db4711cac22a52852de0f
diff --git a/metadata/md5-cache/dev-ruby/bundler-audit-0.6.0 b/metadata/md5-cache/dev-ruby/bundler-audit-0.6.0
index ed8c63c36e3e..c0738f8d3b71 100644
--- a/metadata/md5-cache/dev-ruby/bundler-audit-0.6.0
+++ b/metadata/md5-cache/dev-ruby/bundler-audit-0.6.0
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby21] >=dev-ruby/bundler-1.2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby22] >=dev-ruby/bundler-1.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby23] >=dev-ruby/bundler-1.2:0[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby22] >=dev-ruby/bundler-1.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby23] >=dev-ruby/bundler-1.2:0[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=Provides patch-level verification for Bundled apps
 EAPI=6
 HOMEPAGE=https://github.com/rubysec/bundler-audit
-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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby21] >=dev-ruby/bundler-1.2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby22] >=dev-ruby/bundler-1.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby23] >=dev-ruby/bundler-1.2:0[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/thor-0.18:0[ruby_targets_ruby22] >=dev-ruby/bundler-1.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby23] >=dev-ruby/bundler-1.2:0[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=0
 SRC_URI=mirror://rubygems/bundler-audit-0.6.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_=ac402b7260bddd48e93a0522dbe3a2c1
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.6.3 b/metadata/md5-cache/dev-ruby/bunny-2.6.3
index 1d617a623a36..e35b8b2e7c34 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.6.3
+++ b/metadata/md5-cache/dev-ruby/bunny-2.6.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.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] ) 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-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Another synchronous Ruby AMQP client
 EAPI=5
 HOMEPAGE=https://github.com/celldee/bunny
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.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/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.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/bunny-2.6.3.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_=b48ff824665de116c40e1e51c1c79ae4
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.6.4-r1 b/metadata/md5-cache/dev-ruby/bunny-2.6.4-r1
index e16f2f2f8e78..cc5d12ccfef4 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.6.4-r1
+++ b/metadata/md5-cache/dev-ruby/bunny-2.6.4-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.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] ) 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-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Another synchronous Ruby AMQP client
 EAPI=5
 HOMEPAGE=https://github.com/celldee/bunny
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.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/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.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/bunny-2.6.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_=e8060933d66ce6521a729902390fc8aa
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.6.5 b/metadata/md5-cache/dev-ruby/bunny-2.6.5
index a394273edc8a..0ba5ac9d93d5 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.6.5
+++ b/metadata/md5-cache/dev-ruby/bunny-2.6.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.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] ) 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-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Another synchronous Ruby AMQP client
 EAPI=5
 HOMEPAGE=https://github.com/celldee/bunny
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.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/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.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/bunny-2.6.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_=e8060933d66ce6521a729902390fc8aa
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.7.0 b/metadata/md5-cache/dev-ruby/bunny-2.7.0
index 5d6a2916389c..7ba55214d353 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.7.0
+++ b/metadata/md5-cache/dev-ruby/bunny-2.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Another synchronous Ruby AMQP client
 EAPI=6
 HOMEPAGE=https://github.com/celldee/bunny
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/bunny-2.7.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_=ed6d17e4fd581d2e8b015bf353827d53
diff --git a/metadata/md5-cache/dev-ruby/calendar_date_select-2.1.2 b/metadata/md5-cache/dev-ruby/calendar_date_select-2.1.2
index 6bd565dcf082..552e6c43c1d3 100644
--- a/metadata/md5-cache/dev-ruby/calendar_date_select-2.1.2
+++ b/metadata/md5-cache/dev-ruby/calendar_date_select-2.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rails-3.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rails-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rails-3.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] ) 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-ruby/rails-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rails-3.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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A popular and flexible JavaScript DatePicker for RubyOnRails
 EAPI=5
 HOMEPAGE=https://code.google.com/p/calendardateselect/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rails-3.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rails-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rails-3.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/rails-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rails-3.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/calendar_date_select-2.1.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_=65f150f8f85072f7284a426f5e680bd7
diff --git a/metadata/md5-cache/dev-ruby/camping-2.1.532 b/metadata/md5-cache/dev-ruby/camping-2.1.532
index 8e7de0498aac..0649d5e7d82e 100644
--- a/metadata/md5-cache/dev-ruby/camping-2.1.532
+++ b/metadata/md5-cache/dev-ruby/camping-2.1.532
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rack-test[ruby_targets_ruby21] >=dev-ruby/minitest-4:0[ruby_targets_ruby21] dev-ruby/tilt:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rack-test[ruby_targets_ruby22] >=dev-ruby/minitest-4:0[ruby_targets_ruby22] dev-ruby/tilt:0[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/mab-0.0.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mab-0.0.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0:*[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/rack-test[ruby_targets_ruby22] >=dev-ruby/minitest-4:0[ruby_targets_ruby22] dev-ruby/tilt:0[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/mab-0.0.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0:*[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=A small web framework modeled after Ruby on Rails
 EAPI=5
 HOMEPAGE=https://wiki.github.com/camping/camping
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/mab-0.0.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mab-0.0.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0:*[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/mab-0.0.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0:*[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/camping-2.1.532.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_=cc851b1ef75c20ef3788bfa965155aa7
diff --git a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2 b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
index a3bedb48e66c..fa045ec1f87c 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
+++ b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby21] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby21] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby21] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby21] >=dev-ruby/highline-1.2.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby22] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby22] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby22] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby22] >=dev-ruby/highline-1.2.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby23] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby23] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby23] >=dev-ruby/highline-1.2.7[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby22] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby22] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby22] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby22] >=dev-ruby/highline-1.2.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby23] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby23] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby23] >=dev-ruby/highline-1.2.7[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[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=A distributed application deployment system
 EAPI=5
 HOMEPAGE=http://capistranorb.com/
-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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby21] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby21] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby21] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby21] >=dev-ruby/highline-1.2.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby22] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby22] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby22] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby22] >=dev-ruby/highline-1.2.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby23] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby23] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby23] >=dev-ruby/highline-1.2.7[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/net-ssh-2.0.14[ruby_targets_ruby22] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby22] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby22] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby22] >=dev-ruby/highline-1.2.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby23] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby23] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby23] >=dev-ruby/highline-1.2.7[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=2
 SRC_URI=mirror://rubygems/capistrano-2.15.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_=f43e7ac34133a6a41a74ce5b57ce9162
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.4.1 b/metadata/md5-cache/dev-ruby/capistrano-3.4.1
index 099a870a6654..f70432322fbc 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-3.4.1
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] dev-ruby/i18n:*[ruby_targets_ruby21] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby22] >=dev-ruby/rake-10.0.0[ruby_targets_ruby22] dev-ruby/i18n:*[ruby_targets_ruby22] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby23] >=dev-ruby/rake-10.0.0[ruby_targets_ruby23] dev-ruby/i18n:*[ruby_targets_ruby23] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby22] >=dev-ruby/rake-10.0.0[ruby_targets_ruby22] dev-ruby/i18n:*[ruby_targets_ruby22] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby23] >=dev-ruby/rake-10.0.0[ruby_targets_ruby23] dev-ruby/i18n:*[ruby_targets_ruby23] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[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: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=A distributed application deployment system
 EAPI=5
 HOMEPAGE=http://capistranorb.com/
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] dev-ruby/i18n:*[ruby_targets_ruby21] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby22] >=dev-ruby/rake-10.0.0[ruby_targets_ruby22] dev-ruby/i18n:*[ruby_targets_ruby22] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby23] >=dev-ruby/rake-10.0.0[ruby_targets_ruby23] dev-ruby/i18n:*[ruby_targets_ruby23] !!<dev-ruby/capistrano-2.15.5-r2[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/sshkit-1.3:0[ruby_targets_ruby22] >=dev-ruby/rake-10.0.0[ruby_targets_ruby22] dev-ruby/i18n:*[ruby_targets_ruby22] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby23] >=dev-ruby/rake-10.0.0[ruby_targets_ruby23] dev-ruby/i18n:*[ruby_targets_ruby23] !!<dev-ruby/capistrano-2.15.5-r2[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=3
 SRC_URI=mirror://rubygems/capistrano-3.4.1.gem
 _eclass_exported_funcs=pkg_postinst:- 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_=dacb7263a267519cac762b88e89a49e0
diff --git a/metadata/md5-cache/dev-ruby/capistrano-stats-1.1.1 b/metadata/md5-cache/dev-ruby/capistrano-stats-1.1.1
index d0058bb78e43..b065afcbc246 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-stats-1.1.1
+++ b/metadata/md5-cache/dev-ruby/capistrano-stats-1.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Official metrics to help the development direction of Capistrano
 EAPI=5
 HOMEPAGE=http://metrics.capistranorb.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=mirror://rubygems/capistrano-stats-1.1.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_=bb5161875a6a4dc78cac731374c0eeed
diff --git a/metadata/md5-cache/dev-ruby/capybara-1.1.4 b/metadata/md5-cache/dev-ruby/capybara-1.1.4
index 65749d179991..553b1ff3e4d2 100644
--- a/metadata/md5-cache/dev-ruby/capybara-1.1.4
+++ b/metadata/md5-cache/dev-ruby/capybara-1.1.4
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0[ruby_targets_ruby21] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby21] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby21] >=dev-ruby/xpath-0.1.4:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] >=dev-ruby/xpath-0.1.4:0[ruby_targets_ruby22] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] >=dev-ruby/xpath-0.1.4:0[ruby_targets_ruby22] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
 EAPI=4
 HOMEPAGE=https://github.com/jnicklas/capybara
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0[ruby_targets_ruby21] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby21] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby21] >=dev-ruby/xpath-0.1.4:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] >=dev-ruby/xpath-0.1.4:0[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/mime-types-1.16[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] >=dev-ruby/xpath-0.1.4:0[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/capybara-1.1.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	virtualx	171580f737f5aaf18fcb456548588066
+_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	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=66008fbb64a2a0edad9fb89aa144cc71
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.13.0 b/metadata/md5-cache/dev-ruby/capybara-2.13.0
index 9e789bad7142..2257b6575fb7 100644
--- a/metadata/md5-cache/dev-ruby/capybara-2.13.0
+++ b/metadata/md5-cache/dev-ruby/capybara-2.13.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( www-client/firefox ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] dev-ruby/launchy[ruby_targets_ruby21] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby21] dev-ruby/sinatra[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/launchy[ruby_targets_ruby23] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby21] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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? ( www-client/firefox ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/launchy[ruby_targets_ruby23] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
 EAPI=5
 HOMEPAGE=https://github.com/jnicklas/capybara
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby21] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0: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/addressable[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0: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=2
 SRC_URI=mirror://rubygems/capybara-2.13.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	virtualx	171580f737f5aaf18fcb456548588066
+_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	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=a93e86c36d481cc6742e6bc6a70f19bb
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.14.4 b/metadata/md5-cache/dev-ruby/capybara-2.14.4
index 3db85dcfbba4..7e8f2417f6e0 100644
--- a/metadata/md5-cache/dev-ruby/capybara-2.14.4
+++ b/metadata/md5-cache/dev-ruby/capybara-2.14.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( www-client/firefox ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] dev-ruby/launchy[ruby_targets_ruby21] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby21] dev-ruby/sinatra[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/launchy[ruby_targets_ruby23] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby21] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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? ( www-client/firefox ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/launchy[ruby_targets_ruby23] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
 EAPI=6
 HOMEPAGE=https://github.com/jnicklas/capybara
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby21] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0: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/addressable[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0: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=2
 SRC_URI=mirror://rubygems/capybara-2.14.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	virtualx	171580f737f5aaf18fcb456548588066
+_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	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=d81ab346620532a9df33bb9daf78ce7c
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.14.4-r1 b/metadata/md5-cache/dev-ruby/capybara-2.14.4-r1
index 9fdb1b53776f..cfd7a1853a91 100644
--- a/metadata/md5-cache/dev-ruby/capybara-2.14.4-r1
+++ b/metadata/md5-cache/dev-ruby/capybara-2.14.4-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( www-client/firefox ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] dev-ruby/launchy[ruby_targets_ruby21] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby21] dev-ruby/sinatra[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/launchy[ruby_targets_ruby23] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/launchy[ruby_targets_ruby24] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby24] dev-ruby/sinatra[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby21] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby24] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby24] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( www-client/firefox ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/launchy[ruby_targets_ruby23] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/launchy[ruby_targets_ruby24] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby24] dev-ruby/sinatra[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby24] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby24] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
 EAPI=6
 HOMEPAGE=https://github.com/jnicklas/capybara
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby21] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby24] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby24] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby24] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby24] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/capybara-2.14.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	virtualx	171580f737f5aaf18fcb456548588066
+_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	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=fbecc265fa195d6255185b3fd5dbe189
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.15.1 b/metadata/md5-cache/dev-ruby/capybara-2.15.1
index 149cbe2c04b4..a6ec85502420 100644
--- a/metadata/md5-cache/dev-ruby/capybara-2.15.1
+++ b/metadata/md5-cache/dev-ruby/capybara-2.15.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( www-client/firefox ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] dev-ruby/launchy[ruby_targets_ruby21] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby21] dev-ruby/sinatra[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/launchy[ruby_targets_ruby23] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/launchy[ruby_targets_ruby24] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby24] dev-ruby/sinatra[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby21] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby24] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby24] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( www-client/firefox ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/launchy[ruby_targets_ruby23] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/launchy[ruby_targets_ruby24] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby24] dev-ruby/sinatra[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby24] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby24] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
 EAPI=6
 HOMEPAGE=https://github.com/jnicklas/capybara
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby21] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby24] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby24] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby24] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby24] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/capybara-2.15.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	virtualx	171580f737f5aaf18fcb456548588066
+_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	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=8271a0e88ca2c8b573857496a6ff13d3
diff --git a/metadata/md5-cache/dev-ruby/celluloid-0.16.0-r1 b/metadata/md5-cache/dev-ruby/celluloid-0.16.0-r1
index 4178299de872..1613bbc7f9cb 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-0.16.0-r1
+++ b/metadata/md5-cache/dev-ruby/celluloid-0.16.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/timers-4.0.0:4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/timers-4.0.0:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.0.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? ( 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-ruby/timers-4.0.0:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.0.0: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=Provides a simple and natural way to build fault-tolerant concurrent programs
 EAPI=5
 HOMEPAGE=https://github.com/celluloid/celluloid
-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 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/timers-4.0.0:4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/timers-4.0.0:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.0.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/timers-4.0.0:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.0.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=https://github.com/celluloid/celluloid/archive/v0.16.0.tar.gz -> celluloid-0.16.0-git.tgz
 _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_=c241420f06bd73a09e56eabc32d5b8c2
diff --git a/metadata/md5-cache/dev-ruby/celluloid-0.17.3 b/metadata/md5-cache/dev-ruby/celluloid-0.17.3
index 2de132a0aeb9..be62e4b5ba02 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-0.17.3
+++ b/metadata/md5-cache/dev-ruby/celluloid-0.17.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/celluloid-essentials[ruby_targets_ruby21] dev-ruby/celluloid-extras[ruby_targets_ruby21] dev-ruby/celluloid-fsm[ruby_targets_ruby21] dev-ruby/celluloid-pool[ruby_targets_ruby21] dev-ruby/celluloid-supervision[ruby_targets_ruby21] >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/celluloid-essentials[ruby_targets_ruby22] dev-ruby/celluloid-extras[ruby_targets_ruby22] dev-ruby/celluloid-fsm[ruby_targets_ruby22] dev-ruby/celluloid-pool[ruby_targets_ruby22] dev-ruby/celluloid-supervision[ruby_targets_ruby22] >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/celluloid-essentials[ruby_targets_ruby23] dev-ruby/celluloid-extras[ruby_targets_ruby23] dev-ruby/celluloid-fsm[ruby_targets_ruby23] dev-ruby/celluloid-pool[ruby_targets_ruby23] dev-ruby/celluloid-supervision[ruby_targets_ruby23] >=dev-ruby/timers-4.1.1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/dotenv[ruby_targets_ruby21] dev-ruby/nenv[ruby_targets_ruby21] dev-ruby/rspec-retry[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/dotenv[ruby_targets_ruby22] dev-ruby/nenv[ruby_targets_ruby22] dev-ruby/rspec-retry[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/dotenv[ruby_targets_ruby23] dev-ruby/nenv[ruby_targets_ruby23] dev-ruby/rspec-retry[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: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=test? ( ruby_targets_ruby22? ( dev-ruby/celluloid-essentials[ruby_targets_ruby22] dev-ruby/celluloid-extras[ruby_targets_ruby22] dev-ruby/celluloid-fsm[ruby_targets_ruby22] dev-ruby/celluloid-pool[ruby_targets_ruby22] dev-ruby/celluloid-supervision[ruby_targets_ruby22] >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/celluloid-essentials[ruby_targets_ruby23] dev-ruby/celluloid-extras[ruby_targets_ruby23] dev-ruby/celluloid-fsm[ruby_targets_ruby23] dev-ruby/celluloid-pool[ruby_targets_ruby23] dev-ruby/celluloid-supervision[ruby_targets_ruby23] >=dev-ruby/timers-4.1.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/dotenv[ruby_targets_ruby22] dev-ruby/nenv[ruby_targets_ruby22] dev-ruby/rspec-retry[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/dotenv[ruby_targets_ruby23] dev-ruby/nenv[ruby_targets_ruby23] dev-ruby/rspec-retry[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: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=Provides a simple and natural way to build fault-tolerant concurrent programs
 EAPI=5
 HOMEPAGE=https://github.com/celluloid/celluloid
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/celluloid-essentials[ruby_targets_ruby21] dev-ruby/celluloid-extras[ruby_targets_ruby21] dev-ruby/celluloid-fsm[ruby_targets_ruby21] dev-ruby/celluloid-pool[ruby_targets_ruby21] dev-ruby/celluloid-supervision[ruby_targets_ruby21] >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/celluloid-essentials[ruby_targets_ruby22] dev-ruby/celluloid-extras[ruby_targets_ruby22] dev-ruby/celluloid-fsm[ruby_targets_ruby22] dev-ruby/celluloid-pool[ruby_targets_ruby22] dev-ruby/celluloid-supervision[ruby_targets_ruby22] >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/celluloid-essentials[ruby_targets_ruby23] dev-ruby/celluloid-extras[ruby_targets_ruby23] dev-ruby/celluloid-fsm[ruby_targets_ruby23] dev-ruby/celluloid-pool[ruby_targets_ruby23] dev-ruby/celluloid-supervision[ruby_targets_ruby23] >=dev-ruby/timers-4.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/celluloid-essentials[ruby_targets_ruby22] dev-ruby/celluloid-extras[ruby_targets_ruby22] dev-ruby/celluloid-fsm[ruby_targets_ruby22] dev-ruby/celluloid-pool[ruby_targets_ruby22] dev-ruby/celluloid-supervision[ruby_targets_ruby22] >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/celluloid-essentials[ruby_targets_ruby23] dev-ruby/celluloid-extras[ruby_targets_ruby23] dev-ruby/celluloid-fsm[ruby_targets_ruby23] dev-ruby/celluloid-pool[ruby_targets_ruby23] dev-ruby/celluloid-supervision[ruby_targets_ruby23] >=dev-ruby/timers-4.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/celluloid-0.17.3.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_=c54279a34ac06087252c82379cab57a7
diff --git a/metadata/md5-cache/dev-ruby/celluloid-essentials-0.20.5 b/metadata/md5-cache/dev-ruby/celluloid-essentials-0.20.5
index 116aaba84847..841e7fd02040 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-essentials-0.20.5
+++ b/metadata/md5-cache/dev-ruby/celluloid-essentials-0.20.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/celluloid[ruby_targets_ruby21] dev-ruby/dotenv[ruby_targets_ruby21] dev-ruby/nenv[ruby_targets_ruby21] dev-ruby/rspec-retry[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/celluloid[ruby_targets_ruby22] dev-ruby/dotenv[ruby_targets_ruby22] dev-ruby/nenv[ruby_targets_ruby22] dev-ruby/rspec-retry[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/celluloid[ruby_targets_ruby23] dev-ruby/dotenv[ruby_targets_ruby23] dev-ruby/nenv[ruby_targets_ruby23] dev-ruby/rspec-retry[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/celluloid[ruby_targets_ruby22] dev-ruby/dotenv[ruby_targets_ruby22] dev-ruby/nenv[ruby_targets_ruby22] dev-ruby/rspec-retry[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/celluloid[ruby_targets_ruby23] dev-ruby/dotenv[ruby_targets_ruby23] dev-ruby/nenv[ruby_targets_ruby23] dev-ruby/rspec-retry[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: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=Provides a simple and natural way to build fault-tolerant concurrent programs
 EAPI=5
 HOMEPAGE=https://github.com/celluloid/celluloid
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.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/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.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=https://github.com/celluloid/celluloid-essentials/archive/v0.20.5.tar.gz -> celluloid-essentials-0.20.5.tar.gz
 _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_=217db402e862e6b3ecfb34c61a4f088b
diff --git a/metadata/md5-cache/dev-ruby/celluloid-extras-0.20.5 b/metadata/md5-cache/dev-ruby/celluloid-extras-0.20.5
index 17f8aaffa451..b4ec5d53522f 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-extras-0.20.5
+++ b/metadata/md5-cache/dev-ruby/celluloid-extras-0.20.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/celluloid[ruby_targets_ruby21] dev-ruby/dotenv[ruby_targets_ruby21] dev-ruby/nenv[ruby_targets_ruby21] dev-ruby/rspec-retry[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/celluloid[ruby_targets_ruby22] dev-ruby/dotenv[ruby_targets_ruby22] dev-ruby/nenv[ruby_targets_ruby22] dev-ruby/rspec-retry[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/celluloid[ruby_targets_ruby23] dev-ruby/dotenv[ruby_targets_ruby23] dev-ruby/nenv[ruby_targets_ruby23] dev-ruby/rspec-retry[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/celluloid[ruby_targets_ruby22] dev-ruby/dotenv[ruby_targets_ruby22] dev-ruby/nenv[ruby_targets_ruby22] dev-ruby/rspec-retry[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/celluloid[ruby_targets_ruby23] dev-ruby/dotenv[ruby_targets_ruby23] dev-ruby/nenv[ruby_targets_ruby23] dev-ruby/rspec-retry[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: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=Provides a simple and natural way to build fault-tolerant concurrent programs
 EAPI=5
 HOMEPAGE=https://github.com/celluloid/celluloid
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.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/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.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=https://github.com/celluloid/celluloid-extras/archive/v0.20.5.tar.gz -> celluloid-extras-0.20.5.tar.gz
 _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_=5a3db676bde830385d6a1c5dcf4b02b3
diff --git a/metadata/md5-cache/dev-ruby/celluloid-fsm-0.20.5 b/metadata/md5-cache/dev-ruby/celluloid-fsm-0.20.5
index a6b964886724..42e439f5fe79 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-fsm-0.20.5
+++ b/metadata/md5-cache/dev-ruby/celluloid-fsm-0.20.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/celluloid-0.17.2[ruby_targets_ruby21] dev-ruby/dotenv[ruby_targets_ruby21] dev-ruby/nenv[ruby_targets_ruby21] dev-ruby/rspec-retry[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/celluloid-0.17.2[ruby_targets_ruby22] dev-ruby/dotenv[ruby_targets_ruby22] dev-ruby/nenv[ruby_targets_ruby22] dev-ruby/rspec-retry[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/celluloid-0.17.2[ruby_targets_ruby23] dev-ruby/dotenv[ruby_targets_ruby23] dev-ruby/nenv[ruby_targets_ruby23] dev-ruby/rspec-retry[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/celluloid-0.17.2[ruby_targets_ruby22] dev-ruby/dotenv[ruby_targets_ruby22] dev-ruby/nenv[ruby_targets_ruby22] dev-ruby/rspec-retry[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/celluloid-0.17.2[ruby_targets_ruby23] dev-ruby/dotenv[ruby_targets_ruby23] dev-ruby/nenv[ruby_targets_ruby23] dev-ruby/rspec-retry[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: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=Provides a simple and natural way to build fault-tolerant concurrent programs
 EAPI=5
 HOMEPAGE=https://github.com/celluloid/celluloid
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.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/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.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=https://github.com/celluloid/celluloid-fsm/archive/v0.20.5.tar.gz -> celluloid-fsm-0.20.5.tar.gz
 _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_=17180b4ef81f3590274692f8ace6ae08
diff --git a/metadata/md5-cache/dev-ruby/celluloid-io-0.16.2 b/metadata/md5-cache/dev-ruby/celluloid-io-0.16.2
index c8b3e77e4e62..3cf495d9ef2d 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-io-0.16.2
+++ b/metadata/md5-cache/dev-ruby/celluloid-io-0.16.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/celluloid-0.16.0[ruby_targets_ruby21] >=dev-ruby/nio4r-1.1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/celluloid-0.16.0[ruby_targets_ruby22] >=dev-ruby/nio4r-1.1.0[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/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_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? ( ruby_targets_ruby22? ( >=dev-ruby/celluloid-0.16.0[ruby_targets_ruby22] >=dev-ruby/nio4r-1.1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Evented IO for Celluloid actors
 EAPI=5
 HOMEPAGE=https://github.com/celluloid/celluloid-io
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/celluloid-0.16.0[ruby_targets_ruby21] >=dev-ruby/nio4r-1.1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/celluloid-0.16.0[ruby_targets_ruby22] >=dev-ruby/nio4r-1.1.0[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/celluloid-0.16.0[ruby_targets_ruby22] >=dev-ruby/nio4r-1.1.0[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/celluloid-io-0.16.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_=0fb054261830d1b265e7b58bc491a9a6
diff --git a/metadata/md5-cache/dev-ruby/celluloid-io-0.17.3 b/metadata/md5-cache/dev-ruby/celluloid-io-0.17.3
index e057572aa6a5..6b53f29124e5 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-io-0.17.3
+++ b/metadata/md5-cache/dev-ruby/celluloid-io-0.17.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/celluloid-0.17.3[ruby_targets_ruby21] >=dev-ruby/nio4r-1.2.1[ruby_targets_ruby21] >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/celluloid-0.17.3[ruby_targets_ruby22] >=dev-ruby/nio4r-1.2.1[ruby_targets_ruby22] >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/dotenv[ruby_targets_ruby21] dev-ruby/nenv[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/dotenv[ruby_targets_ruby22] dev-ruby/nenv[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/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( >=dev-ruby/celluloid-0.17.3[ruby_targets_ruby22] >=dev-ruby/nio4r-1.2.1[ruby_targets_ruby22] >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/dotenv[ruby_targets_ruby22] dev-ruby/nenv[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Evented IO for Celluloid actors
 EAPI=5
 HOMEPAGE=https://github.com/celluloid/celluloid-io
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/celluloid-0.17.3[ruby_targets_ruby21] >=dev-ruby/nio4r-1.2.1[ruby_targets_ruby21] >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/celluloid-0.17.3[ruby_targets_ruby22] >=dev-ruby/nio4r-1.2.1[ruby_targets_ruby22] >=dev-ruby/timers-4.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/celluloid-0.17.3[ruby_targets_ruby22] >=dev-ruby/nio4r-1.2.1[ruby_targets_ruby22] >=dev-ruby/timers-4.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/celluloid-io-0.17.3.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_=3a0f413afe002ab7a7bffea28ea3c604
diff --git a/metadata/md5-cache/dev-ruby/celluloid-pool-0.20.5 b/metadata/md5-cache/dev-ruby/celluloid-pool-0.20.5
index 5a0d05e66c8c..849da88d4ced 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-pool-0.20.5
+++ b/metadata/md5-cache/dev-ruby/celluloid-pool-0.20.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/celluloid-0.17.2[ruby_targets_ruby21] dev-ruby/dotenv[ruby_targets_ruby21] dev-ruby/nenv[ruby_targets_ruby21] dev-ruby/rspec-retry[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/celluloid-0.17.2[ruby_targets_ruby22] dev-ruby/dotenv[ruby_targets_ruby22] dev-ruby/nenv[ruby_targets_ruby22] dev-ruby/rspec-retry[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/celluloid-0.17.2[ruby_targets_ruby23] dev-ruby/dotenv[ruby_targets_ruby23] dev-ruby/nenv[ruby_targets_ruby23] dev-ruby/rspec-retry[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/celluloid-0.17.2[ruby_targets_ruby22] dev-ruby/dotenv[ruby_targets_ruby22] dev-ruby/nenv[ruby_targets_ruby22] dev-ruby/rspec-retry[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/celluloid-0.17.2[ruby_targets_ruby23] dev-ruby/dotenv[ruby_targets_ruby23] dev-ruby/nenv[ruby_targets_ruby23] dev-ruby/rspec-retry[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: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=Provides a simple and natural way to build fault-tolerant concurrent programs
 EAPI=5
 HOMEPAGE=https://github.com/celluloid/celluloid
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.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/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.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=https://github.com/celluloid/celluloid-pool/archive/v0.20.5.tar.gz -> celluloid-pool-0.20.5.tar.gz
 _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_=17180b4ef81f3590274692f8ace6ae08
diff --git a/metadata/md5-cache/dev-ruby/celluloid-supervision-0.20.6 b/metadata/md5-cache/dev-ruby/celluloid-supervision-0.20.6
index 33b192c2af4d..6adf1d54f5ce 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-supervision-0.20.6
+++ b/metadata/md5-cache/dev-ruby/celluloid-supervision-0.20.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/celluloid-0.17.2[ruby_targets_ruby21] dev-ruby/dotenv[ruby_targets_ruby21] dev-ruby/nenv[ruby_targets_ruby21] dev-ruby/rspec-retry[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/celluloid-0.17.2[ruby_targets_ruby22] dev-ruby/dotenv[ruby_targets_ruby22] dev-ruby/nenv[ruby_targets_ruby22] dev-ruby/rspec-retry[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/celluloid-0.17.2[ruby_targets_ruby23] dev-ruby/dotenv[ruby_targets_ruby23] dev-ruby/nenv[ruby_targets_ruby23] dev-ruby/rspec-retry[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/celluloid-0.17.2[ruby_targets_ruby22] dev-ruby/dotenv[ruby_targets_ruby22] dev-ruby/nenv[ruby_targets_ruby22] dev-ruby/rspec-retry[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/celluloid-0.17.2[ruby_targets_ruby23] dev-ruby/dotenv[ruby_targets_ruby23] dev-ruby/nenv[ruby_targets_ruby23] dev-ruby/rspec-retry[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: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=Provides a simple and natural way to build fault-tolerant concurrent programs
 EAPI=5
 HOMEPAGE=https://github.com/celluloid/celluloid
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.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/timers-4.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/timers-4.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=https://github.com/celluloid/celluloid-supervision/archive/v0.20.6.tar.gz -> celluloid-supervision-0.20.6.tar.gz
 _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_=17180b4ef81f3590274692f8ace6ae08
diff --git a/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r1 b/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r1
index b860af839fdb..1fd5647eb606 100644
--- a/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r1
+++ b/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-3.0.6:*[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: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-ruby/activemodel-3.0.6:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-3.0.6:*[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: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=Managing the core functions outlined in RFC-3280 for PKI
 EAPI=5
 HOMEPAGE=https://github.com/cchandler/certificate_authority
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-3.0.6:*[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/activemodel-3.0.6:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-3.0.6:*[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/certificate_authority-0.1.6.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_=3b81af947efb4bb48fac4e9b47715cbf
diff --git a/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r2 b/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r2
index e951696da7f7..ae9777327535 100644
--- a/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r2
+++ b/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Managing the core functions outlined in RFC-3280 for PKI
 EAPI=5
 HOMEPAGE=https://github.com/cchandler/certificate_authority
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/certificate_authority-0.1.6.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_=8fb40532dd444e064b030f815f4b5903
diff --git a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.3 b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.3
index 608fcc14df9a..b238db729642 100644
--- a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.3
+++ b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) dev-libs/icu:= sys-libs/zlib 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/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/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) dev-libs/icu:= sys-libs/zlib 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/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=Character encoding detecting library for Ruby using ICU
 EAPI=5
 HOMEPAGE=https://github.com/brianmario/charlock_holmes
-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
 LICENSE=MIT
-RDEPEND=dev-libs/icu:= sys-libs/zlib 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=dev-libs/icu:= sys-libs/zlib 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/charlock_holmes-0.7.3.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_=dc7afb168a938bca307c12985f54b871
diff --git a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.4 b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.4
index 13535426bac8..a87fb80808bd 100644
--- a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.4
+++ b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) dev-libs/icu:= sys-libs/zlib 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) dev-libs/icu:= sys-libs/zlib ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Character encoding detecting library for Ruby using ICU
 EAPI=6
 HOMEPAGE=https://github.com/brianmario/charlock_holmes
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-libs/icu:= sys-libs/zlib 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=dev-libs/icu:= sys-libs/zlib ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/brianmario/charlock_holmes/archive/0.7.4.tar.gz -> charlock_holmes-0.7.4.tar.gz
 _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_=205a1b55faf29c3abf4f7e229eab7820
diff --git a/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1 b/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
index d5442f527389..5eb98803e09e 100644
--- a/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A scripting framework that replaces rake and sake
 EAPI=5
 HOMEPAGE=https://github.com/carllerche/childlabor
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/carllerche/childlabor/archive/6518b939dddbad20c7f05aa075d76e3ca6e70447.tar.gz -> childlabor-0.0.3.tar.gz
 _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_=7a0b1a84de925dd3e6eef914dd25c6b1
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.5.3 b/metadata/md5-cache/dev-ruby/childprocess-0.5.3
index b5644ab63570..cc6d978b682b 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.5.3
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.5.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] dev-ruby/rspec:2[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( virtual/ruby-ffi[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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_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? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] dev-ruby/rspec:2[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Solution for controlling external programs running in the background
 EAPI=5
 HOMEPAGE=https://github.com/jarib/childprocess
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ffi[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ffi[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? ( virtual/ruby-ffi[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=2
 SRC_URI=mirror://rubygems/childprocess-0.5.3.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_=274a799534411789f145a0d59f9dfd2e
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.6.3 b/metadata/md5-cache/dev-ruby/childprocess-0.6.3
index ed96fee41aa9..772e7bf62f12 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.6.3
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.6.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.0.11[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.0.11[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=Solution for controlling external programs running in the background
 EAPI=5
 HOMEPAGE=https://github.com/jarib/childprocess
-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=alpha amd64 arm ~hppa ~ia64 ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.0.11[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/ffi-1.0.11[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.0.11[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=2
 SRC_URI=mirror://rubygems/childprocess-0.6.3.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_=f1dd22b95cde0b2aa1547cb4513a064e
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.7.0 b/metadata/md5-cache/dev-ruby/childprocess-0.7.0
index a927dffed76a..beefb6993bf2 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.7.0
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.0.11[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.0.11[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=Solution for controlling external programs running in the background
 EAPI=6
 HOMEPAGE=https://github.com/jarib/childprocess
-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=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.0.11[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/ffi-1.0.11[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.0.11[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=2
 SRC_URI=mirror://rubygems/childprocess-0.7.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_=2602be07abacb6b0211f6b3e4874834c
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.7.1 b/metadata/md5-cache/dev-ruby/childprocess-0.7.1
index d83ba876b771..eaf128fd8986 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.7.1
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.7.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Solution for controlling external programs running in the background
 EAPI=6
 HOMEPAGE=https://github.com/jarib/childprocess
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/childprocess-0.7.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_=cef50d72240d30e90d919c32aead7a6b
diff --git a/metadata/md5-cache/dev-ruby/chronic-0.10.2 b/metadata/md5-cache/dev-ruby/chronic-0.10.2
index 12c4e88f0c74..7e45270caf95 100644
--- a/metadata/md5-cache/dev-ruby/chronic-0.10.2
+++ b/metadata/md5-cache/dev-ruby/chronic-0.10.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Chronic is a natural language date/time parser written in pure Ruby
 EAPI=5
 HOMEPAGE=https://github.com/mojombo/chronic
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/chronic-0.10.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_=7cf9ecd193762cc122e5d851ffef8c4a
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.6 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.6
index 43174fc83fc2..e16273831a83 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.6
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.3.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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: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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) 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=Pure Ruby library that can read and write PNG images
 EAPI=5
 HOMEPAGE=https://wiki.github.com/wvanbergen/chunky_png
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/chunky_png-1.3.6.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_=229e67d858c89ce04f3eef77e452f67b
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.7 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.7
index 76e534036f9c..4cb250eb0a10 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.7
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.3.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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: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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) 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=Pure Ruby library that can read and write PNG images
 EAPI=5
 HOMEPAGE=https://wiki.github.com/wvanbergen/chunky_png
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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/chunky_png-1.3.7.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_=8212272f92d1e7c7ddf2c28e6d5c4db8
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.8 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.8
index 258baae4d2ce..6658c28f7133 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.8
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.3.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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: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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) 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=Pure Ruby library that can read and write PNG images
 EAPI=5
 HOMEPAGE=https://wiki.github.com/wvanbergen/chunky_png
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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/chunky_png-1.3.8.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_=8212272f92d1e7c7ddf2c28e6d5c4db8
diff --git a/metadata/md5-cache/dev-ruby/classifier-1.3.4 b/metadata/md5-cache/dev-ruby/classifier-1.3.4
index 6935294692d5..267c5e97b533 100644
--- a/metadata/md5-cache/dev-ruby/classifier-1.3.4
+++ b/metadata/md5-cache/dev-ruby/classifier-1.3.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby21] !!dev-ruby/classifier-reborn[ruby_targets_ruby21] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby22] !!dev-ruby/classifier-reborn[ruby_targets_ruby22] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby23] !!dev-ruby/classifier-reborn[ruby_targets_ruby23] gsl? ( dev-ruby/rb-gsl[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby22] !!dev-ruby/classifier-reborn[ruby_targets_ruby22] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby23] !!dev-ruby/classifier-reborn[ruby_targets_ruby23] gsl? ( dev-ruby/rb-gsl[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=Module to allow Bayesian and other types of classifications
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/classifier https://github.com/cardmagic/classifier
-IUSE=gsl test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=gsl test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby21] !!dev-ruby/classifier-reborn[ruby_targets_ruby21] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby22] !!dev-ruby/classifier-reborn[ruby_targets_ruby22] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby23] !!dev-ruby/classifier-reborn[ruby_targets_ruby23] gsl? ( dev-ruby/rb-gsl[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/fast-stemmer-1.0.0[ruby_targets_ruby22] !!dev-ruby/classifier-reborn[ruby_targets_ruby22] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby23] !!dev-ruby/classifier-reborn[ruby_targets_ruby23] gsl? ( dev-ruby/rb-gsl[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/classifier-1.3.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_=9629698253ac5b1f1961c2ee3b1ea42a
diff --git a/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.4 b/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.4
index dcbfd2a1b1b2..f03260b5536c 100644
--- a/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.4
+++ b/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby21] !!dev-ruby/classifier[ruby_targets_ruby21] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby22] !!dev-ruby/classifier[ruby_targets_ruby22] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby23] !!dev-ruby/classifier[ruby_targets_ruby23] gsl? ( dev-ruby/rb-gsl[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby22] !!dev-ruby/classifier[ruby_targets_ruby22] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby23] !!dev-ruby/classifier[ruby_targets_ruby23] gsl? ( dev-ruby/rb-gsl[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=Module to allow Bayesian and other types of classifications
 EAPI=5
 HOMEPAGE=https://github.com/jekyll/classifier-reborn
-IUSE=gsl test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=gsl test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby21] !!dev-ruby/classifier[ruby_targets_ruby21] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby22] !!dev-ruby/classifier[ruby_targets_ruby22] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby23] !!dev-ruby/classifier[ruby_targets_ruby23] gsl? ( dev-ruby/rb-gsl[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/fast-stemmer-1.0.0[ruby_targets_ruby22] !!dev-ruby/classifier[ruby_targets_ruby22] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby23] !!dev-ruby/classifier[ruby_targets_ruby23] gsl? ( dev-ruby/rb-gsl[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=https://github.com/jekyll/classifier-reborn/archive/2.0.4.tar.gz -> classifier-reborn-2.0.4.tar.gz
 _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_=3529a55d0d58c5464982cb98fda1aa96
diff --git a/metadata/md5-cache/dev-ruby/classifier-reborn-2.1.0 b/metadata/md5-cache/dev-ruby/classifier-reborn-2.1.0
index e1ee1fe2d96d..366c1c2ee476 100644
--- a/metadata/md5-cache/dev-ruby/classifier-reborn-2.1.0
+++ b/metadata/md5-cache/dev-ruby/classifier-reborn-2.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby21] !!dev-ruby/classifier[ruby_targets_ruby21] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby22] !!dev-ruby/classifier[ruby_targets_ruby22] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby23] !!dev-ruby/classifier[ruby_targets_ruby23] gsl? ( dev-ruby/rb-gsl[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby22] !!dev-ruby/classifier[ruby_targets_ruby22] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby23] !!dev-ruby/classifier[ruby_targets_ruby23] gsl? ( dev-ruby/rb-gsl[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=Module to allow Bayesian and other types of classifications
 EAPI=5
 HOMEPAGE=https://github.com/jekyll/classifier-reborn
-IUSE=gsl test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=gsl test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby21] !!dev-ruby/classifier[ruby_targets_ruby21] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby22] !!dev-ruby/classifier[ruby_targets_ruby22] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby23] !!dev-ruby/classifier[ruby_targets_ruby23] gsl? ( dev-ruby/rb-gsl[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/fast-stemmer-1.0.0[ruby_targets_ruby22] !!dev-ruby/classifier[ruby_targets_ruby22] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby23] !!dev-ruby/classifier[ruby_targets_ruby23] gsl? ( dev-ruby/rb-gsl[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=https://github.com/jekyll/classifier-reborn/archive/v2.1.0.tar.gz -> classifier-reborn-2.1.0.tar.gz
 _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_=d829579813cde0746cfea9af3e6a7942
diff --git a/metadata/md5-cache/dev-ruby/climate_control-0.0.3 b/metadata/md5-cache/dev-ruby/climate_control-0.0.3
index b0e9217b1071..b9ef6bec19bd 100644
--- a/metadata/md5-cache/dev-ruby/climate_control-0.0.3
+++ b/metadata/md5-cache/dev-ruby/climate_control-0.0.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0[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-ruby/activesupport-3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0[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=Easily manage your environment
 EAPI=5
 HOMEPAGE=https://github.com/thoughtbot/climate_control
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0[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/activesupport-3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0[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/climate_control-0.0.3.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_=d9ec0ed311ca4b0dff993382712ed4d8
diff --git a/metadata/md5-cache/dev-ruby/climate_control-0.1.0 b/metadata/md5-cache/dev-ruby/climate_control-0.1.0
index e028ecaad002..a36f7f4dd516 100644
--- a/metadata/md5-cache/dev-ruby/climate_control-0.1.0
+++ b/metadata/md5-cache/dev-ruby/climate_control-0.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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: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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) 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=Easily manage your environment
 EAPI=5
 HOMEPAGE=https://github.com/thoughtbot/climate_control
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/climate_control-0.1.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_=517527d07e34e0f390548e0b7d8cc500
diff --git a/metadata/md5-cache/dev-ruby/climate_control-0.2.0 b/metadata/md5-cache/dev-ruby/climate_control-0.2.0
index 2676823a8c59..a0398c620ecb 100644
--- a/metadata/md5-cache/dev-ruby/climate_control-0.2.0
+++ b/metadata/md5-cache/dev-ruby/climate_control-0.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Easily manage your environment
 EAPI=6
 HOMEPAGE=https://github.com/thoughtbot/climate_control
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/climate_control-0.2.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_=d708fd24efbdc9ea9752711c483c3193
diff --git a/metadata/md5-cache/dev-ruby/cliver-0.3.2 b/metadata/md5-cache/dev-ruby/cliver-0.3.2
index 8b1680ebc2df..ed907dfbee0c 100644
--- a/metadata/md5-cache/dev-ruby/cliver-0.3.2
+++ b/metadata/md5-cache/dev-ruby/cliver-0.3.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An easy way to detect and use command-line dependencies
 EAPI=5
 HOMEPAGE=http://yaauie.github.io/cliver/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/cliver-0.3.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_=7fddfd7d3c53cdf7fb3d525f4ee3e2a6
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-2.0.6-r1 b/metadata/md5-cache/dev-ruby/cmdparse-2.0.6-r1
index 1a35605b7d26..86afa7d9bddf 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-2.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/cmdparse-2.0.6-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( 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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( 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=Advanced command line parser supporting commands
 EAPI=5
 HOMEPAGE=http://cmdparse.gettalong.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=amd64 ppc64 x86
 LICENSE=LGPL-3
-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/cmdparse-2.0.6.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_=bffe3992cfa1eace69d871088b18ec23
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-3.0.1 b/metadata/md5-cache/dev-ruby/cmdparse-3.0.1
index 7d60829eb10a..d19609dc939b 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-3.0.1
+++ b/metadata/md5-cache/dev-ruby/cmdparse-3.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) 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? ( 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Advanced command line parser supporting commands
 EAPI=5
 HOMEPAGE=http://cmdparse.gettalong.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=LGPL-3
-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=3
 SRC_URI=mirror://rubygems/cmdparse-3.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_=d470d3040ef5ebd13c90d9a18d6d95eb
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-3.0.2 b/metadata/md5-cache/dev-ruby/cmdparse-3.0.2
index 3bc671d1626e..82f41500bfb4 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-3.0.2
+++ b/metadata/md5-cache/dev-ruby/cmdparse-3.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Advanced command line parser supporting commands
 EAPI=5
 HOMEPAGE=https://cmdparse.gettalong.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=LGPL-3
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/cmdparse-3.0.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_=dd30698c92b8d5c1d985472997502448
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-3.0.3 b/metadata/md5-cache/dev-ruby/cmdparse-3.0.3
index f9c429d99dcb..21a8497769b3 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-3.0.3
+++ b/metadata/md5-cache/dev-ruby/cmdparse-3.0.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Advanced command line parser supporting commands
 EAPI=5
 HOMEPAGE=https://cmdparse.gettalong.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=LGPL-3
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/cmdparse-3.0.3.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_=4fb74b4554da6f235284d164ebb429da
diff --git a/metadata/md5-cache/dev-ruby/cocaine-0.5.8 b/metadata/md5-cache/dev-ruby/cocaine-0.5.8
index 58d2043a5d78..4d9a9a0d6687 100644
--- a/metadata/md5-cache/dev-ruby/cocaine-0.5.8
+++ b/metadata/md5-cache/dev-ruby/cocaine-0.5.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/climate_control:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/climate_control:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/climate_control:0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/activesupport-3[ruby_targets_ruby21] <dev-ruby/activesupport-5[ruby_targets_ruby21] dev-ruby/bourne[ruby_targets_ruby21] <dev-ruby/mocha-1.0.0[ruby_targets_ruby21] dev-ruby/posix-spawn[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activesupport-3[ruby_targets_ruby22] <dev-ruby/activesupport-5[ruby_targets_ruby22] dev-ruby/bourne[ruby_targets_ruby22] <dev-ruby/mocha-1.0.0[ruby_targets_ruby22] dev-ruby/posix-spawn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activesupport-3[ruby_targets_ruby23] <dev-ruby/activesupport-5[ruby_targets_ruby23] dev-ruby/bourne[ruby_targets_ruby23] <dev-ruby/mocha-1.0.0[ruby_targets_ruby23] dev-ruby/posix-spawn[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: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=test? ( ruby_targets_ruby22? ( dev-ruby/climate_control:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/climate_control:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activesupport-3[ruby_targets_ruby22] <dev-ruby/activesupport-5[ruby_targets_ruby22] dev-ruby/bourne[ruby_targets_ruby22] <dev-ruby/mocha-1.0.0[ruby_targets_ruby22] dev-ruby/posix-spawn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activesupport-3[ruby_targets_ruby23] <dev-ruby/activesupport-5[ruby_targets_ruby23] dev-ruby/bourne[ruby_targets_ruby23] <dev-ruby/mocha-1.0.0[ruby_targets_ruby23] dev-ruby/posix-spawn[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: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=A small library for doing command lines
 EAPI=5
 HOMEPAGE=http://www.thoughtbot.com/projects/cocaine
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/climate_control:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/climate_control:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/climate_control:0[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/climate_control:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/climate_control:0[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/cocaine-0.5.8.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_=9339bd10860ce6255cf94f9fe8367b90
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2 b/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2
index fbaa54485bd7..c87a40c7d0a4 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/redcloth-4.2.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/redcloth-4.2.2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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/redcloth-4.2.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=A Ruby library for syntax highlighting
 EAPI=5
 HOMEPAGE=http://coderay.rubychan.de/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.0.tar.gz -> coderay-1.1.0.tar.gz
 _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_=cfc64fdc8484ec534fc19e01447fc789
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.1 b/metadata/md5-cache/dev-ruby/coderay-1.1.1
index 247db20ea303..eed0c2580c2e 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.1
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Ruby library for syntax highlighting
 EAPI=5
 HOMEPAGE=http://coderay.rubychan.de/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.1.tar.gz -> coderay-1.1.1.tar.gz
 _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_=7697e2be1f241565e7d8ec1b9dc8e90a
diff --git a/metadata/md5-cache/dev-ruby/coercible-1.0.0 b/metadata/md5-cache/dev-ruby/coercible-1.0.0
index 38e2ab02f8e6..ec087f605cb5 100644
--- a/metadata/md5-cache/dev-ruby/coercible-1.0.0
+++ b/metadata/md5-cache/dev-ruby/coercible-1.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby21] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby22] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby24] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby22] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby24] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Powerful, flexible and configurable coercion library
 EAPI=5
 HOMEPAGE=https://github.com/solnic/coercible https://rubygems.org/gems/coercible
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby21] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby22] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby24] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby22] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby23] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/descendants_tracker-0.0.1[ruby_targets_ruby24] <dev-ruby/descendants_tracker-0.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/coercible-1.0.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_=5078749cc0a0c8eb615967cdc06cf608
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-4.1.1-r2 b/metadata/md5-cache/dev-ruby/coffee-rails-4.1.1-r2
index 7c83e469401f..35b06ec87be0 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-4.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-4.1.1-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby21] >dev-ruby/railties-4:*[ruby_targets_ruby21] <dev-ruby/railties-5.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby22] >dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-5.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-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=test? ( ruby_targets_ruby22? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby22] >dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-5.1:*[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=Coffee Script adapter for the Rails asset pipeline
 EAPI=5
 HOMEPAGE=https://github.com/rails/coffee-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby21] >dev-ruby/railties-4:*[ruby_targets_ruby21] <dev-ruby/railties-5.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby22] >dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-5.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/coffee-script-2.2.0[ruby_targets_ruby22] >dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-5.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=4.1
 SRC_URI=https://github.com/rails/coffee-rails/archive/v4.1.1.tar.gz -> coffee-rails-4.1.1.tar.gz
 _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_=0bd13aa04eb63b441ab86452f1d96b4a
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-4.2.1-r2 b/metadata/md5-cache/dev-ruby/coffee-rails-4.2.1-r2
index 537666f6afea..af466270be6c 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-4.2.1-r2
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-4.2.1-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby21] >dev-ruby/railties-4:*[ruby_targets_ruby21] <dev-ruby/railties-5.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby22] >dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-5.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby23] >dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-5.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=test? ( ruby_targets_ruby22? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby22] >dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-5.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby23] >dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-5.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=Coffee Script adapter for the Rails asset pipeline
 EAPI=5
 HOMEPAGE=https://github.com/rails/coffee-rails
-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 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby21] >dev-ruby/railties-4:*[ruby_targets_ruby21] <dev-ruby/railties-5.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby22] >dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-5.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby23] >dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-5.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/coffee-script-2.2.0[ruby_targets_ruby22] >dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-5.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby23] >dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-5.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=4.2
 SRC_URI=https://github.com/rails/coffee-rails/archive/v4.2.1.tar.gz -> coffee-rails-4.2.1.tar.gz
 _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_=0663907b92ad520b43adc7954cb9cd19
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-4.2.2 b/metadata/md5-cache/dev-ruby/coffee-rails-4.2.2
index e25d372ff11e..00a65f2156a7 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-4.2.2
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-4.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby21] >dev-ruby/railties-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby22] >dev-ruby/railties-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby23] >dev-ruby/railties-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/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=test? ( ruby_targets_ruby22? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby22] >dev-ruby/railties-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby23] >dev-ruby/railties-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/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=Coffee Script adapter for the Rails asset pipeline
 EAPI=6
 HOMEPAGE=https://github.com/rails/coffee-rails
-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 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby21] >dev-ruby/railties-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby22] >dev-ruby/railties-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby23] >dev-ruby/railties-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/coffee-script-2.2.0[ruby_targets_ruby22] >dev-ruby/railties-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby23] >dev-ruby/railties-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=4.2
 SRC_URI=https://github.com/rails/coffee-rails/archive/v4.2.2.tar.gz -> coffee-rails-4.2.2.tar.gz
 _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_=b3260aa5bfa82bac44760ff23b5750dd
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-4.2.2-r1 b/metadata/md5-cache/dev-ruby/coffee-rails-4.2.2-r1
index bbac26144069..cbe38b442fb2 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-4.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-4.2.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby21] >dev-ruby/railties-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby22] >dev-ruby/railties-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby23] >dev-ruby/railties-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby24] >dev-ruby/railties-4:*[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby22] >dev-ruby/railties-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby23] >dev-ruby/railties-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby24] >dev-ruby/railties-4:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Coffee Script adapter for the Rails asset pipeline
 EAPI=6
 HOMEPAGE=https://github.com/rails/coffee-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby21] >dev-ruby/railties-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby22] >dev-ruby/railties-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby23] >dev-ruby/railties-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby24] >dev-ruby/railties-4:*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby22] >dev-ruby/railties-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby23] >dev-ruby/railties-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby24] >dev-ruby/railties-4:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/coffee-rails/archive/v4.2.2.tar.gz -> coffee-rails-4.2.2.tar.gz
 _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_=a039681c69b7ca1946a9153a1cea488d
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-2.4.1 b/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
index fef59d38a765..49bf9008c23a 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
+++ b/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/coffee-script-source[ruby_targets_ruby21] dev-ruby/execjs:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/coffee-script-source[ruby_targets_ruby22] dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/coffee-script-source[ruby_targets_ruby23] dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/coffee-script-source[ruby_targets_ruby24] dev-ruby/execjs:*[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/coffee-script-source[ruby_targets_ruby22] dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/coffee-script-source[ruby_targets_ruby23] dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/coffee-script-source[ruby_targets_ruby24] dev-ruby/execjs:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby CoffeeScript is a bridge to the official CoffeeScript compiler
 EAPI=5
 HOMEPAGE=https://github.com/rails/ruby-coffee-script https://github.com/rails/coffee-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/coffee-script-source[ruby_targets_ruby21] dev-ruby/execjs:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/coffee-script-source[ruby_targets_ruby22] dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/coffee-script-source[ruby_targets_ruby23] dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/coffee-script-source[ruby_targets_ruby24] dev-ruby/execjs:*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/coffee-script-source[ruby_targets_ruby22] dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/coffee-script-source[ruby_targets_ruby23] dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/coffee-script-source[ruby_targets_ruby24] dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-2.4.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_=6d625bac38f984c0d9f7c2eb8592bbb8
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2
index 427d81957b35..d714a6defc04 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby CoffeeScript is a bridge to the official CoffeeScript compiler
 EAPI=5
 HOMEPAGE=http://coffeescript.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-source-1.12.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_=3c593e68736100944a26cbfdb2b3af41
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.3 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.3
index 89bbab8640ec..c13c766fbcf9 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.3
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Ruby CoffeeScript is a bridge to the official CoffeeScript compiler
 EAPI=5
 HOMEPAGE=http://jashkenas.github.io/coffee-script/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=amd64 arm ppc ppc64 x86 ~x64-macos ~x86-solaris
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-source-1.9.3.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_=ceb26a66766f0ab6e589390ca72f2f3e
diff --git a/metadata/md5-cache/dev-ruby/color-1.8 b/metadata/md5-cache/dev-ruby/color-1.8
index ad3a912c9bd2..9239805f1434 100644
--- a/metadata/md5-cache/dev-ruby/color-1.8
+++ b/metadata/md5-cache/dev-ruby/color-1.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Colour management with Ruby
 EAPI=5
 HOMEPAGE=https://github.com/halostatue/color
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/halostatue/color/archive/v1.8.tar.gz -> color-1.8.tar.gz
 _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_=b03442aefe0a70f95239cb229e341a77
diff --git a/metadata/md5-cache/dev-ruby/colorator-0.1-r1 b/metadata/md5-cache/dev-ruby/colorator-0.1-r1
index c1dbe794fc16..cceb4726ac48 100644
--- a/metadata/md5-cache/dev-ruby/colorator-0.1-r1
+++ b/metadata/md5-cache/dev-ruby/colorator-0.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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: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=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: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=Colorize your text in the terminal
 EAPI=5
 HOMEPAGE=https://github.com/octopress/colorator
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/colorator-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_=37473969d619e153dcab59f204820304
diff --git a/metadata/md5-cache/dev-ruby/colorator-1.1.0 b/metadata/md5-cache/dev-ruby/colorator-1.1.0
index de9cd4f69085..8f145530985a 100644
--- a/metadata/md5-cache/dev-ruby/colorator-1.1.0
+++ b/metadata/md5-cache/dev-ruby/colorator-1.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Colorize your text in the terminal
 EAPI=5
 HOMEPAGE=https://github.com/octopress/colorator
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/octopress/colorator/archive/v1.1.0.tar.gz -> colorator-1.1.0.tar.gz
 _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_=042b6c5a879e97d3c1c5e13ba00d260a
diff --git a/metadata/md5-cache/dev-ruby/colored-1.2 b/metadata/md5-cache/dev-ruby/colored-1.2
index fcdd87884429..a8b1cd13935f 100644
--- a/metadata/md5-cache/dev-ruby/colored-1.2
+++ b/metadata/md5-cache/dev-ruby/colored-1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Console coloring
 EAPI=5
 HOMEPAGE=https://github.com/defunkt/colored
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/colored-1.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_=1d8d1c6637bee5a6d894a8f3639239fa
diff --git a/metadata/md5-cache/dev-ruby/colorize-0.8.1 b/metadata/md5-cache/dev-ruby/colorize-0.8.1
index d7d7e4ce7014..4c8ad55116a3 100644
--- a/metadata/md5-cache/dev-ruby/colorize-0.8.1
+++ b/metadata/md5-cache/dev-ruby/colorize-0.8.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Adds methods to set color, background color and text effect on console easier
 EAPI=5
 HOMEPAGE=https://github.com/fazibear/colorize
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/colorize-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_=d643f6d35c8c810df0952f7dff9bee92
diff --git a/metadata/md5-cache/dev-ruby/columnize-0.9.0 b/metadata/md5-cache/dev-ruby/columnize-0.9.0
index bc7a2f9528cf..05668cc74b0d 100644
--- a/metadata/md5-cache/dev-ruby/columnize-0.9.0
+++ b/metadata/md5-cache/dev-ruby/columnize-0.9.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Sorts an array in column order
 EAPI=5
 HOMEPAGE=https://github.com/rocky/columnize
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/columnize-0.9.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_=fcbd2105500f96a128aeeb7e9109becb
diff --git a/metadata/md5-cache/dev-ruby/combustion-0.5.5 b/metadata/md5-cache/dev-ruby/combustion-0.5.5
index e7b4d11480c8..85100b57e89a 100644
--- a/metadata/md5-cache/dev-ruby/combustion-0.5.5
+++ b/metadata/md5-cache/dev-ruby/combustion-0.5.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby21] >=dev-ruby/thor-0.14.6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14.6[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] ) 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-ruby/activesupport-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14.6[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Elegant Rails Engine Testing
 EAPI=5
 HOMEPAGE=https://github.com/pat/combustion
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby21] >=dev-ruby/thor-0.14.6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14.6[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/activesupport-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14.6[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/combustion-0.5.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_=2835badbc10aaa45081e8fe984deb0f3
diff --git a/metadata/md5-cache/dev-ruby/combustion-0.6.0 b/metadata/md5-cache/dev-ruby/combustion-0.6.0
index ff0183b41159..87063dd37532 100644
--- a/metadata/md5-cache/dev-ruby/combustion-0.6.0
+++ b/metadata/md5-cache/dev-ruby/combustion-0.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby21] >=dev-ruby/thor-0.14.6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14.6[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] ) 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-ruby/activesupport-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14.6[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Elegant Rails Engine Testing
 EAPI=5
 HOMEPAGE=https://github.com/pat/combustion
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby21] >=dev-ruby/thor-0.14.6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14.6[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/activesupport-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14.6[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/combustion-0.6.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_=94446527b8673119957d44ee9b512505
diff --git a/metadata/md5-cache/dev-ruby/combustion-0.7.0 b/metadata/md5-cache/dev-ruby/combustion-0.7.0
index aff2f66340c9..c0b4252f4525 100644
--- a/metadata/md5-cache/dev-ruby/combustion-0.7.0
+++ b/metadata/md5-cache/dev-ruby/combustion-0.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby21] >=dev-ruby/thor-0.14.6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby24] >=dev-ruby/thor-0.14.6[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby24] >=dev-ruby/thor-0.14.6[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Elegant Rails Engine Testing
 EAPI=6
 HOMEPAGE=https://github.com/pat/combustion
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby21] >=dev-ruby/thor-0.14.6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby24] >=dev-ruby/thor-0.14.6[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby24] >=dev-ruby/thor-0.14.6[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/combustion-0.7.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_=38a292e0478bb8536609ed358950098b
diff --git a/metadata/md5-cache/dev-ruby/commander-4.4.3 b/metadata/md5-cache/dev-ruby/commander-4.4.3
index 6a9d813cef12..901a82f5f21c 100644
--- a/metadata/md5-cache/dev-ruby/commander-4.4.3
+++ b/metadata/md5-cache/dev-ruby/commander-4.4.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby21] =dev-ruby/highline-1.7*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby22] =dev-ruby/highline-1.7*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby23] =dev-ruby/highline-1.7*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby24] =dev-ruby/highline-1.7*[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby22] =dev-ruby/highline-1.7*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby23] =dev-ruby/highline-1.7*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby24] =dev-ruby/highline-1.7*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=The complete solution for Ruby command-line executables
 EAPI=5
 HOMEPAGE=https://visionmedia.github.com/commander/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby21] =dev-ruby/highline-1.7*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby22] =dev-ruby/highline-1.7*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby23] =dev-ruby/highline-1.7*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby24] =dev-ruby/highline-1.7*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby22] =dev-ruby/highline-1.7*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby23] =dev-ruby/highline-1.7*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby24] =dev-ruby/highline-1.7*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/commander-4.4.3.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_=cc4af10e38134fa1e6142d05637b185c
diff --git a/metadata/md5-cache/dev-ruby/compass-1.0.3-r1 b/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
index 8d87d1702983..f479a5ac9afa 100644
--- a/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby21] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby21] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby21] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby21] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby21] <dev-ruby/sass-3.5:*[ruby_targets_ruby21] !!<dev-ruby/compass-0.12.7-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby22] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby22] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby22] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby22] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] !!<dev-ruby/compass-0.12.7-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby23] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby23] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby23] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby23] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[ruby_targets_ruby23] !!<dev-ruby/compass-0.12.7-r1[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby22] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby22] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby22] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby22] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] !!<dev-ruby/compass-0.12.7-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby23] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby23] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby23] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby23] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[ruby_targets_ruby23] !!<dev-ruby/compass-0.12.7-r1[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=Compass Stylesheet Authoring Framework
 EAPI=5
 HOMEPAGE=http://compass-style.org/
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby21] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby21] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby21] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby21] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby21] <dev-ruby/sass-3.5:*[ruby_targets_ruby21] !!<dev-ruby/compass-0.12.7-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby22] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby22] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby22] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby22] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] !!<dev-ruby/compass-0.12.7-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby23] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby23] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby23] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby23] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[ruby_targets_ruby23] !!<dev-ruby/compass-0.12.7-r1[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/chunky_png-1.2[ruby_targets_ruby22] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby22] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby22] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby22] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] !!<dev-ruby/compass-0.12.7-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby23] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby23] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby23] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby23] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[ruby_targets_ruby23] !!<dev-ruby/compass-0.12.7-r1[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/compass-1.0.3.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_=eb9d4be067dcf6676082784edb33c048
diff --git a/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1 b/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
index 22ff756e439d..a2fe0d01a266 100644
--- a/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby21] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby21] <dev-ruby/sass-3.5:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[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] ) 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-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Compass Stylesheet Authoring Framework
 EAPI=5
 HOMEPAGE=http://compass-style.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby21] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby21] <dev-ruby/sass-3.5:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[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/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[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=1.0
 SRC_URI=mirror://rubygems/compass-core-1.0.3.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_=fae2e84483b9615a4366e78ea239c07a
diff --git a/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5 b/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
index 32a41040049f..b5196045a3ad 100644
--- a/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
+++ b/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby21] <dev-ruby/sass-3.5:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[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] ) 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-ruby/sass-3.2:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Speed up your Sass compilation by making @import only import each file once
 EAPI=5
 HOMEPAGE=http://compass-style.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby21] <dev-ruby/sass-3.5:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[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/sass-3.2:*[ruby_targets_ruby22] <dev-ruby/sass-3.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby23] <dev-ruby/sass-3.5:*[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=1.0
 SRC_URI=mirror://rubygems/compass-import-once-1.0.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_=a1b12df06516cf5977ea7f0a764ed409
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.4 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.4
index ef285e4455ad..a768c2401c8a 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.4
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/timecop-0.7.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: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/timecop-0.7.4[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/timecop-0.7.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: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=Modern concurrency tools including agents, futures, promises, thread pools, more
 EAPI=5
 HOMEPAGE=https://github.com/ruby-concurrency/concurrent-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.0.4.tar.gz -> concurrent-ruby-1.0.4.tar.gz
 _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_=c834e6c5f7af53f25d7d5ca49f21f3f7
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
index cc4e09970a58..1b6fbe2106bc 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Modern concurrency tools including agents, futures, promises, thread pools, more
 EAPI=5
 HOMEPAGE=https://github.com/ruby-concurrency/concurrent-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.0.5.tar.gz -> concurrent-ruby-1.0.5.tar.gz
 _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_=85ec14009c070bd63d13ef5295ed7a9e
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.2.0 b/metadata/md5-cache/dev-ruby/connection_pool-2.2.0
index 608ef67a967d..127d4085b576 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.2.0
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5[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/minitest-5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5[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=Generic connection pooling for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/mperham/connection_pool
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=MIT
-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/connection_pool-2.2.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_=498c9a65340a04e8adc70cba93f61fad
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.2.1 b/metadata/md5-cache/dev-ruby/connection_pool-2.2.1
index f7a91ccfc21f..fa297f10143b 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.2.1
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Generic connection pooling for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/mperham/connection_pool
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/connection_pool-2.2.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_=969532a491fac9d43e63c8a8ae7d1e45
diff --git a/metadata/md5-cache/dev-ruby/contracts-0.16.0 b/metadata/md5-cache/dev-ruby/contracts-0.16.0
index 7881dc695fdf..7b0a756aa2a8 100644
--- a/metadata/md5-cache/dev-ruby/contracts-0.16.0
+++ b/metadata/md5-cache/dev-ruby/contracts-0.16.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=provides contracts for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/egonSchiele/contracts.ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/contracts-0.16.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_=9231ed13e1005ae9541ad29647069670
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.5.0 b/metadata/md5-cache/dev-ruby/coolio-1.5.0
index 219c06952f7e..384a71264caa 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.5.0
+++ b/metadata/md5-cache/dev-ruby/coolio-1.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/iobuffer-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? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/iobuffer-1[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=A high performance event framework for Ruby which uses the libev C library
 EAPI=6
 HOMEPAGE=https://coolio.github.io/
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/iobuffer-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/iobuffer-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/iobuffer-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/cool.io-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_=2aa6aca610c5cde0add625c473d268f8
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.5.1 b/metadata/md5-cache/dev-ruby/coolio-1.5.1
index 6ade11b8601a..4ade092c1a93 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.5.1
+++ b/metadata/md5-cache/dev-ruby/coolio-1.5.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A high performance event framework for Ruby which uses the libev C library
 EAPI=6
 HOMEPAGE=https://coolio.github.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/cool.io-1.5.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_=39de3c295cb7457b496c1b7098641b80
diff --git a/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1 b/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
index 2f511497aa87..21beff712bcf 100644
--- a/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Synchronization aid to allow threads to wait for operations in other threads
 EAPI=5
 HOMEPAGE=https://github.com/benlangfeld/countdownlatch
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/countdownlatch-1.0.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_=fb43958cb5d9810b036c739646cf51e5
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.2-r1 b/metadata/md5-cache/dev-ruby/crack-0.4.2-r1
index 2a408c21aee4..6b6fc81e3f57 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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/minitest[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Really simple JSON and XML parsing, ripped from Merb and Rails
 EAPI=5
 HOMEPAGE=https://github.com/jnunemaker/crack
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/safe_yaml-1.0.0[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/safe_yaml-1.0.0[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/crack-0.4.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_=787bc59046f4a97414171b4facad314a
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.3 b/metadata/md5-cache/dev-ruby/crack-0.4.3
index f0626f1f7808..0afb36f3501b 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.3
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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/minitest[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Really simple JSON and XML parsing, ripped from Merb and Rails
 EAPI=5
 HOMEPAGE=https://github.com/jnunemaker/crack
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/safe_yaml-1.0.0[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/safe_yaml-1.0.0[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/crack-0.4.3.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_=51681ba4b103940146e9d2707dd180d5
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.3-r1 b/metadata/md5-cache/dev-ruby/crack-0.4.3-r1
index 88a7cdc2abc9..25deabcbfe53 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.3-r1
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Really simple JSON and XML parsing, ripped from Merb and Rails
 EAPI=5
 HOMEPAGE=https://github.com/jnunemaker/crack
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/crack-0.4.3.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_=08972dd9cf0e8b8b8d7ffca23d3b3442
diff --git a/metadata/md5-cache/dev-ruby/crass-1.0.2 b/metadata/md5-cache/dev-ruby/crass-1.0.2
index 2dd5bbe360c8..98b573d611de 100644
--- a/metadata/md5-cache/dev-ruby/crass-1.0.2
+++ b/metadata/md5-cache/dev-ruby/crass-1.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( >=dev-ruby/minitest-5.0.8:5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/minitest-5.0.8:5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/minitest-5.0.8:5[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/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? ( >=dev-ruby/minitest-5.0.8:5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/minitest-5.0.8:5[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/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=Ruby CSS parser that's fully compliant with the CSS Syntax Level 3 specification
 EAPI=5
 HOMEPAGE=https://github.com/rgrove/crass/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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/crass-1.0.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_=301723d51329f2f09dd1b9892cbbb8c9
diff --git a/metadata/md5-cache/dev-ruby/creole-0.5.0 b/metadata/md5-cache/dev-ruby/creole-0.5.0
index a717c7ffbf63..3808d0d5c57d 100644
--- a/metadata/md5-cache/dev-ruby/creole-0.5.0
+++ b/metadata/md5-cache/dev-ruby/creole-0.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Creole-to-HTML converter for Creole, the lightweight markup language
 EAPI=5
 HOMEPAGE=https://github.com/minad/creole
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/minad/creole/archive/v0.5.0.tar.gz -> creole-0.5.0.tar.gz
 _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_=0206a4731e527493c07e77fa24ff3b65
diff --git a/metadata/md5-cache/dev-ruby/cri-2.7.1 b/metadata/md5-cache/dev-ruby/cri-2.7.1
index ed9af8527c9b..b86b81c73a49 100644
--- a/metadata/md5-cache/dev-ruby/cri-2.7.1
+++ b/metadata/md5-cache/dev-ruby/cri-2.7.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/colored-1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) test? ( dev-ruby/yard[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/yard[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/yard[ruby_targets_ruby23] dev-ruby/minitest[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/yard[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/yard[ruby_targets_ruby23] dev-ruby/minitest[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Cri is a library for building easy-to-use commandline tools
 EAPI=5
 HOMEPAGE=http://rubygems.org/gems/cri
-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 ~x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/colored-1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-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/colored-1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-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/cri-2.7.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_=f0247d039f0eb1dba5279caf8da2652d
diff --git a/metadata/md5-cache/dev-ruby/cri-2.8.0 b/metadata/md5-cache/dev-ruby/cri-2.8.0
index fa3f148093fc..0821aac04ebb 100644
--- a/metadata/md5-cache/dev-ruby/cri-2.8.0
+++ b/metadata/md5-cache/dev-ruby/cri-2.8.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/colored-1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) test? ( dev-ruby/yard[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/yard[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/yard[ruby_targets_ruby23] dev-ruby/minitest[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/yard[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/yard[ruby_targets_ruby23] dev-ruby/minitest[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Cri is a library for building easy-to-use commandline tools
 EAPI=5
 HOMEPAGE=http://rubygems.org/gems/cri
-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 ~x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/colored-1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-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/colored-1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-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/cri-2.8.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_=31b401264b598ab7225959793dcc0809
diff --git a/metadata/md5-cache/dev-ruby/cri-2.9.1 b/metadata/md5-cache/dev-ruby/cri-2.9.1
index 3e75b4384c51..1618cdd2fe91 100644
--- a/metadata/md5-cache/dev-ruby/cri-2.9.1
+++ b/metadata/md5-cache/dev-ruby/cri-2.9.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/colored-1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/colored-1.2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) test? ( dev-ruby/yard[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/yard[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/yard[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/yard[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/colored-1.2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/yard[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/yard[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/yard[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Cri is a library for building easy-to-use commandline tools
 EAPI=6
 HOMEPAGE=http://rubygems.org/gems/cri
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/colored-1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/colored-1.2[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/colored-1.2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/cri-2.9.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_=92e63ab25731eaa8af675c6128dd6bf9
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.4.10 b/metadata/md5-cache/dev-ruby/css_parser-1.4.10
index 8af13933dba4..96c6c10b3717 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.4.10
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.4.10
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/maxitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/maxitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[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? ( 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-ruby/addressable[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/maxitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[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? ( 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=Sass-based Stylesheet Framework
 EAPI=5
 HOMEPAGE=http://compass-style.org/ https://github.com/premailer/css_parser/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[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/addressable[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[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=https://github.com/premailer/css_parser/archive/v1.4.10.tar.gz -> css_parser-1.4.10.tar.gz
 _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_=2fad50f998127e21962ad45640df2091
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.4.8 b/metadata/md5-cache/dev-ruby/css_parser-1.4.8
index 86ebcc3d0a92..94b65a823f78 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.4.8
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.4.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/maxitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/maxitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[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? ( 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-ruby/addressable[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/maxitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[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? ( 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=Sass-based Stylesheet Framework
 EAPI=5
 HOMEPAGE=http://compass-style.org/ https://github.com/premailer/css_parser/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[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/addressable[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[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=https://github.com/premailer/css_parser/archive/v1.4.8.tar.gz -> css_parser-1.4.8.tar.gz
 _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_=2fad50f998127e21962ad45640df2091
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.4.9 b/metadata/md5-cache/dev-ruby/css_parser-1.4.9
index 75a61c62e410..af26956feb40 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.4.9
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.4.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/maxitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/maxitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[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? ( 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-ruby/addressable[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/maxitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[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? ( 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=Sass-based Stylesheet Framework
 EAPI=5
 HOMEPAGE=http://compass-style.org/ https://github.com/premailer/css_parser/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[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/addressable[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[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=https://github.com/premailer/css_parser/archive/v1.4.9.tar.gz -> css_parser-1.4.9.tar.gz
 _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_=2fad50f998127e21962ad45640df2091
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.5.0 b/metadata/md5-cache/dev-ruby/css_parser-1.5.0
index d156542391fc..a48cb53ba2a3 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.5.0
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] virtual/ruby-ssl[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/maxitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/maxitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/maxitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] virtual/ruby-ssl[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/maxitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/maxitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Sass-based Stylesheet Framework
 EAPI=6
 HOMEPAGE=http://compass-style.org/ https://github.com/premailer/css_parser/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] virtual/ruby-ssl[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.5.0.tar.gz -> css_parser-1.5.0.tar.gz
 _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_=c2278a2fb226e5e347dfb9c3e49bdf09
diff --git a/metadata/md5-cache/dev-ruby/curb-0.9.3 b/metadata/md5-cache/dev-ruby/curb-0.9.3
index 6eb6e9ad083e..62422eba29df 100644
--- a/metadata/md5-cache/dev-ruby/curb-0.9.3
+++ b/metadata/md5-cache/dev-ruby/curb-0.9.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-misc/curl[ssl] 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=net-misc/curl[ssl] ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby-language bindings for libcurl
 EAPI=5
 HOMEPAGE=https://github.com/taf2/curb
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=Ruby
-RDEPEND=net-misc/curl[ssl] 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=net-misc/curl[ssl] ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/curb-0.9.3.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_=4bc90086e56757987b187a4a70238839
diff --git a/metadata/md5-cache/dev-ruby/curses-1.1.3 b/metadata/md5-cache/dev-ruby/curses-1.1.3
index 4d64e81519f8..5d5583928ed2 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.1.3
+++ b/metadata/md5-cache/dev-ruby/curses-1.1.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-libs/ncurses:0 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=sys-libs/ncurses:0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby binding for curses, ncurses, and PDCurses
 EAPI=5
 HOMEPAGE=https://github.com/ruby/curses
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Ruby BSD-2 )
-RDEPEND=sys-libs/ncurses:0 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=sys-libs/ncurses:0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/curses-1.1.3.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_=127c9c8aa4acce3dcfc0c77e75a65a0d
diff --git a/metadata/md5-cache/dev-ruby/curses-1.2.1 b/metadata/md5-cache/dev-ruby/curses-1.2.1
index 5d8be03244e0..e723c4902b7d 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.2.1
+++ b/metadata/md5-cache/dev-ruby/curses-1.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-libs/ncurses:0 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=sys-libs/ncurses:0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby binding for curses, ncurses, and PDCurses
 EAPI=5
 HOMEPAGE=https://github.com/ruby/curses
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Ruby BSD-2 )
-RDEPEND=sys-libs/ncurses:0 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=sys-libs/ncurses:0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/curses-1.2.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_=127c9c8aa4acce3dcfc0c77e75a65a0d
diff --git a/metadata/md5-cache/dev-ruby/curses-1.2.2 b/metadata/md5-cache/dev-ruby/curses-1.2.2
index 070606cfe24d..cc9649ed6720 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.2.2
+++ b/metadata/md5-cache/dev-ruby/curses-1.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-libs/ncurses:0 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=sys-libs/ncurses:0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby binding for curses, ncurses, and PDCurses
 EAPI=6
 HOMEPAGE=https://github.com/ruby/curses
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Ruby BSD-2 )
-RDEPEND=sys-libs/ncurses:0 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=sys-libs/ncurses:0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/curses-1.2.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_=2ff0b829141d7367a8379f4acfef1dcd
diff --git a/metadata/md5-cache/dev-ruby/curses-1.2.3 b/metadata/md5-cache/dev-ruby/curses-1.2.3
index d33e064304ae..ae26cfa8b341 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.2.3
+++ b/metadata/md5-cache/dev-ruby/curses-1.2.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-libs/ncurses:0 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=sys-libs/ncurses:0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby binding for curses, ncurses, and PDCurses
 EAPI=6
 HOMEPAGE=https://github.com/ruby/curses
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Ruby BSD-2 )
-RDEPEND=sys-libs/ncurses:0 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=sys-libs/ncurses:0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/curses-1.2.3.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_=2ff0b829141d7367a8379f4acfef1dcd
diff --git a/metadata/md5-cache/dev-ruby/d3_rails-3.5.16 b/metadata/md5-cache/dev-ruby/d3_rails-3.5.16
index 70de38da6394..d5d8bc75ef06 100644
--- a/metadata/md5-cache/dev-ruby/d3_rails-3.5.16
+++ b/metadata/md5-cache/dev-ruby/d3_rails-3.5.16
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.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] ) 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-ruby/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Ruby on Rails integration for the Javascript Data Visualization Framework, D3
 EAPI=5
 HOMEPAGE=https://github.com/logical42/d3_rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64
 LICENSE=MIT BSD
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.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/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.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/d3_rails-3.5.16.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_=211d23cb20d070f5683e317de1e6ac1f
diff --git a/metadata/md5-cache/dev-ruby/d3_rails-3.5.17 b/metadata/md5-cache/dev-ruby/d3_rails-3.5.17
index a6733ce18d9f..9032a338a0ba 100644
--- a/metadata/md5-cache/dev-ruby/d3_rails-3.5.17
+++ b/metadata/md5-cache/dev-ruby/d3_rails-3.5.17
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.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] ) 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-ruby/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Ruby on Rails integration for the Javascript Data Visualization Framework, D3
 EAPI=5
 HOMEPAGE=https://github.com/logical42/d3_rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64
 LICENSE=MIT BSD
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.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/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.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/d3_rails-3.5.17.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_=211d23cb20d070f5683e317de1e6ac1f
diff --git a/metadata/md5-cache/dev-ruby/d3_rails-4.1.1 b/metadata/md5-cache/dev-ruby/d3_rails-4.1.1
index 596ce64aaa7a..9578cb40a82b 100644
--- a/metadata/md5-cache/dev-ruby/d3_rails-4.1.1
+++ b/metadata/md5-cache/dev-ruby/d3_rails-4.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.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] ) 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-ruby/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Ruby on Rails integration for the Javascript Data Visualization Framework, D3
 EAPI=5
 HOMEPAGE=https://github.com/logical42/d3_rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64
 LICENSE=MIT BSD
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.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/railties-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.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=4
 SRC_URI=mirror://rubygems/d3_rails-4.1.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_=9546fa81c4be82b0fe4f7c293bd22524
diff --git a/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1 b/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
index 203f89e2d130..272119d5ab82 100644
--- a/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Library to start and stop specific daemons programmatically in a robust manner
 EAPI=5
 HOMEPAGE=https://github.com/FooBarWidget/daemon_controller
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=amd64 x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/daemon_controller-1.2.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_=110e2259d5c105d2d269bfd6452f7af6
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.2.3 b/metadata/md5-cache/dev-ruby/daemons-1.2.3
index 4241bdcdc08d..ec93ef1c8bc8 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.2.3
+++ b/metadata/md5-cache/dev-ruby/daemons-1.2.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Wrap existing ruby scripts to be run as a daemon
 EAPI=5
 HOMEPAGE=https://github.com/thuehlinger/daemons
-IUSE=examples elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=examples elibc_FreeBSD ruby_targets_ruby22 doc test
 KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/daemons-1.2.3.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_=d0b8cf009f4e3d025709b328ee5df358
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.2.4 b/metadata/md5-cache/dev-ruby/daemons-1.2.4
index 58fba1387ca5..a23a58ebe642 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.2.4
+++ b/metadata/md5-cache/dev-ruby/daemons-1.2.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Wrap existing ruby scripts to be run as a daemon
 EAPI=5
 HOMEPAGE=https://github.com/thuehlinger/daemons
-IUSE=examples elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=examples elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/thuehlinger/daemons/archive/v1.2.4.tar.gz -> daemons-1.2.4.tar.gz
 _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_=8d91285a7ccf1e03723183ac60986294
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.7.6 b/metadata/md5-cache/dev-ruby/dalli-2.7.6
index d02caa3e8efa..27c0bff86ca2 100644
--- a/metadata/md5-cache/dev-ruby/dalli-2.7.6
+++ b/metadata/md5-cache/dev-ruby/dalli-2.7.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=net-misc/memcached-1.4.0 ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] >=dev-ruby/mocha-0.13[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] >=dev-ruby/activesupport-4.1[ruby_targets_ruby21] <dev-ruby/activesupport-5.1[ruby_targets_ruby21] dev-ruby/connection_pool[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/activesupport-4.1[ruby_targets_ruby22] <dev-ruby/activesupport-5.1[ruby_targets_ruby22] dev-ruby/connection_pool[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/activesupport-4.1[ruby_targets_ruby23] <dev-ruby/activesupport-5.1[ruby_targets_ruby23] dev-ruby/connection_pool[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] >=dev-ruby/activesupport-4.1[ruby_targets_ruby24] <dev-ruby/activesupport-5.1[ruby_targets_ruby24] dev-ruby/connection_pool[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( >=net-misc/memcached-1.4.0 ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/activesupport-4.1[ruby_targets_ruby22] <dev-ruby/activesupport-5.1[ruby_targets_ruby22] dev-ruby/connection_pool[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/activesupport-4.1[ruby_targets_ruby23] <dev-ruby/activesupport-5.1[ruby_targets_ruby23] dev-ruby/connection_pool[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] >=dev-ruby/activesupport-4.1[ruby_targets_ruby24] <dev-ruby/activesupport-5.1[ruby_targets_ruby24] dev-ruby/connection_pool[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A high performance pure Ruby client for accessing memcached servers
 EAPI=5
 HOMEPAGE=https://github.com/petergoldstein/dalli
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/petergoldstein/dalli/archive/v2.7.6.tar.gz -> dalli-2.7.6.tar.gz
 _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_=cc267755d6af40d16ad8a620f0cc71c8
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.5.3 b/metadata/md5-cache/dev-ruby/database_cleaner-1.5.3
index 3f3e1922af2d..2669814979ff 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.5.3
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.5.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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? ( 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? ( 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=Strategies for cleaning databases
 EAPI=5
 HOMEPAGE=https://github.com/bmabey/database_cleaner
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-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/database_cleaner-1.5.3.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_=bccc4884d529207f78ae6b346f16fd8d
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.6.0 b/metadata/md5-cache/dev-ruby/database_cleaner-1.6.0
index 006f44de43bd..01abbf4609fc 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.6.0
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Strategies for cleaning databases
 EAPI=6
 HOMEPAGE=https://github.com/bmabey/database_cleaner
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/database_cleaner-1.6.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_=6cb7a57e45b78a60690986fc0546bb52
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.6.1 b/metadata/md5-cache/dev-ruby/database_cleaner-1.6.1
index 72988c7abdf7..9b7fa2951e65 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.6.1
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.6.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Strategies for cleaning databases
 EAPI=6
 HOMEPAGE=https://github.com/bmabey/database_cleaner
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/database_cleaner-1.6.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_=6cb7a57e45b78a60690986fc0546bb52
diff --git a/metadata/md5-cache/dev-ruby/date_validator-0.9.0 b/metadata/md5-cache/dev-ruby/date_validator-0.9.0
index fbc074737d0f..fa840943f8fc 100644
--- a/metadata/md5-cache/dev-ruby/date_validator-0.9.0
+++ b/metadata/md5-cache/dev-ruby/date_validator-0.9.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby21] >=dev-ruby/activesupport-3.0[ruby_targets_ruby21] ) doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby22] >=dev-ruby/activesupport-3.0[ruby_targets_ruby22] ) doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby23] >=dev-ruby/activesupport-3.0[ruby_targets_ruby23] ) doc? ( dev-ruby/yard[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby22] >=dev-ruby/activesupport-3.0[ruby_targets_ruby22] ) doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] >=dev-ruby/tzinfo-0.3[ruby_targets_ruby23] >=dev-ruby/activesupport-3.0[ruby_targets_ruby23] ) doc? ( dev-ruby/yard[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails 3
 EAPI=5
 HOMEPAGE=https://github.com/codegram/date_validator
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-3.0:*[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/activemodel-3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-3.0:*[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=3
 SRC_URI=mirror://rubygems/date_validator-0.9.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_=c3e7c72c1ee879a5c07ead727d09cef0
diff --git a/metadata/md5-cache/dev-ruby/dbf-2.0.13 b/metadata/md5-cache/dev-ruby/dbf-2.0.13
index ca3925b14582..8ea4b0157f6b 100644
--- a/metadata/md5-cache/dev-ruby/dbf-2.0.13
+++ b/metadata/md5-cache/dev-ruby/dbf-2.0.13
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=a small fast library for reading dBase, xBase, Clipper and FoxPro database files
 EAPI=5
 HOMEPAGE=https://github.com/infused/dbf
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/dbf-2.0.13.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_=8c668b9643d1c387bbd9509a1edb0159
diff --git a/metadata/md5-cache/dev-ruby/dbf-3.0.8 b/metadata/md5-cache/dev-ruby/dbf-3.0.8
index 8937d14229a4..f0d5848b9310 100644
--- a/metadata/md5-cache/dev-ruby/dbf-3.0.8
+++ b/metadata/md5-cache/dev-ruby/dbf-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=a small fast library for reading dBase, xBase, Clipper and FoxPro database files
 EAPI=5
 HOMEPAGE=https://github.com/infused/dbf
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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/dbf-3.0.8.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_=201d9ae7655099f8df6469ffa2b4faaa
diff --git a/metadata/md5-cache/dev-ruby/dbf-3.1.0 b/metadata/md5-cache/dev-ruby/dbf-3.1.0
index 565f83f06aef..6c1845cb316c 100644
--- a/metadata/md5-cache/dev-ruby/dbf-3.1.0
+++ b/metadata/md5-cache/dev-ruby/dbf-3.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=a small fast library for reading dBase, xBase, Clipper and FoxPro database files
 EAPI=5
 HOMEPAGE=https://github.com/infused/dbf
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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/dbf-3.1.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_=09fa79f0ca3c3bff190df23dc634f7b8
diff --git a/metadata/md5-cache/dev-ruby/ddplugin-1.0.1 b/metadata/md5-cache/dev-ruby/ddplugin-1.0.1
index 305f89aac9a2..43cf1f2b7402 100644
--- a/metadata/md5-cache/dev-ruby/ddplugin-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ddplugin-1.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Provides plugin management for Ruby projects
 EAPI=5
 HOMEPAGE=https://github.com/ddfreyne/ddplugin/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/ddplugin-1.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_=3866b8f5000ad56990acbe371971a976
diff --git a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2 b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2
index 53cd7dcc2637..0fd344d2eb06 100644
--- a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2
+++ b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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? ( 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? ( 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=A Ruby wrapper for the MRI 2.0 debug_inspector API
 EAPI=5
 HOMEPAGE=https://github.com/banister/debug_inspector
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/debug_inspector-0.0.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_=a53a6313756ba765c6e6f7b3ab618f02
diff --git a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3 b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3
index e19bcf8de09f..b1a672771f79 100644
--- a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3
+++ b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Ruby wrapper for the MRI 2.0 debug_inspector API
 EAPI=6
 HOMEPAGE=https://github.com/banister/debug_inspector
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/debug_inspector-0.0.3.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_=c218063d526fc3af0935f636db08374c
diff --git a/metadata/md5-cache/dev-ruby/debugger-linecache-1.2.0 b/metadata/md5-cache/dev-ruby/debugger-linecache-1.2.0
index 299dd77e8fb0..9f2e650128a9 100644
--- a/metadata/md5-cache/dev-ruby/debugger-linecache-1.2.0
+++ b/metadata/md5-cache/dev-ruby/debugger-linecache-1.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A module to read and cache file information of a Ruby program
 EAPI=5
 HOMEPAGE=https://github.com/cldwalker/debugger-linecache
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/debugger-linecache-1.2.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_=f1852f6dba375d1113efb34ffa85b521
diff --git a/metadata/md5-cache/dev-ruby/deep_merge-1.0.1 b/metadata/md5-cache/dev-ruby/deep_merge-1.0.1
index f48086c35cb5..7e37ee4f17d0 100644
--- a/metadata/md5-cache/dev-ruby/deep_merge-1.0.1
+++ b/metadata/md5-cache/dev-ruby/deep_merge-1.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=A simple set of utility functions for Hash
 EAPI=5
 HOMEPAGE=http://trac.misuse.org/science/wiki/DeepMerge
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=amd64 hppa x86
 LICENSE=MIT
-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/deep_merge-1.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_=cb9b4167096c7b96436b545874c06561
diff --git a/metadata/md5-cache/dev-ruby/deep_merge-1.1.1 b/metadata/md5-cache/dev-ruby/deep_merge-1.1.1
index 581bbc3411d3..3df3baa553a6 100644
--- a/metadata/md5-cache/dev-ruby/deep_merge-1.1.1
+++ b/metadata/md5-cache/dev-ruby/deep_merge-1.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A simple set of utility functions for Hash
 EAPI=5
 HOMEPAGE=http://trac.misuse.org/science/wiki/DeepMerge
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/deep_merge-1.1.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_=634479b82d08f37a6f467d3c8c378230
diff --git a/metadata/md5-cache/dev-ruby/delayer-0.0.2 b/metadata/md5-cache/dev-ruby/delayer-0.0.2
index 1fc6f57a5a66..e178e5161f10 100644
--- a/metadata/md5-cache/dev-ruby/delayer-0.0.2
+++ b/metadata/md5-cache/dev-ruby/delayer-0.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Delay the processing
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/delayer
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/delayer-0.0.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_=1103a1fe22f27b48ee9ac06c1a275bad
diff --git a/metadata/md5-cache/dev-ruby/delayer-deferred-1.1.1 b/metadata/md5-cache/dev-ruby/delayer-deferred-1.1.1
index f9e7315168aa..486a9182ca54 100644
--- a/metadata/md5-cache/dev-ruby/delayer-deferred-1.1.1
+++ b/metadata/md5-cache/dev-ruby/delayer-deferred-1.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby implementation of JSDeferred
 EAPI=5
 HOMEPAGE=https://github.com/toshia/delayer-deferred
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/delayer-deferred-1.1.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_=f2af1273200203c08b840e69b5072ce0
diff --git a/metadata/md5-cache/dev-ruby/delayer-deferred-2.0.0 b/metadata/md5-cache/dev-ruby/delayer-deferred-2.0.0
index 26ad3cce6a54..c32084c47416 100644
--- a/metadata/md5-cache/dev-ruby/delayer-deferred-2.0.0
+++ b/metadata/md5-cache/dev-ruby/delayer-deferred-2.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby implementation of JSDeferred
 EAPI=6
 HOMEPAGE=https://github.com/toshia/delayer-deferred
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/delayer-deferred-2.0.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_=56874a588aa92490dd4812f1603e2b06
diff --git a/metadata/md5-cache/dev-ruby/dep_selector-0.1.1-r1 b/metadata/md5-cache/dev-ruby/dep_selector-0.1.1-r1
index a0283e432cb7..5fade4099b74 100644
--- a/metadata/md5-cache/dev-ruby/dep_selector-0.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/dep_selector-0.1.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/gecode-3.5.0 <dev-libs/gecode-4 test? ( ruby_targets_ruby21? ( dev-ruby/uuidtools[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/uuidtools[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/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_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=>=dev-libs/gecode-3.5.0 <dev-libs/gecode-4 test? ( ruby_targets_ruby22? ( dev-ruby/uuidtools[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=constraint based package dependency resolver
 EAPI=5
 HOMEPAGE=https://github.com/opscode/dep-selector
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/gecode-3.5.0 <dev-libs/gecode-4 ruby_targets_ruby21? ( dev-ruby/uuidtools[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/uuidtools[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=>=dev-libs/gecode-3.5.0 <dev-libs/gecode-4 ruby_targets_ruby22? ( dev-ruby/uuidtools[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=https://github.com/opscode/dep-selector/archive/0.1.1.tar.gz -> dep_selector-0.1.1.tar.gz
 _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_=2aa86f67ee86090cfe974129685c7f39
diff --git a/metadata/md5-cache/dev-ruby/dep_selector-1.0.5 b/metadata/md5-cache/dev-ruby/dep_selector-1.0.5
index 9f68b0e49ee5..18a0564b3969 100644
--- a/metadata/md5-cache/dev-ruby/dep_selector-1.0.5
+++ b/metadata/md5-cache/dev-ruby/dep_selector-1.0.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/gecode-3.5.0 <dev-libs/gecode-4 test? ( ruby_targets_ruby21? ( >=dev-ruby/ffi-1.9[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ffi-1.9[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.9[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ffi-1.9[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=>=dev-libs/gecode-3.5.0 <dev-libs/gecode-4 test? ( ruby_targets_ruby22? ( >=dev-ruby/ffi-1.9[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.9[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ffi-1.9[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=constraint based package dependency resolver
 EAPI=6
 HOMEPAGE=https://github.com/opscode/dep-selector
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/gecode-3.5.0 <dev-libs/gecode-4 ruby_targets_ruby21? ( >=dev-ruby/ffi-1.9[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ffi-1.9[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.9[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ffi-1.9[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=dev-libs/gecode-3.5.0 <dev-libs/gecode-4 ruby_targets_ruby22? ( >=dev-ruby/ffi-1.9[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.9[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ffi-1.9[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/opscode/dep-selector/archive/1.0.5.tar.gz -> dep_selector-1.0.5.tar.gz
 _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_=71ad095a9c5233d87706cf00681f4230
diff --git a/metadata/md5-cache/dev-ruby/dependor-1.0.1 b/metadata/md5-cache/dev-ruby/dependor-1.0.1
index 1f09e2e17066..995a0af8355a 100644
--- a/metadata/md5-cache/dev-ruby/dependor-1.0.1
+++ b/metadata/md5-cache/dev-ruby/dependor-1.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Reduces duplication when doing manual dependency injection
 EAPI=6
 HOMEPAGE=https://github.com/psyho/dependor
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/dependor-1.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_=cddddec9a7b52ab281b99852409a114c
diff --git a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2 b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
index e82964067509..3ad707ecf822 100644
--- a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit: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] ) 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/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit: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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A Ruby library for handling deprecated code
 EAPI=5
 HOMEPAGE=https://github.com/erikh/deprecated
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ppc x86
 LICENSE=BSD
-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=3
 SRC_URI=mirror://rubygems/deprecated-3.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_=ff7ce41f73190f3c89334b4409694316
diff --git a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4 b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
index 91b0a395d98d..3531c27aef81 100644
--- a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
+++ b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/thread_safe[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/thread_safe[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/thread_safe[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/thread_safe[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/thread_safe[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/thread_safe[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/thread_safe[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Module that adds descendant tracking to a class
 EAPI=5
 HOMEPAGE=https://github.com/dkubb/descendants_tracker
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/thread_safe[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/thread_safe[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/thread_safe[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/thread_safe[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/thread_safe[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/thread_safe[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/thread_safe[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/descendants_tracker-0.0.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_=3270ab06196144d2d74e20eba2029d37
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.0.2 b/metadata/md5-cache/dev-ruby/did_you_mean-1.0.2
index 3804a95e80fd..c985cb32f3bd 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.0.2
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/did_you_mean-1.0.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_=079691d3631dd62ee42dccd3b056a20b
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.1.0 b/metadata/md5-cache/dev-ruby/did_you_mean-1.1.0
index 6aa63a05571f..6a04e57a8def 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.1.0
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 )
 SLOT=2.4
 SRC_URI=mirror://rubygems/did_you_mean-1.1.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_=5d5ad1135bdc23550b0ee7665c0c87a4
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.1.2 b/metadata/md5-cache/dev-ruby/did_you_mean-1.1.2
index e0c6e13899e7..08e300fc51ec 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.1.2
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 )
 SLOT=2.4
 SRC_URI=mirror://rubygems/did_you_mean-1.1.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_=ee0bf632c06b4f7bdffbf819cef57ceb
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1 b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
index 85621ed4cedc..8731d4d503f2 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Use the McIlroy-Hunt LCS algorithm to compute differences
 EAPI=5
 HOMEPAGE=https://github.com/halostatue/diff-lcs
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MIT Ruby GPL-2 )
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/diff-lcs-1.2.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_=58f0e1454246e2a24ba4b2fc0cb59019
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.3 b/metadata/md5-cache/dev-ruby/diff-lcs-1.3
index e87acba9576a..f161213f2093 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.3
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Use the McIlroy-Hunt LCS algorithm to compute differences
 EAPI=5
 HOMEPAGE=https://github.com/halostatue/diff-lcs
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MIT Ruby GPL-2 )
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/diff-lcs-1.3.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_=6916a23fad11753fd9830d0d6dc142bb
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.59.3 b/metadata/md5-cache/dev-ruby/dnsruby-1.59.3
index f376f369649a..bec623cbccd4 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.59.3
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.59.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.4:5[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( 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/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.4:5[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( 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=A pure Ruby DNS client library
 EAPI=5
 HOMEPAGE=https://github.com/alexdalitz/dnsruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-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/dnsruby-1.59.3.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_=c706f1f8f7179759fbc510dcb82bfdfb
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.60.0 b/metadata/md5-cache/dev-ruby/dnsruby-1.60.0
index 8d5911b95228..0d1d79558413 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.60.0
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.60.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.4:5[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( 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/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.4:5[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( 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=A pure Ruby DNS client library
 EAPI=5
 HOMEPAGE=https://github.com/alexdalitz/dnsruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-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/dnsruby-1.60.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_=c706f1f8f7179759fbc510dcb82bfdfb
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.60.1 b/metadata/md5-cache/dev-ruby/dnsruby-1.60.1
index 55113c864b87..b672b8f53c3b 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.60.1
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.60.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A pure Ruby DNS client library
 EAPI=6
 HOMEPAGE=https://github.com/alexdalitz/dnsruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/dnsruby-1.60.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_=2d7bfdb115dc47353c8f3057bf773959
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.60.2 b/metadata/md5-cache/dev-ruby/dnsruby-1.60.2
index 0d7b02d5bc03..eb9ca4a54212 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.60.2
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.60.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A pure Ruby DNS client library
 EAPI=6
 HOMEPAGE=https://github.com/alexdalitz/dnsruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/dnsruby-1.60.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_=2d7bfdb115dc47353c8f3057bf773959
diff --git a/metadata/md5-cache/dev-ruby/docile-1.1.5 b/metadata/md5-cache/dev-ruby/docile-1.1.5
index 6cf11f8b91b9..e698eefe3412 100644
--- a/metadata/md5-cache/dev-ruby/docile-1.1.5
+++ b/metadata/md5-cache/dev-ruby/docile-1.1.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Turns any Ruby object into a DSL
 EAPI=5
 HOMEPAGE=https://ms-ati.github.io/docile/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/docile-1.1.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_=b43199719ef469f41dbcfbf34e638341
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20161021 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20161021
index 46d40b1d0bfd..6dc6d8a8b900 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20161021
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.20161021
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby21] dev-ruby/shoulda[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby22] dev-ruby/shoulda[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby23] dev-ruby/shoulda[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] ) 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-ruby/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby22] dev-ruby/shoulda[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby23] dev-ruby/shoulda[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Domain Name manipulation library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/knu/ruby-domain_name
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/unf-0.0.5-r1:0[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/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/unf-0.0.5-r1:0[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/domain_name-0.5.20161021.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_=003d675bb444291b1aa26f81b9784d32
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20161129 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20161129
index f6634d640a05..ba1a57775bca 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20161129
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.20161129
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby21] dev-ruby/shoulda[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby22] dev-ruby/shoulda[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby23] dev-ruby/shoulda[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] ) 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-ruby/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby22] dev-ruby/shoulda[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby23] dev-ruby/shoulda[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Domain Name manipulation library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/knu/ruby-domain_name
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/unf-0.0.5-r1:0[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/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/unf-0.0.5-r1:0[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/domain_name-0.5.20161129.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_=003d675bb444291b1aa26f81b9784d32
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20170223 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20170223
index bb2b3eb042f1..e197c797ee85 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20170223
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.20170223
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby21] dev-ruby/shoulda[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby22] dev-ruby/shoulda[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby23] dev-ruby/shoulda[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] ) 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-ruby/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby22] dev-ruby/shoulda[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby23] dev-ruby/shoulda[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Domain Name manipulation library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/knu/ruby-domain_name
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/unf-0.0.5-r1:0[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/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/unf-0.0.5-r1:0[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/domain_name-0.5.20170223.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_=74df6cc257e9b124cbad3ce3b2d6fbe0
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20170404 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20170404
index 0ecf8db5d747..e37f884729e5 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20170404
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.20170404
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby21] dev-ruby/shoulda[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby22] dev-ruby/shoulda[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby23] dev-ruby/shoulda[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby24] dev-ruby/shoulda[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby22] dev-ruby/shoulda[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby23] dev-ruby/shoulda[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby24] dev-ruby/shoulda[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Domain Name manipulation library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/knu/ruby-domain_name
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/domain_name-0.5.20170404.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_=319139de8121c4dbe046586eaa734a69
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.24 b/metadata/md5-cache/dev-ruby/domain_name-0.5.24
index 28b8dd1afc8c..b41109402c67 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.24
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.24
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby21] dev-ruby/shoulda[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby22] dev-ruby/shoulda[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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby22] dev-ruby/shoulda[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Domain Name manipulation library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/knu/ruby-domain_name
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/unf-0.0.5-r1:0[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/unf-0.0.5-r1:0[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/domain_name-0.5.24.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_=c5ad6f2f06e688a1da6a0349e9575cba
diff --git a/metadata/md5-cache/dev-ruby/dotenv-2.2.1 b/metadata/md5-cache/dev-ruby/dotenv-2.2.1
index 56f9a78bd2ad..3cb9194650f7 100644
--- a/metadata/md5-cache/dev-ruby/dotenv-2.2.1
+++ b/metadata/md5-cache/dev-ruby/dotenv-2.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/spring[ruby_targets_ruby21] dev-ruby/rails[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/spring[ruby_targets_ruby22] dev-ruby/rails[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/spring[ruby_targets_ruby23] dev-ruby/rails[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/spring[ruby_targets_ruby22] dev-ruby/rails[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/spring[ruby_targets_ruby23] dev-ruby/rails[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=Loads environment variables from .env into ENV
 EAPI=6
 HOMEPAGE=https://github.com/bkeepers/dotenv
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=2
 SRC_URI=https://github.com/bkeepers/dotenv/archive/v2.2.1.tar.gz -> dotenv-2.2.1.tar.gz
 _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_=68a044b4916a2a68bb1641bbd096a890
diff --git a/metadata/md5-cache/dev-ruby/dust-0.1.7-r2 b/metadata/md5-cache/dev-ruby/dust-0.1.7-r2
index 88db982fd835..558976009638 100644
--- a/metadata/md5-cache/dev-ruby/dust-0.1.7-r2
+++ b/metadata/md5-cache/dev-ruby/dust-0.1.7-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Descriptive block syntax definition for Test::Unit
 EAPI=5
 HOMEPAGE=http://dust.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=amd64 x86
 LICENSE=MIT
-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/dust-0.1.7.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_=fb20d7a2c5efb8d70449f18ed1cd1bf3
diff --git a/metadata/md5-cache/dev-ruby/equalizer-0.0.11 b/metadata/md5-cache/dev-ruby/equalizer-0.0.11
index a2c9fb4495e1..f81847fb26ef 100644
--- a/metadata/md5-cache/dev-ruby/equalizer-0.0.11
+++ b/metadata/md5-cache/dev-ruby/equalizer-0.0.11
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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: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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) 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=Module to define equality, equivalence and inspection methods
 EAPI=5
 HOMEPAGE=https://github.com/dkubb/equalizer
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/equalizer-0.0.11.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_=371a46df5723262903aae3d952bc9e55
diff --git a/metadata/md5-cache/dev-ruby/erubi-1.6.0 b/metadata/md5-cache/dev-ruby/erubi-1.6.0
index 39c794decf0f..881d5eaf1653 100644
--- a/metadata/md5-cache/dev-ruby/erubi-1.6.0
+++ b/metadata/md5-cache/dev-ruby/erubi-1.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=a ERB template engine for ruby; a simplified fork of Erubis
 EAPI=6
 HOMEPAGE=https://github.com/jeremyevans/erubi
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/erubi-1.6.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_=fa110af633b026a07a35897ac97f4012
diff --git a/metadata/md5-cache/dev-ruby/erubi-1.6.1 b/metadata/md5-cache/dev-ruby/erubi-1.6.1
index a8c60ba8164b..055d64ce2d99 100644
--- a/metadata/md5-cache/dev-ruby/erubi-1.6.1
+++ b/metadata/md5-cache/dev-ruby/erubi-1.6.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=a ERB template engine for ruby; a simplified fork of Erubis
 EAPI=6
 HOMEPAGE=https://github.com/jeremyevans/erubi
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/erubi-1.6.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_=a0ff4f6a916b9fc9b709bd14a37de9cb
diff --git a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2 b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
index 01af037b2101..090e94deb6d8 100644
--- a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
+++ b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Erubis is an implementation of eRuby
 EAPI=5
 HOMEPAGE=http://www.kuwata-lab.com/erubis/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/erubis-2.7.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_=8f46ac5d3d7a92ff0f275284ac1518e3
diff --git a/metadata/md5-cache/dev-ruby/escape_utils-1.2.0 b/metadata/md5-cache/dev-ruby/escape_utils-1.2.0
index 27a586cf6808..a473df7c6fc4 100644
--- a/metadata/md5-cache/dev-ruby/escape_utils-1.2.0
+++ b/metadata/md5-cache/dev-ruby/escape_utils-1.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[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] ) 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/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Faster string escaping routines for your ruby apps
 EAPI=5
 HOMEPAGE=https://github.com/brianmario/escape_utils
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/escape_utils-1.2.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_=85a65e204b97a293283b2defb3e9887e
diff --git a/metadata/md5-cache/dev-ruby/escape_utils-1.2.1 b/metadata/md5-cache/dev-ruby/escape_utils-1.2.1
index 939ef59b0b41..7d17770232e6 100644
--- a/metadata/md5-cache/dev-ruby/escape_utils-1.2.1
+++ b/metadata/md5-cache/dev-ruby/escape_utils-1.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[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] ) 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/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Faster string escaping routines for your ruby apps
 EAPI=5
 HOMEPAGE=https://github.com/brianmario/escape_utils
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/escape_utils-1.2.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_=85a65e204b97a293283b2defb3e9887e
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.10.1 b/metadata/md5-cache/dev-ruby/ethon-0.10.1
index cc6b079b2b97..52bfef882f83 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.10.1
+++ b/metadata/md5-cache/dev-ruby/ethon-0.10.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/sinatra[ruby_targets_ruby21] dev-ruby/mime-types[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sinatra[ruby_targets_ruby22] dev-ruby/mime-types[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sinatra[ruby_targets_ruby23] dev-ruby/mime-types[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sinatra[ruby_targets_ruby22] dev-ruby/mime-types[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sinatra[ruby_targets_ruby23] dev-ruby/mime-types[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: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=Very lightweight libcurl wrapper
 EAPI=5
 HOMEPAGE=https://github.com/typhoeus/ethon
-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 ~x86
 LICENSE=MIT
-RDEPEND=net-misc/curl ruby_targets_ruby21? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.3.0[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=net-misc/curl ruby_targets_ruby22? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.3.0[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/ethon-0.10.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_=96ea2075dfe80141b24f247cd04e134b
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.9.1 b/metadata/md5-cache/dev-ruby/ethon-0.9.1
index 0c901f8dbd33..891341681131 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.9.1
+++ b/metadata/md5-cache/dev-ruby/ethon-0.9.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/sinatra[ruby_targets_ruby21] dev-ruby/mime-types[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sinatra[ruby_targets_ruby22] dev-ruby/mime-types[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sinatra[ruby_targets_ruby23] dev-ruby/mime-types[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sinatra[ruby_targets_ruby22] dev-ruby/mime-types[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sinatra[ruby_targets_ruby23] dev-ruby/mime-types[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: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=Very lightweight libcurl wrapper
 EAPI=5
 HOMEPAGE=https://github.com/typhoeus/ethon
-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
 LICENSE=MIT
-RDEPEND=net-misc/curl ruby_targets_ruby21? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.3.0[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=net-misc/curl ruby_targets_ruby22? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.3.0[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/ethon-0.9.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_=3106d2bbf5f20b40b3e58bbe7c3d3be1
diff --git a/metadata/md5-cache/dev-ruby/evented-spec-0.9.0 b/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
index a9b5c92be5ca..7adf44353c8a 100644
--- a/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
+++ b/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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=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=A set of helpers to help you test your asynchronous code
 EAPI=5
 HOMEPAGE=https://github.com/ruby-amqp/evented-spec
-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 ~x86
 LICENSE=MIT
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/evented-spec-0.9.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_=59f7e6b38ea6c2bae4bcfca79cc2a455
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1 b/metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1
index 782d5338d513..525d47b23567 100644
--- a/metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1
+++ b/metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/openssl:0 ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=dev-libs/openssl:0 ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=EventMachine is a fast, simple event-processing library for Ruby programs
 EAPI=5
 HOMEPAGE=http://rubyeventmachine.com
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=dev-libs/openssl:0 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=dev-libs/openssl:0 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/eventmachine-1.0.9.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_=00d39dc2c8ab693f670a89933dde0b19
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-1.2.0.1 b/metadata/md5-cache/dev-ruby/eventmachine-1.2.0.1
index ea5f55a309ff..f3833541af8d 100644
--- a/metadata/md5-cache/dev-ruby/eventmachine-1.2.0.1
+++ b/metadata/md5-cache/dev-ruby/eventmachine-1.2.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/openssl:0 ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit: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? ( 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/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=dev-libs/openssl:0 ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[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/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=EventMachine is a fast, simple event-processing library for Ruby programs
 EAPI=5
 HOMEPAGE=http://rubyeventmachine.com
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=dev-libs/openssl:0 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=dev-libs/openssl:0 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/eventmachine-1.2.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_=5dfb1ec294dd630f49571c3e4377ff06
diff --git a/metadata/md5-cache/dev-ruby/execjs-1.4.0 b/metadata/md5-cache/dev-ruby/execjs-1.4.0
index 357702772c5c..c72505171262 100644
--- a/metadata/md5-cache/dev-ruby/execjs-1.4.0
+++ b/metadata/md5-cache/dev-ruby/execjs-1.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.0[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.0[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=ExecJS lets you run JavaScript code from Ruby
 EAPI=5
 HOMEPAGE=https://github.com/sstephenson/execjs
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby22] ) || ( net-libs/nodejs ) 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/multi_json-1.0[ruby_targets_ruby22] ) || ( net-libs/nodejs ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=https://github.com/sstephenson/execjs/tarball/v1.4.0 -> execjs-1.4.0-git.tgz
 _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_=4c2d194cd80644102a832a8e587183cb
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.6.0 b/metadata/md5-cache/dev-ruby/execjs-2.6.0
index d2bae1acb2e2..fdc26d20a1dc 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.6.0
+++ b/metadata/md5-cache/dev-ruby/execjs-2.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=ExecJS lets you run JavaScript code from Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rails/execjs
-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 ppc ppc64 x86 ~amd64-linux ~x64-macos
 LICENSE=MIT
-RDEPEND=|| ( net-libs/nodejs ) 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=|| ( net-libs/nodejs ) 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=https://github.com/rails/execjs/archive/v2.6.0.tar.gz -> execjs-2.6.0.tar.gz
 _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_=846eb7641584da5cfb6a28649d8e6b35
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.7.0 b/metadata/md5-cache/dev-ruby/execjs-2.7.0
index 8bcd532f524f..9699bf6c4da0 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.7.0
+++ b/metadata/md5-cache/dev-ruby/execjs-2.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=ExecJS lets you run JavaScript code from Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rails/execjs
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=MIT
-RDEPEND=|| ( net-libs/nodejs ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=|| ( net-libs/nodejs ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.7.0.tar.gz -> execjs-2.7.0.tar.gz
 _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_=46b204f225a3f319f4eab6588069809d
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.2.6 b/metadata/md5-cache/dev-ruby/exifr-1.2.6
index a8c56c79f2ec..02a28ba4c340 100644
--- a/metadata/md5-cache/dev-ruby/exifr-1.2.6
+++ b/metadata/md5-cache/dev-ruby/exifr-1.2.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A library to read EXIF info from JPEG and TIFF images
 EAPI=6
 HOMEPAGE=https://github.com/remvee/exifr/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/exifr-1.2.6.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_=7a6c1f37f8e17690904029a0c5127400
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.3.0 b/metadata/md5-cache/dev-ruby/exifr-1.3.0
index 9ce85547adab..3808de25e7fd 100644
--- a/metadata/md5-cache/dev-ruby/exifr-1.3.0
+++ b/metadata/md5-cache/dev-ruby/exifr-1.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A library to read EXIF info from JPEG and TIFF images
 EAPI=6
 HOMEPAGE=https://github.com/remvee/exifr/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/exifr-1.3.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_=7a6c1f37f8e17690904029a0c5127400
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.3.1 b/metadata/md5-cache/dev-ruby/exifr-1.3.1
index fec4e05c576b..495694799d35 100644
--- a/metadata/md5-cache/dev-ruby/exifr-1.3.1
+++ b/metadata/md5-cache/dev-ruby/exifr-1.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A library to read EXIF info from JPEG and TIFF images
 EAPI=6
 HOMEPAGE=https://github.com/remvee/exifr/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/exifr-1.3.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_=7a6c1f37f8e17690904029a0c5127400
diff --git a/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518 b/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518
index afacbb389acd..02367d665c6f 100644
--- a/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518
+++ b/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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: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=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: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=A math parser
 EAPI=5
 HOMEPAGE=http://lukaszwrobel.pl/blog/math-parser-part-3-implementation
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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=https://github.com/nricciar/expression_parser/archive/6e3c7973423ff0f2cd33db2304fcd4eac3af01ad.tar.gz -> expression_parser-0.9.0_p20130518.tar.gz
 _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_=e7e438b10393d9aeb329f9a6d7b026b1
diff --git a/metadata/md5-cache/dev-ruby/facets-3.1.0 b/metadata/md5-cache/dev-ruby/facets-3.1.0
index c9904ddf0c06..62a6ffac4be8 100644
--- a/metadata/md5-cache/dev-ruby/facets-3.1.0
+++ b/metadata/md5-cache/dev-ruby/facets-3.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/ae[ruby_targets_ruby21] dev-ruby/lemon[ruby_targets_ruby21] dev-ruby/rubytest[ruby_targets_ruby21] dev-ruby/rubytest-cli[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/ae[ruby_targets_ruby22] dev-ruby/lemon[ruby_targets_ruby22] dev-ruby/rubytest[ruby_targets_ruby22] dev-ruby/rubytest-cli[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ae[ruby_targets_ruby23] dev-ruby/lemon[ruby_targets_ruby23] dev-ruby/rubytest[ruby_targets_ruby23] dev-ruby/rubytest-cli[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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/ae[ruby_targets_ruby22] dev-ruby/lemon[ruby_targets_ruby22] dev-ruby/rubytest[ruby_targets_ruby22] dev-ruby/rubytest-cli[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ae[ruby_targets_ruby23] dev-ruby/lemon[ruby_targets_ruby23] dev-ruby/rubytest[ruby_targets_ruby23] dev-ruby/rubytest-cli[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=Facets is the premier collection of extension methods for Ruby
 EAPI=5
 HOMEPAGE=https://rubyworks.github.io/facets/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 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/facets-3.1.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_=47df9c905deea7e00bbcaa0c0bd6426f
diff --git a/metadata/md5-cache/dev-ruby/facter-2.4.6 b/metadata/md5-cache/dev-ruby/facter-2.4.6
index 34e1c51b0894..af9e83be6c8c 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.4.6
+++ b/metadata/md5-cache/dev-ruby/facter-2.4.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:1.0[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? ( app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:1.0[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=A cross-platform Ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=amd64 hppa ppc ppc64 ~sparc x86
 LICENSE=Apache-2.0
-RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) 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=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) 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/facter-2.4.6.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_=e56da6d4857d867294e0f819c1827706
diff --git a/metadata/md5-cache/dev-ruby/facter-2.5.0 b/metadata/md5-cache/dev-ruby/facter-2.5.0
index dfb623191a3c..b24134e89018 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.5.0
+++ b/metadata/md5-cache/dev-ruby/facter-2.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:1.0[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? ( app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:1.0[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=A cross-platform Ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) 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=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) 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/facter-2.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_=29a9794d595c1d187aa41bb57021429c
diff --git a/metadata/md5-cache/dev-ruby/facter-3.1.8 b/metadata/md5-cache/dev-ruby/facter-3.1.8
index db52b2384c4a..f2a078b81b0a 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.1.8
+++ b/metadata/md5-cache/dev-ruby/facter-3.1.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-libs/leatherman-0.4.2 >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl !<app-admin/puppet-4.0.0 ) sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DEPEND=test? ( >=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-libs/leatherman-0.4.2 >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl !<app-admin/puppet-4.0.0 ) sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=debug test elibc_FreeBSD ruby_targets_ruby22
 KEYWORDS=amd64 hppa ppc ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-libs/leatherman-0.4.2 >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl !<app-admin/puppet-4.0.0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-libs/leatherman-0.4.2 >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.1.8.tar.gz -> facter-3.1.8.tar.gz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:- src_configure:- src_compile:ruby-ng src_test:ruby-ng src_install:-
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b1e7a5e7b4e4558cf810e5297d10870b
diff --git a/metadata/md5-cache/dev-ruby/facter-3.6.3 b/metadata/md5-cache/dev-ruby/facter-3.6.3
index 6e77798fa1ed..8bad4996aea7 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.6.3
+++ b/metadata/md5-cache/dev-ruby/facter-3.6.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-0.9.3 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-0.9.3 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=debug test elibc_FreeBSD ruby_targets_ruby22
 KEYWORDS=amd64 hppa ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.6.3.tar.gz -> facter-3.6.3.tar.gz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8d2492592e36c975631bafdb8464f71b
diff --git a/metadata/md5-cache/dev-ruby/facter-3.6.4 b/metadata/md5-cache/dev-ruby/facter-3.6.4
index 6c83f825fd56..048cf46f2d7b 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.6.4
+++ b/metadata/md5-cache/dev-ruby/facter-3.6.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-libs/leatherman-0.9.3 >=dev-cpp/yaml-cpp-0.5.1 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-libs/leatherman-0.9.3 >=dev-cpp/yaml-cpp-0.5.1 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=debug test elibc_FreeBSD ruby_targets_ruby22
 KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl !<app-admin/puppet-4.0.0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.6.4.tar.gz -> facter-3.6.4.tar.gz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d41130a314dbbe8f93813f28b542755e
diff --git a/metadata/md5-cache/dev-ruby/facter-3.6.5 b/metadata/md5-cache/dev-ruby/facter-3.6.5
index 696b12f87f94..39ea1eff9c80 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.6.5
+++ b/metadata/md5-cache/dev-ruby/facter-3.6.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=debug test elibc_FreeBSD ruby_targets_ruby22
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.6.5.tar.gz -> facter-3.6.5.tar.gz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ace2f15f86bedb5a06bbffcbfeee8236
diff --git a/metadata/md5-cache/dev-ruby/facter-3.6.6 b/metadata/md5-cache/dev-ruby/facter-3.6.6
index 0cf0d570bf26..ef7c50a65016 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.6.6
+++ b/metadata/md5-cache/dev-ruby/facter-3.6.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=debug test elibc_FreeBSD ruby_targets_ruby22
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.6.6.tar.gz -> facter-3.6.6.tar.gz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ace2f15f86bedb5a06bbffcbfeee8236
diff --git a/metadata/md5-cache/dev-ruby/facter-3.7.1 b/metadata/md5-cache/dev-ruby/facter-3.7.1
index 8bc9ae20196d..7bc06c6eef82 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.7.1
+++ b/metadata/md5-cache/dev-ruby/facter-3.7.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 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_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=debug test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 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_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.7.1.tar.gz -> facter-3.7.1.tar.gz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6d5bf294d9738d38ce963acf8ba8676d
diff --git a/metadata/md5-cache/dev-ruby/facter-3.8.0 b/metadata/md5-cache/dev-ruby/facter-3.8.0
index d89f01564cd6..935efc7e745e 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.8.0
+++ b/metadata/md5-cache/dev-ruby/facter-3.8.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 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_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
 EAPI=6
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=debug test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 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_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.8.0.tar.gz -> facter-3.8.0.tar.gz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c9688998f06dcc8d65f74787af7dcba0
diff --git a/metadata/md5-cache/dev-ruby/facter-9999 b/metadata/md5-cache/dev-ruby/facter-9999
index 52f358cd71cd..b06fda5ed557 100644
--- a/metadata/md5-cache/dev-ruby/facter-9999
+++ b/metadata/md5-cache/dev-ruby/facter-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-0.9.3 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) >=dev-vcs/git-1.8.2.1
+DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-0.9.3 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=debug test elibc_FreeBSD ruby_targets_ruby22
 LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:git-r3 src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f734b14acc4a435e0bf74572fdc2be18
diff --git a/metadata/md5-cache/dev-ruby/factory_girl-4.7.0 b/metadata/md5-cache/dev-ruby/factory_girl-4.7.0
index b75673248a75..a9b614113315 100644
--- a/metadata/md5-cache/dev-ruby/factory_girl-4.7.0
+++ b/metadata/md5-cache/dev-ruby/factory_girl-4.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby21,sqlite] dev-ruby/bourne[ruby_targets_ruby21] >=dev-ruby/mocha-0.12.8[ruby_targets_ruby21] dev-ruby/rspec-its[ruby_targets_ruby21] dev-ruby/timecop[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby22,sqlite] dev-ruby/bourne[ruby_targets_ruby22] >=dev-ruby/mocha-0.12.8[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] dev-ruby/timecop[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby22,sqlite] dev-ruby/bourne[ruby_targets_ruby22] >=dev-ruby/mocha-0.12.8[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] dev-ruby/timecop[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=factory_girl provides a framework and DSL for defining and using factories
 EAPI=5
 HOMEPAGE=https://github.com/thoughtbot/factory_girl
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0:*[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/activesupport-3.0.0:*[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=https://github.com/thoughtbot/factory_girl/archive/v4.7.0.tar.gz -> factory_girl-4.7.0.tar.gz
 _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_=7d0e6b85bbd3eae37f4f6713b022045d
diff --git a/metadata/md5-cache/dev-ruby/factory_girl-4.8.0 b/metadata/md5-cache/dev-ruby/factory_girl-4.8.0
index bec88bb7fa5c..00d03b976ff3 100644
--- a/metadata/md5-cache/dev-ruby/factory_girl-4.8.0
+++ b/metadata/md5-cache/dev-ruby/factory_girl-4.8.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby21,sqlite] dev-ruby/bourne[ruby_targets_ruby21] >=dev-ruby/mocha-0.12.8[ruby_targets_ruby21] dev-ruby/rspec-its[ruby_targets_ruby21] dev-ruby/timecop[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby22,sqlite] dev-ruby/bourne[ruby_targets_ruby22] >=dev-ruby/mocha-0.12.8[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] dev-ruby/timecop[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby23,sqlite] dev-ruby/bourne[ruby_targets_ruby23] >=dev-ruby/mocha-0.12.8[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] dev-ruby/timecop[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby22,sqlite] dev-ruby/bourne[ruby_targets_ruby22] >=dev-ruby/mocha-0.12.8[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] dev-ruby/timecop[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby23,sqlite] dev-ruby/bourne[ruby_targets_ruby23] >=dev-ruby/mocha-0.12.8[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] dev-ruby/timecop[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=factory_girl provides a framework and DSL for defining and using factories
 EAPI=5
 HOMEPAGE=https://github.com/thoughtbot/factory_girl
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[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/activesupport-3.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[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=https://github.com/thoughtbot/factory_girl/archive/v4.8.0.tar.gz -> factory_girl-4.8.0.tar.gz
 _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_=45eb4043b95f9cdf867926bb337f7c55
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.11.0 b/metadata/md5-cache/dev-ruby/fakefs-0.11.0
index 6dee6d32f93e..8b602d01e65f 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.11.0
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.11.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby21] >=dev-ruby/minitest-5.5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby24] >=dev-ruby/minitest-5.5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby24] >=dev-ruby/minitest-5.5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A fake filesystem. Use it in your tests
 EAPI=5
 HOMEPAGE=https://github.com/defunkt/fakefs
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v0.11.0.tar.gz -> fakefs-0.11.0.tar.gz
 _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_=6f14e545fbe559042faf142f9781e763
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.6.0-r1 b/metadata/md5-cache/dev-ruby/fakefs-0.6.0-r1
index e58a3d65805a..2250b3ae6808 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.6.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/test-unit-2.5.1-r1[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] ) 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[ruby_targets_ruby22] >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A fake filesystem. Use it in your tests
 EAPI=5
 HOMEPAGE=https://github.com/defunkt/fakefs
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/fakefs-0.6.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_=a099100af5d88ba639427a6501a6f52d
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.9.2 b/metadata/md5-cache/dev-ruby/fakefs-0.9.2
index 6454b4293715..8182160e39a3 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.9.2
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.9.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby21] >=dev-ruby/minitest-5.5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[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.1:3[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A fake filesystem. Use it in your tests
 EAPI=5
 HOMEPAGE=https://github.com/defunkt/fakefs
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test
 KEYWORDS=alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v0.9.2.tar.gz -> fakefs-0.9.2.tar.gz
 _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_=d39e17d38dc3ede1329f774fcab9f1ab
diff --git a/metadata/md5-cache/dev-ruby/fakeweb-1.3.0.20131201-r1 b/metadata/md5-cache/dev-ruby/fakeweb-1.3.0.20131201-r1
index 12349b6889b7..e7440d7f08be 100644
--- a/metadata/md5-cache/dev-ruby/fakeweb-1.3.0.20131201-r1
+++ b/metadata/md5-cache/dev-ruby/fakeweb-1.3.0.20131201-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby21] dev-ruby/test-unit[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] dev-ruby/test-unit[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] dev-ruby/test-unit[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/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/mocha:0.14[ruby_targets_ruby22] dev-ruby/test-unit[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] dev-ruby/test-unit[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/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=Helper for faking web requests in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/chrisk/fakeweb
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-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=https://github.com/chrisk/fakeweb/archive/48208f9bf053577befe5723746b6ff35b99b45d0.tar.gz -> fakeweb-1.3.0.20131201.tar.gz
 _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_=83141ee1bed830cdf41d0a104947af07
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.11.0 b/metadata/md5-cache/dev-ruby/faraday-0.11.0
index 6fd2afb97a78..c019a2b0dc3f 100644
--- a/metadata/md5-cache/dev-ruby/faraday-0.11.0
+++ b/metadata/md5-cache/dev-ruby/faraday-0.11.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-process/lsof ) test? ( ruby_targets_ruby21? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby21] <dev-ruby/multipart-post-3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby23] <dev-ruby/multipart-post-3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby21] dev-ruby/httpclient[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] dev-ruby/sinatra[ruby_targets_ruby21] dev-ruby/net-http-persistent[ruby_targets_ruby21] dev-ruby/patron[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] dev-ruby/net-http-persistent[ruby_targets_ruby22] dev-ruby/patron[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby23] dev-ruby/httpclient[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] dev-ruby/net-http-persistent[ruby_targets_ruby23] dev-ruby/patron[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=test? ( sys-process/lsof ) test? ( ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby23] <dev-ruby/multipart-post-3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] dev-ruby/net-http-persistent[ruby_targets_ruby22] dev-ruby/patron[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby23] dev-ruby/httpclient[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] dev-ruby/net-http-persistent[ruby_targets_ruby23] dev-ruby/patron[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=HTTP/REST API client library with pluggable components
 EAPI=5
 HOMEPAGE=https://github.com/lostisland/faraday
-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 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby21] <dev-ruby/multipart-post-3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby23] <dev-ruby/multipart-post-3[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/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby23] <dev-ruby/multipart-post-3[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=https://github.com/lostisland/faraday/archive/v0.11.0.tar.gz -> faraday-0.11.0.tar.gz
 _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_=8d930b396f0eb944be44b8947aa5401b
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.12.2 b/metadata/md5-cache/dev-ruby/faraday-0.12.2
index 5afe36bacb0c..a933c60eec99 100644
--- a/metadata/md5-cache/dev-ruby/faraday-0.12.2
+++ b/metadata/md5-cache/dev-ruby/faraday-0.12.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-process/lsof ) test? ( ruby_targets_ruby21? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby21] <dev-ruby/multipart-post-3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby23] <dev-ruby/multipart-post-3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby24] <dev-ruby/multipart-post-3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby21] dev-ruby/httpclient[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] dev-ruby/sinatra[ruby_targets_ruby21] dev-ruby/net-http-persistent[ruby_targets_ruby21] dev-ruby/patron[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] dev-ruby/net-http-persistent[ruby_targets_ruby22] dev-ruby/patron[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby23] dev-ruby/httpclient[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] dev-ruby/net-http-persistent[ruby_targets_ruby23] dev-ruby/patron[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby24] dev-ruby/httpclient[ruby_targets_ruby24] dev-ruby/rack-test[ruby_targets_ruby24] dev-ruby/sinatra[ruby_targets_ruby24] dev-ruby/net-http-persistent[ruby_targets_ruby24] dev-ruby/patron[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( sys-process/lsof ) test? ( ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby23] <dev-ruby/multipart-post-3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby24] <dev-ruby/multipart-post-3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] dev-ruby/net-http-persistent[ruby_targets_ruby22] dev-ruby/patron[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby23] dev-ruby/httpclient[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] dev-ruby/net-http-persistent[ruby_targets_ruby23] dev-ruby/patron[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby24] dev-ruby/httpclient[ruby_targets_ruby24] dev-ruby/rack-test[ruby_targets_ruby24] dev-ruby/sinatra[ruby_targets_ruby24] dev-ruby/net-http-persistent[ruby_targets_ruby24] dev-ruby/patron[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=HTTP/REST API client library with pluggable components
 EAPI=6
 HOMEPAGE=https://github.com/lostisland/faraday
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby21] <dev-ruby/multipart-post-3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby23] <dev-ruby/multipart-post-3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby24] <dev-ruby/multipart-post-3[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby23] <dev-ruby/multipart-post-3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby24] <dev-ruby/multipart-post-3[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday/archive/v0.12.2.tar.gz -> faraday-0.12.2.tar.gz
 _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_=6e56631e0aacbd40a592a4d2c62764bf
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.9.2-r1 b/metadata/md5-cache/dev-ruby/faraday-0.9.2-r1
index 8dc9a038b7a4..a773effde6ce 100644
--- a/metadata/md5-cache/dev-ruby/faraday-0.9.2-r1
+++ b/metadata/md5-cache/dev-ruby/faraday-0.9.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-process/lsof ) test? ( ruby_targets_ruby21? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby21] <dev-ruby/multipart-post-3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby21] dev-ruby/httpclient[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] dev-ruby/sinatra[ruby_targets_ruby21] dev-ruby/net-http-persistent[ruby_targets_ruby21] dev-ruby/patron[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] dev-ruby/net-http-persistent[ruby_targets_ruby22] dev-ruby/patron[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=test? ( sys-process/lsof ) test? ( ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] dev-ruby/net-http-persistent[ruby_targets_ruby22] dev-ruby/patron[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=HTTP/REST API client library with pluggable components
 EAPI=5
 HOMEPAGE=https://github.com/lostisland/faraday
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby21] <dev-ruby/multipart-post-3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[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/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[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=https://github.com/lostisland/faraday/archive/v0.9.2.tar.gz -> faraday-0.9.2.tar.gz
 _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_=33d2cf1e50910e91dd5513bbdafb6a7e
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.9.2-r2 b/metadata/md5-cache/dev-ruby/faraday-0.9.2-r2
index d6c6d3eb54b8..6d154ef97c70 100644
--- a/metadata/md5-cache/dev-ruby/faraday-0.9.2-r2
+++ b/metadata/md5-cache/dev-ruby/faraday-0.9.2-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-process/lsof ) test? ( ruby_targets_ruby21? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby21] <dev-ruby/multipart-post-3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby23] <dev-ruby/multipart-post-3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby21] dev-ruby/httpclient[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] dev-ruby/sinatra[ruby_targets_ruby21] dev-ruby/net-http-persistent[ruby_targets_ruby21] dev-ruby/patron[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] dev-ruby/net-http-persistent[ruby_targets_ruby22] dev-ruby/patron[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby23] dev-ruby/httpclient[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] dev-ruby/net-http-persistent[ruby_targets_ruby23] dev-ruby/patron[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=test? ( sys-process/lsof ) test? ( ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby23] <dev-ruby/multipart-post-3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] dev-ruby/net-http-persistent[ruby_targets_ruby22] dev-ruby/patron[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby23] dev-ruby/httpclient[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] dev-ruby/net-http-persistent[ruby_targets_ruby23] dev-ruby/patron[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=HTTP/REST API client library with pluggable components
 EAPI=5
 HOMEPAGE=https://github.com/lostisland/faraday
-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 ~ppc64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby21] <dev-ruby/multipart-post-3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby23] <dev-ruby/multipart-post-3[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/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby23] <dev-ruby/multipart-post-3[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=https://github.com/lostisland/faraday/archive/v0.9.2.tar.gz -> faraday-0.9.2.tar.gz
 _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_=c1c3e30be1fc0eed39c69b4655becc06
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-0.10.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-0.10.0
index 8dbfe745aae7..4aa71b116f6a 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-0.10.0
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-0.10.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby21] <dev-ruby/faraday-0.10[ruby_targets_ruby21] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby21] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby21] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby21] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-0.10[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby22] ) ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby21] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby21] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby21] >=dev-ruby/hashie-1.2[ruby_targets_ruby21] >=dev-ruby/rash-0.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] >=dev-ruby/hashie-1.2[ruby_targets_ruby22] >=dev-ruby/rash-0.3[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-0.10[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby22] ) ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] >=dev-ruby/hashie-1.2[ruby_targets_ruby22] >=dev-ruby/rash-0.3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Various middleware for Faraday
 EAPI=5
 HOMEPAGE=https://github.com/lostisland/faraday_middleware
-IUSE=+parsexml +oauth +mashify +rashify test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=+parsexml +oauth +mashify +rashify test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby21] <dev-ruby/faraday-0.10[ruby_targets_ruby21] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby21] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby21] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby21] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-0.10[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash-0.3[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/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-0.10[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash-0.3[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=https://github.com/lostisland/faraday_middleware/archive/v0.10.0.tar.gz -> faraday_middleware-0.10.0.tar.gz
 _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_=a0c3a9347e547c3aa3af802f52d0ba85
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-0.11.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-0.11.0
index 6f78b1768531..d8f4d4c58497 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-0.11.0
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-0.11.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby21] <dev-ruby/faraday-1[ruby_targets_ruby21] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby21] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby21] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby21] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-1[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby23] ) ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/addressable[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] dev-ruby/webmock:0[ruby_targets_ruby21] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby21] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby21] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby21] >=dev-ruby/hashie-1.2[ruby_targets_ruby21] >=dev-ruby/rash-0.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/addressable[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] >=dev-ruby/hashie-1.2[ruby_targets_ruby22] >=dev-ruby/rash-0.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/addressable[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/webmock:0[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby23] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] >=dev-ruby/hashie-1.2[ruby_targets_ruby23] >=dev-ruby/rash-0.3[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-1[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/addressable[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] >=dev-ruby/hashie-1.2[ruby_targets_ruby22] >=dev-ruby/rash-0.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/addressable[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/webmock:0[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby23] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] >=dev-ruby/hashie-1.2[ruby_targets_ruby23] >=dev-ruby/rash-0.3[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=Various middleware for Faraday
 EAPI=5
 HOMEPAGE=https://github.com/lostisland/faraday_middleware
-IUSE=+parsexml +oauth +mashify +rashify test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=+parsexml +oauth +mashify +rashify test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby21] <dev-ruby/faraday-1[ruby_targets_ruby21] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby21] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby21] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby21] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-1[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash-0.3[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/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-1[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash-0.3[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=https://github.com/lostisland/faraday_middleware/archive/v0.11.0.tar.gz -> faraday_middleware-0.11.0.tar.gz
 _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_=06d7fb30d5c1b2fafa30f5ba1efda4f5
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-0.11.0.1 b/metadata/md5-cache/dev-ruby/faraday_middleware-0.11.0.1
index 5f6eb311a0d5..f23f8e4eb9f6 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-0.11.0.1
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-0.11.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby21] <dev-ruby/faraday-1[ruby_targets_ruby21] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby21] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby21] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby21] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-1[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby23] ) ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/addressable[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] dev-ruby/webmock:0[ruby_targets_ruby21] dev-ruby/json:0[ruby_targets_ruby21] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby21] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby21] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby21] >=dev-ruby/hashie-1.2[ruby_targets_ruby21] >=dev-ruby/rash-0.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/addressable[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] dev-ruby/json:0[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] >=dev-ruby/hashie-1.2[ruby_targets_ruby22] >=dev-ruby/rash-0.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/addressable[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/webmock:0[ruby_targets_ruby23] dev-ruby/json:0[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby23] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] >=dev-ruby/hashie-1.2[ruby_targets_ruby23] >=dev-ruby/rash-0.3[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-1[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/addressable[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] dev-ruby/json:0[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] >=dev-ruby/hashie-1.2[ruby_targets_ruby22] >=dev-ruby/rash-0.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/addressable[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/webmock:0[ruby_targets_ruby23] dev-ruby/json:0[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby23] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] >=dev-ruby/hashie-1.2[ruby_targets_ruby23] >=dev-ruby/rash-0.3[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=Various middleware for Faraday
 EAPI=6
 HOMEPAGE=https://github.com/lostisland/faraday_middleware
-IUSE=+parsexml +oauth +mashify +rashify test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=+parsexml +oauth +mashify +rashify test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby21] <dev-ruby/faraday-1[ruby_targets_ruby21] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby21] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby21] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby21] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-1[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash-0.3[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/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-1[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash-0.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash-0.3[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=https://github.com/lostisland/faraday_middleware/archive/0.11.0.1.tar.gz -> faraday_middleware-0.11.0.1.tar.gz
 _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_=ad31ee1b831f7c0a02f35bfbecc8f49d
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-0.12.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-0.12.0
index 7216cd640e38..c58bf33e900f 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-0.12.0
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-0.12.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby21] <dev-ruby/faraday-1[ruby_targets_ruby21] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby21] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby21] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby21] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-1[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby23] ) ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/addressable[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] dev-ruby/webmock:0[ruby_targets_ruby21] dev-ruby/json:0[ruby_targets_ruby21] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby21] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby21] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby21] >=dev-ruby/hashie-1.2[ruby_targets_ruby21] >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/addressable[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] dev-ruby/json:0[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] >=dev-ruby/hashie-1.2[ruby_targets_ruby22] >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/addressable[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/webmock:0[ruby_targets_ruby23] dev-ruby/json:0[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby23] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] >=dev-ruby/hashie-1.2[ruby_targets_ruby23] >=dev-ruby/rash_alt-0.4.3[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-1[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/addressable[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] dev-ruby/json:0[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] >=dev-ruby/hashie-1.2[ruby_targets_ruby22] >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/addressable[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/webmock:0[ruby_targets_ruby23] dev-ruby/json:0[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby23] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] >=dev-ruby/hashie-1.2[ruby_targets_ruby23] >=dev-ruby/rash_alt-0.4.3[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=Various middleware for Faraday
 EAPI=6
 HOMEPAGE=https://github.com/lostisland/faraday_middleware
-IUSE=+parsexml +oauth +mashify +rashify test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=+parsexml +oauth +mashify +rashify test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby21] <dev-ruby/faraday-1[ruby_targets_ruby21] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby21] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby21] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby21] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-1[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[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/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-1[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[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=https://github.com/lostisland/faraday_middleware/archive/v0.12.0.tar.gz -> faraday_middleware-0.12.0.tar.gz
 _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_=23151a9dedb3a29cd074161c255c3c1d
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-0.12.2 b/metadata/md5-cache/dev-ruby/faraday_middleware-0.12.2
index fc86a00c691a..66e5ebca8b97 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-0.12.2
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-0.12.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby21] <dev-ruby/faraday-1[ruby_targets_ruby21] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby21] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby21] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby21] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-1[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby23] ) ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/addressable[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] dev-ruby/webmock:0[ruby_targets_ruby21] dev-ruby/json:0[ruby_targets_ruby21] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby21] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby21] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby21] >=dev-ruby/hashie-1.2[ruby_targets_ruby21] >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/addressable[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] dev-ruby/json:0[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] >=dev-ruby/hashie-1.2[ruby_targets_ruby22] >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/addressable[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/webmock:0[ruby_targets_ruby23] dev-ruby/json:0[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby23] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] >=dev-ruby/hashie-1.2[ruby_targets_ruby23] >=dev-ruby/rash_alt-0.4.3[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-1[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/addressable[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] dev-ruby/json:0[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] >=dev-ruby/hashie-1.2[ruby_targets_ruby22] >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/addressable[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/webmock:0[ruby_targets_ruby23] dev-ruby/json:0[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby23] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] >=dev-ruby/hashie-1.2[ruby_targets_ruby23] >=dev-ruby/rash_alt-0.4.3[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=Various middleware for Faraday
 EAPI=6
 HOMEPAGE=https://github.com/lostisland/faraday_middleware
-IUSE=+parsexml +oauth +mashify +rashify test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=+parsexml +oauth +mashify +rashify test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby21] <dev-ruby/faraday-1[ruby_targets_ruby21] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby21] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby21] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby21] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-1[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[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/faraday-0.7.4[ruby_targets_ruby22] <dev-ruby/faraday-1[ruby_targets_ruby22] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby22] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby22] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby23] <dev-ruby/faraday-1[ruby_targets_ruby23] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby23] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby23] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[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=https://github.com/lostisland/faraday_middleware/archive/v0.12.2.tar.gz -> faraday_middleware-0.12.2.tar.gz
 _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_=23151a9dedb3a29cd074161c255c3c1d
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6 b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6
index a8dd2ca596be..8116cd864ab6 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/faraday_middleware[ruby_targets_ruby21] dev-ruby/multi_json[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/faraday_middleware[ruby_targets_ruby22] dev-ruby/multi_json[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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_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? ( ruby_targets_ruby22? ( dev-ruby/faraday_middleware[ruby_targets_ruby22] dev-ruby/multi_json[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Response JSON parser using MultiJson and FaradayMiddleware
 EAPI=5
 HOMEPAGE=https://github.com/denro/faraday_middleware-multi_json
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/faraday_middleware[ruby_targets_ruby21] dev-ruby/multi_json[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/faraday_middleware[ruby_targets_ruby22] dev-ruby/multi_json[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/faraday_middleware[ruby_targets_ruby22] dev-ruby/multi_json[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=https://github.com/denro/faraday_middleware-multi_json/archive/v0.0.6.tar.gz -> faraday_middleware-multi_json-0.0.6.tar.gz
 _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_=217a7e77f02296d90e359e3fd3fd58e1
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r1 b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r1
index 416745350732..6dd737273837 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/faraday_middleware[ruby_targets_ruby21] dev-ruby/multi_json[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/faraday_middleware[ruby_targets_ruby22] dev-ruby/multi_json[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/faraday_middleware[ruby_targets_ruby23] dev-ruby/multi_json[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: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-ruby/faraday_middleware[ruby_targets_ruby22] dev-ruby/multi_json[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/faraday_middleware[ruby_targets_ruby23] dev-ruby/multi_json[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: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=Response JSON parser using MultiJson and FaradayMiddleware
 EAPI=6
 HOMEPAGE=https://github.com/denro/faraday_middleware-multi_json
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/faraday_middleware[ruby_targets_ruby21] dev-ruby/multi_json[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/faraday_middleware[ruby_targets_ruby22] dev-ruby/multi_json[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/faraday_middleware[ruby_targets_ruby23] dev-ruby/multi_json[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/faraday_middleware[ruby_targets_ruby22] dev-ruby/multi_json[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/faraday_middleware[ruby_targets_ruby23] dev-ruby/multi_json[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=https://github.com/denro/faraday_middleware-multi_json/archive/v0.0.6.tar.gz -> faraday_middleware-multi_json-0.0.6.tar.gz
 _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_=af0c3afe6b11d0c08c94646ab6f5ea16
diff --git a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2 b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
index a8d001097f40..fbbaac70ac21 100644
--- a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Simple wrapper around multithreaded Porter stemming algorithm
 EAPI=5
 HOMEPAGE=https://github.com/romanbsd/fast-stemmer
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/fast-stemmer-1.0.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_=e7461513bed8d367e06bbd655f24ef66
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-1.4.1 b/metadata/md5-cache/dev-ruby/fast_gettext-1.4.1
index a1abc2942476..57676a56372e 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-1.4.1
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-1.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/activerecord[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/activerecord[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activerecord[ruby_targets_ruby23] dev-ruby/bundler[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: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/activerecord[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activerecord[ruby_targets_ruby23] dev-ruby/bundler[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: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=GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!
 EAPI=5
 HOMEPAGE=https://github.com/grosser/fast_gettext
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
-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=https://github.com/grosser/fast_gettext/archive/v1.4.1.tar.gz -> fast_gettext-1.4.1.tar.gz
 _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_=4fde2a8c8964cf9e16cd37eba872f2b4
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-1.4.1-r1 b/metadata/md5-cache/dev-ruby/fast_gettext-1.4.1-r1
index 27380c8955d9..0b3f445741c7 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-1.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-1.4.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/activerecord[ruby_targets_ruby21,sqlite] dev-ruby/bundler[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/activerecord[ruby_targets_ruby22,sqlite] dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activerecord[ruby_targets_ruby23,sqlite] dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/activerecord[ruby_targets_ruby24,sqlite] dev-ruby/bundler[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/activerecord[ruby_targets_ruby22,sqlite] dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activerecord[ruby_targets_ruby23,sqlite] dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/activerecord[ruby_targets_ruby24,sqlite] dev-ruby/bundler[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!
 EAPI=6
 HOMEPAGE=https://github.com/grosser/fast_gettext
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=public-domain
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v1.4.1.tar.gz -> fast_gettext-1.4.1.tar.gz
 _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_=d8385429e3d8674c71636d051d1b77a7
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-1.5.0 b/metadata/md5-cache/dev-ruby/fast_gettext-1.5.0
index 3980b9ca0c09..9d1367e99f02 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-1.5.0
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-1.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/activerecord[ruby_targets_ruby21,sqlite] dev-ruby/bundler[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/activerecord[ruby_targets_ruby22,sqlite] dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activerecord[ruby_targets_ruby23,sqlite] dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/activerecord[ruby_targets_ruby24,sqlite] dev-ruby/bundler[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/activerecord[ruby_targets_ruby22,sqlite] dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activerecord[ruby_targets_ruby23,sqlite] dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/activerecord[ruby_targets_ruby24,sqlite] dev-ruby/bundler[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!
 EAPI=6
 HOMEPAGE=https://github.com/grosser/fast_gettext
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=public-domain
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v1.5.0.tar.gz -> fast_gettext-1.5.0.tar.gz
 _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_=d8385429e3d8674c71636d051d1b77a7
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-1.5.1 b/metadata/md5-cache/dev-ruby/fast_gettext-1.5.1
index 2012b0abb5e0..f240418b0d13 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-1.5.1
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-1.5.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/activerecord[ruby_targets_ruby21,sqlite] dev-ruby/bundler[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/activerecord[ruby_targets_ruby22,sqlite] dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activerecord[ruby_targets_ruby23,sqlite] dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/activerecord[ruby_targets_ruby24,sqlite] dev-ruby/bundler[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/activerecord[ruby_targets_ruby22,sqlite] dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activerecord[ruby_targets_ruby23,sqlite] dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/activerecord[ruby_targets_ruby24,sqlite] dev-ruby/bundler[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!
 EAPI=6
 HOMEPAGE=https://github.com/grosser/fast_gettext
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=public-domain
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v1.5.1.tar.gz -> fast_gettext-1.5.1.tar.gz
 _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_=d8385429e3d8674c71636d051d1b77a7
diff --git a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2 b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
index f0b1a6dbc506..33b8b3b8adc9 100644
--- a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
+++ b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/hoe-2.3.2[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-2.3.2[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-2.3.2[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-2.3.2[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-2.3.2[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-2.3.2[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-2.3.2[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=fast_xs text escaping library ruby bindings
 EAPI=5
 HOMEPAGE=https://github.com/brianmario/fast_xs
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/fast_xs-0.8.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_=4a7e439e3f1f2cac1b93a7b27b417729
diff --git a/metadata/md5-cache/dev-ruby/fattr-2.3.0 b/metadata/md5-cache/dev-ruby/fattr-2.3.0
index 4ff841a27f32..11beef82cd6a 100644
--- a/metadata/md5-cache/dev-ruby/fattr-2.3.0
+++ b/metadata/md5-cache/dev-ruby/fattr-2.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=fattr.rb is a "fatter attr" for ruby
 EAPI=5
 HOMEPAGE=https://github.com/ahoward/fattr
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~x86 ~x86-fbsd
 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/fattr-2.3.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_=d1bdf242288738eeada2774b25782f99
diff --git a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1 b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
index 62c2fbec0357..bc6d999f5780 100644
--- a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/fcgi 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=dev-libs/fcgi ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=FastCGI library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/alphallc/ruby-fcgi-ng
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=Ruby
-RDEPEND=dev-libs/fcgi 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=dev-libs/fcgi ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/fcgi-0.9.2.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_=fcaf39eafe2c212c837927d03aafd1fd
diff --git a/metadata/md5-cache/dev-ruby/ferret-0.11.8.6 b/metadata/md5-cache/dev-ruby/ferret-0.11.8.6
index 3b52ca6f87eb..f8571615b5e5 100644
--- a/metadata/md5-cache/dev-ruby/ferret-0.11.8.6
+++ b/metadata/md5-cache/dev-ruby/ferret-0.11.8.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/bzip2 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=app-arch/bzip2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A ruby indexing/searching library
 EAPI=5
 HOMEPAGE=https://github.com/jkraemer/ferret
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=app-arch/bzip2 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=app-arch/bzip2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ferret-0.11.8.6.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_=feddea99478a88077b22f6af30489e6a
diff --git a/metadata/md5-cache/dev-ruby/ferret-0.11.8.7 b/metadata/md5-cache/dev-ruby/ferret-0.11.8.7
index a531000aaf8a..30d9f82f4377 100644
--- a/metadata/md5-cache/dev-ruby/ferret-0.11.8.7
+++ b/metadata/md5-cache/dev-ruby/ferret-0.11.8.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/bzip2 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=app-arch/bzip2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A ruby indexing/searching library
 EAPI=5
 HOMEPAGE=https://github.com/jkraemer/ferret
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=app-arch/bzip2 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=app-arch/bzip2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ferret-0.11.8.7.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_=e8921ebdb9c30839f7ac755e9b2473e1
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.4.0 b/metadata/md5-cache/dev-ruby/ffaker-2.4.0
index 5651f8526a86..5ecb72ddc42e 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-2.4.0
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit: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? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=Faster Faker, generates dummy data
 EAPI=5
 HOMEPAGE=https://github.com/emmanueloga/ffaker
-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
 LICENSE=MIT
-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/ffaker-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_=c1ea325b621655ec7907ba4a95722d2d
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.5.0 b/metadata/md5-cache/dev-ruby/ffaker-2.5.0
index b141749d83e1..84a873e66703 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-2.5.0
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit: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? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=Faster Faker, generates dummy data
 EAPI=5
 HOMEPAGE=https://github.com/emmanueloga/ffaker
-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
 LICENSE=MIT
-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/ffaker-2.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_=c1ea325b621655ec7907ba4a95722d2d
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.6.0 b/metadata/md5-cache/dev-ruby/ffaker-2.6.0
index 5622917e28cb..1e424576db00 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-2.6.0
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ffaker-2.6.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_=ee0855bcf821263bb0cf13c8f3ea962d
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.10 b/metadata/md5-cache/dev-ruby/ffi-1.9.10
index c9f70ba7e21c..4eed893d3221 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.10
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.10
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libffi ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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=virtual/libffi ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Ruby extension for programmatically loading dynamic libraries
 EAPI=5
 HOMEPAGE=https://wiki.github.com/ffi/ffi
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=virtual/libffi 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=virtual/libffi 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=https://github.com/ffi/ffi/archive/1.9.10.tar.gz -> ffi-git-1.9.10.tgz
 _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_=2b5c75263c2197b7941bb4b6f2c61899
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.14 b/metadata/md5-cache/dev-ruby/ffi-1.9.14
index 6ba1fc198462..323d88583792 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.14
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.14
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libffi 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=virtual/libffi 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=Ruby extension for programmatically loading dynamic libraries
 EAPI=5
 HOMEPAGE=https://wiki.github.com/ffi/ffi
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=virtual/libffi 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=virtual/libffi 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=https://github.com/ffi/ffi/archive/1.9.14.tar.gz -> ffi-git-1.9.14.tgz
 _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_=edcff64d7bf2a49c56f662467dc63720
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.17 b/metadata/md5-cache/dev-ruby/ffi-1.9.17
index 7c4a26c1e49f..61f0e2fbd617 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.17
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.17
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libffi 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=virtual/libffi 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=Ruby extension for programmatically loading dynamic libraries
 EAPI=5
 HOMEPAGE=https://wiki.github.com/ffi/ffi
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=virtual/libffi 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=virtual/libffi 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=https://github.com/ffi/ffi/archive/1.9.17.tar.gz -> ffi-git-1.9.17.tgz
 _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_=bd84b2f4a76c341ccf0b70106264e53b
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.18 b/metadata/md5-cache/dev-ruby/ffi-1.9.18
index 5fb9e2e88f7c..5481806be7f0 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.18
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.18
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libffi 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=virtual/libffi ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby extension for programmatically loading dynamic libraries
 EAPI=5
 HOMEPAGE=https://wiki.github.com/ffi/ffi
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=virtual/libffi 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=virtual/libffi ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/1.9.18.tar.gz -> ffi-git-1.9.18.tgz
 _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_=5ca61449e0e826a187e9361fd046653c
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.6-r2 b/metadata/md5-cache/dev-ruby/ffi-1.9.6-r2
index aae4837fb5d2..866416b4e835 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.6-r2
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.6-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libffi ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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_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=virtual/libffi ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Ruby extension for programmatically loading dynamic libraries
 EAPI=5
 HOMEPAGE=https://wiki.github.com/ffi/ffi
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=BSD
-RDEPEND=virtual/libffi 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=virtual/libffi 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=https://github.com/ffi/ffi/archive/v1.9.6.tar.gz -> ffi-git-1.9.6.tgz
 _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_=83b31bffdb9b7e4455a40fb1a9f5d950
diff --git a/metadata/md5-cache/dev-ruby/file-tail-1.1.1 b/metadata/md5-cache/dev-ruby/file-tail-1.1.1
index face3c52ae76..b87b4992913b 100644
--- a/metadata/md5-cache/dev-ruby/file-tail-1.1.1
+++ b/metadata/md5-cache/dev-ruby/file-tail-1.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/tins-1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A small ruby library that allows it to 'tail' files in Ruby
 EAPI=5
 HOMEPAGE=https://flori.github.com/file-tail
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/tins-1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/file-tail-1.1.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_=ed5fa4848b5002d8626720e74626598a
diff --git a/metadata/md5-cache/dev-ruby/file-tail-1.2.0 b/metadata/md5-cache/dev-ruby/file-tail-1.2.0
index e8a7255bc36f..c913fd1059d4 100644
--- a/metadata/md5-cache/dev-ruby/file-tail-1.2.0
+++ b/metadata/md5-cache/dev-ruby/file-tail-1.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/tins-1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A small ruby library that allows it to 'tail' files in Ruby
 EAPI=5
 HOMEPAGE=https://flori.github.com/file-tail
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/tins-1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/file-tail-1.2.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_=f598b44db529f410daae92737e1d7331
diff --git a/metadata/md5-cache/dev-ruby/filesize-0.1.1 b/metadata/md5-cache/dev-ruby/filesize-0.1.1
index dace95a1dc77..a7ec14c078f3 100644
--- a/metadata/md5-cache/dev-ruby/filesize-0.1.1
+++ b/metadata/md5-cache/dev-ruby/filesize-0.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=small ruby class for handling filesizes with both the SI and binary prefixes
 EAPI=5
 HOMEPAGE=https://github.com/dominikh/filesize
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm
 LICENSE=MIT
-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.1.1
 SRC_URI=mirror://rubygems/filesize-0.1.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_=750e93f6f699bbe53b68fb4cefcc4007
diff --git a/metadata/md5-cache/dev-ruby/fivemat-1.3.3 b/metadata/md5-cache/dev-ruby/fivemat-1.3.3
index 11fe41b9a234..5a42a1d05753 100644
--- a/metadata/md5-cache/dev-ruby/fivemat-1.3.3
+++ b/metadata/md5-cache/dev-ruby/fivemat-1.3.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=MiniTest/RSpec/Cucumber formatter that gives each test file its own line of dots
 EAPI=5
 HOMEPAGE=https://github.com/tpope/fivemat
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/fivemat-1.3.3.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_=d6aae3f1a0e7cdb46cbdfd33fe60faf5
diff --git a/metadata/md5-cache/dev-ruby/fivemat-1.3.5 b/metadata/md5-cache/dev-ruby/fivemat-1.3.5
index 608df183930f..31e2294bbac0 100644
--- a/metadata/md5-cache/dev-ruby/fivemat-1.3.5
+++ b/metadata/md5-cache/dev-ruby/fivemat-1.3.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=MiniTest/RSpec/Cucumber formatter that gives each test file its own line of dots
 EAPI=6
 HOMEPAGE=https://github.com/tpope/fivemat
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/fivemat-1.3.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_=71ef8a895c87b2e9b0658e1544554949
diff --git a/metadata/md5-cache/dev-ruby/flexmock-2.3.5 b/metadata/md5-cache/dev-ruby/flexmock-2.3.5
index dafd7409affe..40713ba7e3c2 100644
--- a/metadata/md5-cache/dev-ruby/flexmock-2.3.5
+++ b/metadata/md5-cache/dev-ruby/flexmock-2.3.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Simple mock object library for Ruby unit testing
 EAPI=5
 HOMEPAGE=https://github.com/doudou/flexmock
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=flexmock
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/doudou/flexmock/archive/v2.3.5.tar.gz -> flexmock-2.3.5.tar.gz
 _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_=a9258f00ec1233935d7d1fbe1f331ccb
diff --git a/metadata/md5-cache/dev-ruby/flickraw-0.9.9 b/metadata/md5-cache/dev-ruby/flickraw-0.9.9
index 57752f54b637..88c6ae408d40 100644
--- a/metadata/md5-cache/dev-ruby/flickraw-0.9.9
+++ b/metadata/md5-cache/dev-ruby/flickraw-0.9.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A library to access flickr api in a simple way
 EAPI=5
 HOMEPAGE=https://github.com/hanklords/flickraw
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/flickraw-0.9.9.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_=bc583aa776e9d40665b9bd1ec4b580f3
diff --git a/metadata/md5-cache/dev-ruby/flog-4.4.0 b/metadata/md5-cache/dev-ruby/flog-4.4.0
index 29ed8c81ff75..b813a7d4c0bb 100644
--- a/metadata/md5-cache/dev-ruby/flog-4.4.0
+++ b/metadata/md5-cache/dev-ruby/flog-4.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby21] >=dev-ruby/sexp_processor-4.4:4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby22] >=dev-ruby/sexp_processor-4.4:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby23] >=dev-ruby/sexp_processor-4.4: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/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/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby22] >=dev-ruby/sexp_processor-4.4:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby23] >=dev-ruby/sexp_processor-4.4: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/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=Flog reports the most tortured code in an easy to read pain report
 EAPI=5
 HOMEPAGE=http://ruby.sadi.st/
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby21] >=dev-ruby/sexp_processor-4.4:4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby22] >=dev-ruby/sexp_processor-4.4:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby23] >=dev-ruby/sexp_processor-4.4: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/ruby_parser-3.1.0:3[ruby_targets_ruby22] >=dev-ruby/sexp_processor-4.4:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby23] >=dev-ruby/sexp_processor-4.4: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/flog-4.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_=89b1b0cf525bfa29a7b7bdfbc57e1f95
diff --git a/metadata/md5-cache/dev-ruby/flog-4.6.1 b/metadata/md5-cache/dev-ruby/flog-4.6.1
index c13b8a710a77..8473262ad887 100644
--- a/metadata/md5-cache/dev-ruby/flog-4.6.1
+++ b/metadata/md5-cache/dev-ruby/flog-4.6.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/path_expander:1[ruby_targets_ruby21] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby21] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/path_expander:1[ruby_targets_ruby22] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby22] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/path_expander:1[ruby_targets_ruby23] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby23] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/path_expander:1[ruby_targets_ruby24] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby24] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/path_expander:1[ruby_targets_ruby22] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby22] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/path_expander:1[ruby_targets_ruby23] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby23] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/path_expander:1[ruby_targets_ruby24] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby24] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Flog reports the most tortured code in an easy to read pain report
 EAPI=5
 HOMEPAGE=http://ruby.sadi.st/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/path_expander:1[ruby_targets_ruby21] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby21] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/path_expander:1[ruby_targets_ruby22] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby22] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/path_expander:1[ruby_targets_ruby23] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby23] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/path_expander:1[ruby_targets_ruby24] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby24] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/path_expander:1[ruby_targets_ruby22] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby22] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/path_expander:1[ruby_targets_ruby23] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby23] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/path_expander:1[ruby_targets_ruby24] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby24] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/flog-4.6.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_=6e57f6cbd76e8a3e3d87d268abf4710b
diff --git a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.1 b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.1
index b131437b20d0..565bf0d94b2a 100644
--- a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.1
+++ b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( <dev-ruby/railties-5.1[ruby_targets_ruby21] >=dev-ruby/railties-3.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( <dev-ruby/railties-5.1[ruby_targets_ruby22] >=dev-ruby/railties-3.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/railties-5.1[ruby_targets_ruby23] >=dev-ruby/railties-3.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? ( 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? ( 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-ruby/railties-5.1[ruby_targets_ruby22] >=dev-ruby/railties-3.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/railties-5.1[ruby_targets_ruby23] >=dev-ruby/railties-3.2[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? ( 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=Font-awesome for the asset pipeline
 EAPI=5
 HOMEPAGE=https://github.com/bokmann/font-awesome-rails https://rubygems.org/gems/font-awesome-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64
 LICENSE=MIT OFL
-RDEPEND=ruby_targets_ruby21? ( <dev-ruby/railties-5.1[ruby_targets_ruby21] >=dev-ruby/railties-3.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( <dev-ruby/railties-5.1[ruby_targets_ruby22] >=dev-ruby/railties-3.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/railties-5.1[ruby_targets_ruby23] >=dev-ruby/railties-3.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/railties-5.1[ruby_targets_ruby22] >=dev-ruby/railties-3.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/railties-5.1[ruby_targets_ruby23] >=dev-ruby/railties-3.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/font-awesome-rails-4.7.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_=abe087520b1c550003aeead2f0198feb
diff --git a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.2 b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.2
index a6680933ff9f..9251e45bac27 100644
--- a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.2
+++ b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( <dev-ruby/railties-5.2:*[ruby_targets_ruby21] >=dev-ruby/railties-3.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( <dev-ruby/railties-5.2:*[ruby_targets_ruby22] >=dev-ruby/railties-3.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/railties-3.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? ( 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? ( 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-ruby/railties-5.2:*[ruby_targets_ruby22] >=dev-ruby/railties-3.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/railties-3.2:*[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? ( 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=Font-awesome for the asset pipeline
 EAPI=6
 HOMEPAGE=https://github.com/bokmann/font-awesome-rails https://rubygems.org/gems/font-awesome-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64
 LICENSE=MIT OFL
-RDEPEND=ruby_targets_ruby21? ( <dev-ruby/railties-5.2:*[ruby_targets_ruby21] >=dev-ruby/railties-3.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( <dev-ruby/railties-5.2:*[ruby_targets_ruby22] >=dev-ruby/railties-3.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/railties-3.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/railties-5.2:*[ruby_targets_ruby22] >=dev-ruby/railties-3.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/railties-3.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/font-awesome-rails-4.7.0.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_=0720889c3cc7929acd9ccb5bbaac1fad
diff --git a/metadata/md5-cache/dev-ruby/forgery-0.6.0 b/metadata/md5-cache/dev-ruby/forgery-0.6.0
index b6ba5b44bb37..7bd21e9deb36 100644
--- a/metadata/md5-cache/dev-ruby/forgery-0.6.0
+++ b/metadata/md5-cache/dev-ruby/forgery-0.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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: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=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: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=Easy and customizable generation of forged data
 EAPI=5
 HOMEPAGE=https://github.com/sevenwire/forgery
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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=https://github.com/sevenwire/forgery/archive/v0.6.0.tar.gz -> forgery-0.6.0.tar.gz
 _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_=7c9a8d22a61b6629ca8aa15b8f083aff
diff --git a/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0 b/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0
index 9516a33759d6..e4ec09ccfeac 100644
--- a/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0
+++ b/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) 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? ( 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Forwardable with hash, and instance variable extensions
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/forwardable-extended https://github.com/envygeeks/forwardable-extended
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/forwardable-extended-2.6.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_=936fc376adc952037240b4e979a5e2dd
diff --git a/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r1 b/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r1
index efdfa3e6ab0f..9a6d3d0e2987 100644
--- a/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Forwardable with hash, and instance variable extensions
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/forwardable-extended https://github.com/envygeeks/forwardable-extended
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/envygeeks/forwardable-extended/archive/v2.6.0.tar.gz -> forwardable-extended-2.6.0.tar.gz
 _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_=074982fdd2cd8e27e7b63680565b513d
diff --git a/metadata/md5-cache/dev-ruby/fuubar-2.2.0 b/metadata/md5-cache/dev-ruby/fuubar-2.2.0
index 23ea8462afa3..cafe9257f358 100644
--- a/metadata/md5-cache/dev-ruby/fuubar-2.2.0
+++ b/metadata/md5-cache/dev-ruby/fuubar-2.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/rspec:3[ruby_targets_ruby21] >=dev-ruby/ruby-progressbar-1.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/ruby-progressbar-1.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/ruby-progressbar-1.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: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=test? ( ruby_targets_ruby22? ( dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/ruby-progressbar-1.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/ruby-progressbar-1.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: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=Instafailing RSpec progress bar formatter
 EAPI=5
 HOMEPAGE=https://github.com/jeffkreeftmeijer/fuubar
-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 ~hppa ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/rspec:3[ruby_targets_ruby21] >=dev-ruby/ruby-progressbar-1.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/ruby-progressbar-1.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/ruby-progressbar-1.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/rspec:3[ruby_targets_ruby22] >=dev-ruby/ruby-progressbar-1.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/ruby-progressbar-1.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=2
 SRC_URI=mirror://rubygems/fuubar-2.2.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_=a1fc11d2b1fea5b25d8ec61fa0d3f0c2
diff --git a/metadata/md5-cache/dev-ruby/gettext-setup-0.10 b/metadata/md5-cache/dev-ruby/gettext-setup-0.10
index 8512864ac248..1445d01b42f7 100644
--- a/metadata/md5-cache/dev-ruby/gettext-setup-0.10
+++ b/metadata/md5-cache/dev-ruby/gettext-setup-0.10
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby21] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby21] dev-ruby/locale[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby23] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby23] dev-ruby/locale[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby23] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby23] dev-ruby/locale[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=A gem to ease i18n
 EAPI=5
 HOMEPAGE=https://github.com/puppetlabs/gettext-setup-gem
-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
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby21] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby21] dev-ruby/locale[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby23] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby23] dev-ruby/locale[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/fast_gettext-1.1.0[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby23] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby23] dev-ruby/locale[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=https://github.com/puppetlabs/gettext-setup-gem/archive/0.10.tar.gz -> gettext-setup-0.10.tar.gz
 _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_=0550ba37697d6294cc4be433cec959ee
diff --git a/metadata/md5-cache/dev-ruby/gettext-setup-0.26-r1 b/metadata/md5-cache/dev-ruby/gettext-setup-0.26-r1
index 140e9e819478..73a1cff78ecf 100644
--- a/metadata/md5-cache/dev-ruby/gettext-setup-0.26-r1
+++ b/metadata/md5-cache/dev-ruby/gettext-setup-0.26-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby21] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby21] dev-ruby/locale[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby23] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby23] dev-ruby/locale[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby23] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby23] dev-ruby/locale[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=A gem to ease i18n
 EAPI=6
 HOMEPAGE=https://github.com/puppetlabs/gettext-setup-gem
-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
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby21] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby21] dev-ruby/locale[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby23] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby23] dev-ruby/locale[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/fast_gettext-1.1.0[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby23] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby23] dev-ruby/locale[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=https://github.com/puppetlabs/gettext-setup-gem/archive/0.26.tar.gz -> gettext-setup-0.26.tar.gz
 _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_=d02e4209d9c317339b62594c1f749fa7
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.5.0 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.5.0
index b230e75cd233..ca4fe9589edb 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.5.0
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rails:4.2[ruby_targets_ruby21] dev-ruby/activerecord:4.2[ruby_targets_ruby21,sqlite] dev-ruby/temple[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails:4.2[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22,sqlite] dev-ruby/temple[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-0.9.0[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/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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/rails:4.2[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22,sqlite] dev-ruby/temple[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=FastGettext / Rails integration
 EAPI=5
 HOMEPAGE=https://github.com/grosser/gettext_i18n_rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-0.9.0[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/fast_gettext-0.9.0[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=https://github.com/grosser/gettext_i18n_rails/archive/v1.5.0.tar.gz -> gettext_i18n_rails-1.5.0.tar.gz
 _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_=0e6f4e430db51ae82734b6243514a1ea
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.7.2 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.7.2
index fcf784907962..beb061daea60 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.7.2
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.7.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rails:4.2[ruby_targets_ruby21] dev-ruby/activerecord:4.2[ruby_targets_ruby21,sqlite] dev-ruby/temple[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails:4.2[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22,sqlite] dev-ruby/temple[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-0.9.0[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/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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/rails:4.2[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22,sqlite] dev-ruby/temple[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=FastGettext / Rails integration
 EAPI=5
 HOMEPAGE=https://github.com/grosser/gettext_i18n_rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-0.9.0[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/fast_gettext-0.9.0[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=https://github.com/grosser/gettext_i18n_rails/archive/v1.7.2.tar.gz -> gettext_i18n_rails-1.7.2.tar.gz
 _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_=0e6f4e430db51ae82734b6243514a1ea
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.0 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.0
index b616f172d933..fd6e5cbf66ab 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.0
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rails:4.2[ruby_targets_ruby21] dev-ruby/activerecord:4.2[ruby_targets_ruby21,sqlite] dev-ruby/temple[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails:4.2[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22,sqlite] dev-ruby/temple[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails:4.2[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23,sqlite] dev-ruby/temple[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-0.9.0[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: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/rails:4.2[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22,sqlite] dev-ruby/temple[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails:4.2[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23,sqlite] dev-ruby/temple[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-0.9.0[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: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=FastGettext / Rails integration
 EAPI=5
 HOMEPAGE=https://github.com/grosser/gettext_i18n_rails
-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=public-domain
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-0.9.0[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/fast_gettext-0.9.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-0.9.0[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=https://github.com/grosser/gettext_i18n_rails/archive/v1.8.0.tar.gz -> gettext_i18n_rails-1.8.0.tar.gz
 _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_=637269f9a28a3f73d166866d404b3641
diff --git a/metadata/md5-cache/dev-ruby/gh-0.15.0-r1 b/metadata/md5-cache/dev-ruby/gh-0.15.0-r1
index bd71d6cfabd4..58670f461046 100644
--- a/metadata/md5-cache/dev-ruby/gh-0.15.0-r1
+++ b/metadata/md5-cache/dev-ruby/gh-0.15.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/webmock[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/webmock[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/webmock[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby21] =dev-ruby/addressable-2.4*[ruby_targets_ruby21] dev-ruby/backports[ruby_targets_ruby21] >dev-ruby/faraday-0.8[ruby_targets_ruby21] >dev-ruby/multi_json-1.0[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby21] dev-ruby/net-http-pipeline[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.8[ruby_targets_ruby22] >dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby22] dev-ruby/net-http-pipeline[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.8[ruby_targets_ruby23] >dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby23] dev-ruby/net-http-pipeline[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? ( dev-ruby/webmock[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/webmock[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.8[ruby_targets_ruby22] >dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby22] dev-ruby/net-http-pipeline[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.8[ruby_targets_ruby23] >dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby23] dev-ruby/net-http-pipeline[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=multi-layer client for the github api v3
 EAPI=5
 HOMEPAGE=https://github.com/travis-ci/gh
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby21] =dev-ruby/addressable-2.4*[ruby_targets_ruby21] dev-ruby/backports[ruby_targets_ruby21] >dev-ruby/faraday-0.8[ruby_targets_ruby21] >dev-ruby/multi_json-1.0[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby21] dev-ruby/net-http-pipeline[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.8[ruby_targets_ruby22] >dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby22] dev-ruby/net-http-pipeline[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.8[ruby_targets_ruby23] >dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby23] dev-ruby/net-http-pipeline[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/addressable-2.4.0[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.8[ruby_targets_ruby22] >dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby22] dev-ruby/net-http-pipeline[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.8[ruby_targets_ruby23] >dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby23] dev-ruby/net-http-pipeline[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=https://github.com/travis-ci/gh/archive/v0.15.0.tar.gz -> gh-0.15.0.tar.gz
 _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_=aaec712591791403e4ecf0591038920f
diff --git a/metadata/md5-cache/dev-ruby/gh-0.15.1 b/metadata/md5-cache/dev-ruby/gh-0.15.1
index 6ab7a604825b..72bdf255c767 100644
--- a/metadata/md5-cache/dev-ruby/gh-0.15.1
+++ b/metadata/md5-cache/dev-ruby/gh-0.15.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/webmock[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/webmock[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/webmock[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby21] =dev-ruby/addressable-2.4*[ruby_targets_ruby21] dev-ruby/backports[ruby_targets_ruby21] >dev-ruby/faraday-0.8[ruby_targets_ruby21] >dev-ruby/multi_json-1.0[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby21] dev-ruby/net-http-pipeline[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.8[ruby_targets_ruby22] >dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby22] dev-ruby/net-http-pipeline[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.8[ruby_targets_ruby23] >dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby23] dev-ruby/net-http-pipeline[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? ( dev-ruby/webmock[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/webmock[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.8[ruby_targets_ruby22] >dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby22] dev-ruby/net-http-pipeline[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.8[ruby_targets_ruby23] >dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby23] dev-ruby/net-http-pipeline[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=multi-layer client for the github api v3
 EAPI=5
 HOMEPAGE=https://github.com/travis-ci/gh
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby21] =dev-ruby/addressable-2.4*[ruby_targets_ruby21] dev-ruby/backports[ruby_targets_ruby21] >dev-ruby/faraday-0.8[ruby_targets_ruby21] >dev-ruby/multi_json-1.0[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby21] dev-ruby/net-http-pipeline[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.8[ruby_targets_ruby22] >dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby22] dev-ruby/net-http-pipeline[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.8[ruby_targets_ruby23] >dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby23] dev-ruby/net-http-pipeline[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/addressable-2.4.0[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.8[ruby_targets_ruby22] >dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby22] dev-ruby/net-http-pipeline[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.8[ruby_targets_ruby23] >dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby23] dev-ruby/net-http-pipeline[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=https://github.com/travis-ci/gh/archive/v0.15.1.tar.gz -> gh-0.15.1.tar.gz
 _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_=aaec712591791403e4ecf0591038920f
diff --git a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3 b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
index 9538f37fb778..48b01de0d82b 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby21? ( dev-ruby/rake-compiler[ruby_targets_ruby21] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby21] >=dev-util/cucumber-1.1.3[ruby_targets_ruby21] >=dev-ruby/rspec-2.6.0:2[ruby_targets_ruby21] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby21] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake-compiler[ruby_targets_ruby22] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.3[ruby_targets_ruby22] >=dev-ruby/rspec-2.6.0:2[ruby_targets_ruby22] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby22] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.3[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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND==dev-util/ragel-6* ruby_targets_ruby22? ( dev-ruby/rake-compiler[ruby_targets_ruby22] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.3[ruby_targets_ruby22] >=dev-ruby/rspec-2.6.0:2[ruby_targets_ruby22] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby22] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Fast Gherkin lexer and parser based on Ragel
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/gherkin
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 doc test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.3[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/multi_json-1.3[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=https://github.com/cucumber/gherkin/archive/v2.12.0.tar.gz -> gherkin-2.12.0-git.tgz
 _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_=80d1d398081da6936c02d796aec0454c
diff --git a/metadata/md5-cache/dev-ruby/gherkin-2.12.2 b/metadata/md5-cache/dev-ruby/gherkin-2.12.2
index 2fe7d29379d0..db7657db8b91 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.12.2
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.12.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby21? ( dev-ruby/rake-compiler[ruby_targets_ruby21] dev-ruby/ruby-beautify[ruby_targets_ruby21] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby21] >=dev-util/cucumber-1.1.3[ruby_targets_ruby21] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby21] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby21] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake-compiler[ruby_targets_ruby22] dev-ruby/ruby-beautify[ruby_targets_ruby22] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.3[ruby_targets_ruby22] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby22] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby22] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.3[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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND==dev-util/ragel-6* ruby_targets_ruby22? ( dev-ruby/rake-compiler[ruby_targets_ruby22] dev-ruby/ruby-beautify[ruby_targets_ruby22] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.3[ruby_targets_ruby22] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby22] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby22] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Fast Gherkin lexer and parser based on Ragel
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/gherkin
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 doc test
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.3[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/multi_json-1.3[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=https://github.com/cucumber/gherkin/archive/v2.12.2.tar.gz -> gherkin-2.12.2-git.tgz
 _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_=cc47b6453e50e3ca983212ffa54d7f0b
diff --git a/metadata/md5-cache/dev-ruby/gherkin-3.2.0-r1 b/metadata/md5-cache/dev-ruby/gherkin-3.2.0-r1
index 5ee0bfc5251a..db9fa9e15eeb 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-3.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/gherkin-3.2.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Fast Gherkin lexer and parser
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/gherkin
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/gherkin-3.2.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_=b14a46464e1507e0b6b7bea24ad4d5fc
diff --git a/metadata/md5-cache/dev-ruby/gherkin-4.1.3 b/metadata/md5-cache/dev-ruby/gherkin-4.1.3
index fd6b14dfd2fd..426194dc0800 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-4.1.3
+++ b/metadata/md5-cache/dev-ruby/gherkin-4.1.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Fast Gherkin lexer and parser
 EAPI=6
 HOMEPAGE=https://github.com/cucumber/gherkin
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=mirror://rubygems/gherkin-4.1.3.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_=f0854c1a9f75d22e777278ff65c407e1
diff --git a/metadata/md5-cache/dev-ruby/git-1.3.0 b/metadata/md5-cache/dev-ruby/git-1.3.0
index 80f6920f0c87..9d416c3e815d 100644
--- a/metadata/md5-cache/dev-ruby/git-1.3.0
+++ b/metadata/md5-cache/dev-ruby/git-1.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Library for using Git in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/schacon/ruby-git
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-vcs/git-1.6.0.0 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=dev-vcs/git-1.6.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/schacon/ruby-git/archive/v1.3.0.tar.gz -> git-1.3.0.tar.gz
 _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_=a0ae54086d64bcfaf28c1a8327d30488
diff --git a/metadata/md5-cache/dev-ruby/github_api-0.14.5 b/metadata/md5-cache/dev-ruby/github_api-0.14.5
index 1ca0d9bde9e8..2df00380691b 100644
--- a/metadata/md5-cache/dev-ruby/github_api-0.14.5
+++ b/metadata/md5-cache/dev-ruby/github_api-0.14.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby21] =dev-ruby/addressable-2.4*[ruby_targets_ruby21] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby21] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby21] >=dev-ruby/faraday-0.8[ruby_targets_ruby21] <dev-ruby/faraday-0.10[ruby_targets_ruby21] >=dev-ruby/hashie-3.4[ruby_targets_ruby21] =dev-ruby/oauth2-1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby22] >=dev-ruby/faraday-0.8[ruby_targets_ruby22] <dev-ruby/faraday-0.10[ruby_targets_ruby22] >=dev-ruby/hashie-3.4[ruby_targets_ruby22] =dev-ruby/oauth2-1*[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-2.14[ruby_targets_ruby21] dev-ruby/webmock:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.14[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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_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? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby22] >=dev-ruby/faraday-0.8[ruby_targets_ruby22] <dev-ruby/faraday-0.10[ruby_targets_ruby22] >=dev-ruby/hashie-3.4[ruby_targets_ruby22] =dev-ruby/oauth2-1*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.14[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Ruby wrapper for the GitHub REST API v3
 EAPI=5
 HOMEPAGE=https://github.com/peter-murach/github
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby21] =dev-ruby/addressable-2.4*[ruby_targets_ruby21] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby21] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby21] >=dev-ruby/faraday-0.8[ruby_targets_ruby21] <dev-ruby/faraday-0.10[ruby_targets_ruby21] >=dev-ruby/hashie-3.4[ruby_targets_ruby21] =dev-ruby/oauth2-1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby22] >=dev-ruby/faraday-0.8[ruby_targets_ruby22] <dev-ruby/faraday-0.10[ruby_targets_ruby22] >=dev-ruby/hashie-3.4[ruby_targets_ruby22] =dev-ruby/oauth2-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/addressable-2.4[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby22] >=dev-ruby/faraday-0.8[ruby_targets_ruby22] <dev-ruby/faraday-0.10[ruby_targets_ruby22] >=dev-ruby/hashie-3.4[ruby_targets_ruby22] =dev-ruby/oauth2-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=https://github.com/peter-murach/github/archive/v0.14.5.tar.gz -> github_api-0.14.5.tar.gz
 _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_=762e8be24e1e9b3bf7d8082075d940c9
diff --git a/metadata/md5-cache/dev-ruby/github_api-0.17.0 b/metadata/md5-cache/dev-ruby/github_api-0.17.0
index 9bdd08483ba4..9d998afaeb99 100644
--- a/metadata/md5-cache/dev-ruby/github_api-0.17.0
+++ b/metadata/md5-cache/dev-ruby/github_api-0.17.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby21] =dev-ruby/addressable-2.4*[ruby_targets_ruby21] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby21] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby21] >=dev-ruby/faraday-0.8[ruby_targets_ruby21] <dev-ruby/faraday-0.10[ruby_targets_ruby21] >=dev-ruby/hashie-3.4[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] <dev-ruby/mime-types-3:*[ruby_targets_ruby21] =dev-ruby/oauth2-1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby22] >=dev-ruby/faraday-0.8[ruby_targets_ruby22] <dev-ruby/faraday-0.10[ruby_targets_ruby22] >=dev-ruby/hashie-3.4[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-3:*[ruby_targets_ruby22] =dev-ruby/oauth2-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby23] >=dev-ruby/faraday-0.8[ruby_targets_ruby23] <dev-ruby/faraday-0.10[ruby_targets_ruby23] >=dev-ruby/hashie-3.4[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[ruby_targets_ruby23] =dev-ruby/oauth2-1*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-2.14[ruby_targets_ruby21] dev-ruby/webmock:2[ruby_targets_ruby21] dev-ruby/vcr:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.14[ruby_targets_ruby22] dev-ruby/webmock:2[ruby_targets_ruby22] dev-ruby/vcr:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-2.14[ruby_targets_ruby23] dev-ruby/webmock:2[ruby_targets_ruby23] dev-ruby/vcr:3[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: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-ruby/addressable-2.4[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby22] >=dev-ruby/faraday-0.8[ruby_targets_ruby22] <dev-ruby/faraday-0.10[ruby_targets_ruby22] >=dev-ruby/hashie-3.4[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-3:*[ruby_targets_ruby22] =dev-ruby/oauth2-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby23] >=dev-ruby/faraday-0.8[ruby_targets_ruby23] <dev-ruby/faraday-0.10[ruby_targets_ruby23] >=dev-ruby/hashie-3.4[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[ruby_targets_ruby23] =dev-ruby/oauth2-1*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.14[ruby_targets_ruby22] dev-ruby/webmock:2[ruby_targets_ruby22] dev-ruby/vcr:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-2.14[ruby_targets_ruby23] dev-ruby/webmock:2[ruby_targets_ruby23] dev-ruby/vcr:3[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: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=A Ruby wrapper for the GitHub REST API v3
 EAPI=6
 HOMEPAGE=https://github.com/peter-murach/github
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby21] =dev-ruby/addressable-2.4*[ruby_targets_ruby21] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby21] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby21] >=dev-ruby/faraday-0.8[ruby_targets_ruby21] <dev-ruby/faraday-0.10[ruby_targets_ruby21] >=dev-ruby/hashie-3.4[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] <dev-ruby/mime-types-3:*[ruby_targets_ruby21] =dev-ruby/oauth2-1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby22] >=dev-ruby/faraday-0.8[ruby_targets_ruby22] <dev-ruby/faraday-0.10[ruby_targets_ruby22] >=dev-ruby/hashie-3.4[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-3:*[ruby_targets_ruby22] =dev-ruby/oauth2-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby23] >=dev-ruby/faraday-0.8[ruby_targets_ruby23] <dev-ruby/faraday-0.10[ruby_targets_ruby23] >=dev-ruby/hashie-3.4[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[ruby_targets_ruby23] =dev-ruby/oauth2-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/addressable-2.4[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby22] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby22] >=dev-ruby/faraday-0.8[ruby_targets_ruby22] <dev-ruby/faraday-0.10[ruby_targets_ruby22] >=dev-ruby/hashie-3.4[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-3:*[ruby_targets_ruby22] =dev-ruby/oauth2-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby23] =dev-ruby/descendants_tracker-0.0*[ruby_targets_ruby23] >=dev-ruby/faraday-0.8[ruby_targets_ruby23] <dev-ruby/faraday-0.10[ruby_targets_ruby23] >=dev-ruby/hashie-3.4[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[ruby_targets_ruby23] =dev-ruby/oauth2-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=https://github.com/peter-murach/github/archive/v0.17.0.tar.gz -> github_api-0.17.0.tar.gz
 _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_=9918bc8cddf1f14bf3836340d88b85fd
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.3.6 b/metadata/md5-cache/dev-ruby/globalid-0.3.6
index 4a3e07920414..c123a03cbaa4 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.3.6
+++ b/metadata/md5-cache/dev-ruby/globalid-0.3.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] >=dev-ruby/activemodel-4.1.0[ruby_targets_ruby21] >=dev-ruby/railties-4.1.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/activemodel-4.1.0[ruby_targets_ruby22] >=dev-ruby/railties-4.1.0[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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/bundler[ruby_targets_ruby22] >=dev-ruby/activemodel-4.1.0[ruby_targets_ruby22] >=dev-ruby/railties-4.1.0[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Reference models by URI
 EAPI=5
 HOMEPAGE=https://github.com/rails/globalid
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.1.0:*[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/activesupport-4.1.0:*[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=https://github.com/rails/globalid/archive/v0.3.6.tar.gz -> globalid-0.3.6.tar.gz
 _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_=617eda4e05731406fac055c906bcb053
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.3.6-r1 b/metadata/md5-cache/dev-ruby/globalid-0.3.6-r1
index a5a85447574c..60a19d435f3e 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.3.6-r1
+++ b/metadata/md5-cache/dev-ruby/globalid-0.3.6-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] >=dev-ruby/activemodel-4.1.0[ruby_targets_ruby21] >=dev-ruby/railties-4.1.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/activemodel-4.1.0[ruby_targets_ruby22] >=dev-ruby/railties-4.1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/activemodel-4.1.0[ruby_targets_ruby23] >=dev-ruby/railties-4.1.0[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.1.0:*[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/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/bundler[ruby_targets_ruby22] >=dev-ruby/activemodel-4.1.0[ruby_targets_ruby22] >=dev-ruby/railties-4.1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/activemodel-4.1.0[ruby_targets_ruby23] >=dev-ruby/railties-4.1.0[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.1.0:*[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/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=Reference models by URI
 EAPI=5
 HOMEPAGE=https://github.com/rails/globalid
-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 ~ppc64 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.1.0:*[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/activesupport-4.1.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.1.0:*[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=https://github.com/rails/globalid/archive/v0.3.6.tar.gz -> globalid-0.3.6.tar.gz
 _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_=c33a85a314eba651c3167bc4f2b366db
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.3.7 b/metadata/md5-cache/dev-ruby/globalid-0.3.7
index b0d3bfbfc8e8..e6f1e54b855e 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.3.7
+++ b/metadata/md5-cache/dev-ruby/globalid-0.3.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] >=dev-ruby/activemodel-4.1.0[ruby_targets_ruby21] >=dev-ruby/railties-4.1.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/activemodel-4.1.0[ruby_targets_ruby22] >=dev-ruby/railties-4.1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/activemodel-4.1.0[ruby_targets_ruby23] >=dev-ruby/railties-4.1.0[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.1.0:*[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/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/bundler[ruby_targets_ruby22] >=dev-ruby/activemodel-4.1.0[ruby_targets_ruby22] >=dev-ruby/railties-4.1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/activemodel-4.1.0[ruby_targets_ruby23] >=dev-ruby/railties-4.1.0[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.1.0:*[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/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=Reference models by URI
 EAPI=5
 HOMEPAGE=https://github.com/rails/globalid
-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 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.1.0:*[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/activesupport-4.1.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.1.0:*[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=https://github.com/rails/globalid/archive/v0.3.7.tar.gz -> globalid-0.3.7.tar.gz
 _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_=8b9532c55fea9dbf230cf8371a914263
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.4.0 b/metadata/md5-cache/dev-ruby/globalid-0.4.0
index 05ecfdf0c1f2..98f0e1ab753c 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.4.0
+++ b/metadata/md5-cache/dev-ruby/globalid-0.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby21] >=dev-ruby/railties-4.2.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby22] >=dev-ruby/railties-4.2.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby23] >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2.0:*[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/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/bundler[ruby_targets_ruby22] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby22] >=dev-ruby/railties-4.2.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby23] >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2.0:*[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/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=Reference models by URI
 EAPI=6
 HOMEPAGE=https://github.com/rails/globalid
-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 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2.0:*[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/activesupport-4.2.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2.0:*[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=https://github.com/rails/globalid/archive/v0.4.0.tar.gz -> globalid-0.4.0.tar.gz
 _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_=473921cbb682bd310c79b385132462a6
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.4.0-r1 b/metadata/md5-cache/dev-ruby/globalid-0.4.0-r1
index 2ac5766041af..ae2592de6426 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/globalid-0.4.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby21] >=dev-ruby/railties-4.2.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby22] >=dev-ruby/railties-4.2.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby23] >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby24] >=dev-ruby/railties-4.2.0[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby22] >=dev-ruby/railties-4.2.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby23] >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby24] >=dev-ruby/railties-4.2.0[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Reference models by URI
 EAPI=6
 HOMEPAGE=https://github.com/rails/globalid
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v0.4.0.tar.gz -> globalid-0.4.0.tar.gz
 _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_=fa2037ddf42e0d4da28a7c3dfec29c34
diff --git a/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2 b/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
index 326b158be298..539cb0ae0170 100644
--- a/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
+++ b/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) 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? ( 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Gnuplot drawing library - Ruby Bindings
 EAPI=5
 HOMEPAGE=http://rgplot.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
-RDEPEND=sci-visualization/gnuplot 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=sci-visualization/gnuplot 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/gnuplot-2.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_=a42b83004d976322eca69e479435c2b8
diff --git a/metadata/md5-cache/dev-ruby/gpgme-2.0.12 b/metadata/md5-cache/dev-ruby/gpgme-2.0.12
index 343e9705fa8c..c09cb28af520 100644
--- a/metadata/md5-cache/dev-ruby/gpgme-2.0.12
+++ b/metadata/md5-cache/dev-ruby/gpgme-2.0.12
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=app-crypt/gpgme-1.1.3 ruby_targets_ruby21? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=>=app-crypt/gpgme-1.1.3 ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Ruby language binding for GnuPG Made Easy
 EAPI=5
 HOMEPAGE=https://github.com/ueno/ruby-gpgme
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=app-crypt/gpgme-1.1.3 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) 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 ) || ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=>=app-crypt/gpgme-1.1.3 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ) || ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ueno/ruby-gpgme/archive/2.0.12.tar.gz -> ruby-gpgme-2.0.12.tar.gz
 _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	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	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	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1806624611d92e011b2b1b5ebcadd5d8
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.6.0 b/metadata/md5-cache/dev-ruby/gruff-0.6.0
index b95a0ab38def..aaa9d5358773 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.6.0
+++ b/metadata/md5-cache/dev-ruby/gruff-0.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/test-unit[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/test-unit[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=test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/test-unit[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=Beautiful graphs for one or multiple datasets
 EAPI=5
 HOMEPAGE=https://github.com/topfunky/gruff
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=media-gfx/imagemagick[truetype] ruby_targets_ruby21? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rmagick-2.13.4[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=media-gfx/imagemagick[truetype] ruby_targets_ruby22? ( >=dev-ruby/rmagick-2.13.4[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/gruff-0.6.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_=64b08b2989db6860fc4b41fe10b1d451
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.7.0 b/metadata/md5-cache/dev-ruby/gruff-0.7.0
index 0288cc2cb093..a2ac2f9d8521 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.7.0
+++ b/metadata/md5-cache/dev-ruby/gruff-0.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/test-unit[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/test-unit[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/test-unit[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=test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/test-unit[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/test-unit[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=Beautiful graphs for one or multiple datasets
 EAPI=5
 HOMEPAGE=https://github.com/topfunky/gruff
-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 ~x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=media-gfx/imagemagick[truetype] ruby_targets_ruby21? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rmagick-2.13.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=media-gfx/imagemagick[truetype] ruby_targets_ruby22? ( >=dev-ruby/rmagick-2.13.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rmagick-2.13.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/gruff-0.7.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_=873b90fe10778aa62ddb554efd4204e4
diff --git a/metadata/md5-cache/dev-ruby/haml-4.0.7-r1 b/metadata/md5-cache/dev-ruby/haml-4.0.7-r1
index 85c82ccadb1c..0ee8c0c0aeaf 100644
--- a/metadata/md5-cache/dev-ruby/haml-4.0.7-r1
+++ b/metadata/md5-cache/dev-ruby/haml-4.0.7-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/tilt:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/tilt:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/tilt:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/rails:4.2[ruby_targets_ruby21] ) doc? ( dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/rails:4.2[ruby_targets_ruby22] ) doc? ( dev-ruby/yard[ruby_targets_ruby22] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/rails:4.2[ruby_targets_ruby23] ) doc? ( dev-ruby/yard[ruby_targets_ruby23] >=dev-ruby/maruku-0.7.2-r1[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( dev-ruby/tilt:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/tilt:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/rails:4.2[ruby_targets_ruby22] ) doc? ( dev-ruby/yard[ruby_targets_ruby22] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/rails:4.2[ruby_targets_ruby23] ) doc? ( dev-ruby/yard[ruby_targets_ruby23] >=dev-ruby/maruku-0.7.2-r1[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A ruby web page templating engine
 EAPI=5
 HOMEPAGE=http://haml-lang.com/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 arm ~arm64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby21? ( dev-ruby/tilt:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/tilt:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/tilt:*[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=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby22? ( dev-ruby/tilt:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/tilt:*[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=4
 SRC_URI=mirror://rubygems/haml-4.0.7.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_=428762778c48244855170dfc9942adbc
diff --git a/metadata/md5-cache/dev-ruby/haml-5.0.1 b/metadata/md5-cache/dev-ruby/haml-5.0.1
index 9f49da264969..57f2d4b93a38 100644
--- a/metadata/md5-cache/dev-ruby/haml-5.0.1
+++ b/metadata/md5-cache/dev-ruby/haml-5.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby21] dev-ruby/tilt:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby22] dev-ruby/tilt:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby23] dev-ruby/tilt:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/railties:4.2[ruby_targets_ruby21] dev-ruby/activemodel:4.2[ruby_targets_ruby21] dev-ruby/actionpack:4.2[ruby_targets_ruby21] ) doc? ( dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/railties:4.2[ruby_targets_ruby22] dev-ruby/activemodel:4.2[ruby_targets_ruby22] dev-ruby/actionpack:4.2[ruby_targets_ruby22] ) doc? ( dev-ruby/yard[ruby_targets_ruby22] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/railties:4.2[ruby_targets_ruby23] dev-ruby/activemodel:4.2[ruby_targets_ruby23] dev-ruby/actionpack:4.2[ruby_targets_ruby23] ) doc? ( dev-ruby/yard[ruby_targets_ruby23] >=dev-ruby/maruku-0.7.2-r1[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby22] dev-ruby/tilt:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby23] dev-ruby/tilt:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/railties:4.2[ruby_targets_ruby22] dev-ruby/activemodel:4.2[ruby_targets_ruby22] dev-ruby/actionpack:4.2[ruby_targets_ruby22] ) doc? ( dev-ruby/yard[ruby_targets_ruby22] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/railties:4.2[ruby_targets_ruby23] dev-ruby/activemodel:4.2[ruby_targets_ruby23] dev-ruby/actionpack:4.2[ruby_targets_ruby23] ) doc? ( dev-ruby/yard[ruby_targets_ruby23] >=dev-ruby/maruku-0.7.2-r1[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A ruby web page templating engine
 EAPI=6
 HOMEPAGE=http://haml-lang.com/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby21? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby21] dev-ruby/tilt:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby22] dev-ruby/tilt:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby23] dev-ruby/tilt:*[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=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby22? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby22] dev-ruby/tilt:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby23] dev-ruby/tilt:*[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=5
 SRC_URI=https://github.com/haml/haml/archive/v5.0.1.tar.gz -> haml-5.0.1.tar.gz
 _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_=437dd64b94f84555192386de885b60b7
diff --git a/metadata/md5-cache/dev-ruby/haml-5.0.2 b/metadata/md5-cache/dev-ruby/haml-5.0.2
index 763a63e54cee..c49c32f22f15 100644
--- a/metadata/md5-cache/dev-ruby/haml-5.0.2
+++ b/metadata/md5-cache/dev-ruby/haml-5.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby21] dev-ruby/tilt:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby22] dev-ruby/tilt:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby23] dev-ruby/tilt:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/railties:4.2[ruby_targets_ruby21] dev-ruby/activemodel:4.2[ruby_targets_ruby21] dev-ruby/actionpack:4.2[ruby_targets_ruby21] ) doc? ( dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/railties:4.2[ruby_targets_ruby22] dev-ruby/activemodel:4.2[ruby_targets_ruby22] dev-ruby/actionpack:4.2[ruby_targets_ruby22] ) doc? ( dev-ruby/yard[ruby_targets_ruby22] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/railties:4.2[ruby_targets_ruby23] dev-ruby/activemodel:4.2[ruby_targets_ruby23] dev-ruby/actionpack:4.2[ruby_targets_ruby23] ) doc? ( dev-ruby/yard[ruby_targets_ruby23] >=dev-ruby/maruku-0.7.2-r1[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby22] dev-ruby/tilt:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby23] dev-ruby/tilt:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/railties:4.2[ruby_targets_ruby22] dev-ruby/activemodel:4.2[ruby_targets_ruby22] dev-ruby/actionpack:4.2[ruby_targets_ruby22] ) doc? ( dev-ruby/yard[ruby_targets_ruby22] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/railties:4.2[ruby_targets_ruby23] dev-ruby/activemodel:4.2[ruby_targets_ruby23] dev-ruby/actionpack:4.2[ruby_targets_ruby23] ) doc? ( dev-ruby/yard[ruby_targets_ruby23] >=dev-ruby/maruku-0.7.2-r1[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A ruby web page templating engine
 EAPI=6
 HOMEPAGE=http://haml.info/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby21? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby21] dev-ruby/tilt:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby22] dev-ruby/tilt:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby23] dev-ruby/tilt:*[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=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby22? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby22] dev-ruby/tilt:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby23] dev-ruby/tilt:*[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=5
 SRC_URI=https://github.com/haml/haml/archive/v5.0.2.tar.gz -> haml-5.0.2.tar.gz
 _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_=f14b947673ca3055d3d88bd492b163cd
diff --git a/metadata/md5-cache/dev-ruby/haml-rails-0.9.0 b/metadata/md5-cache/dev-ruby/haml-rails-0.9.0
index a2efbcae50ad..5e19f019e3d8 100644
--- a/metadata/md5-cache/dev-ruby/haml-rails-0.9.0
+++ b/metadata/md5-cache/dev-ruby/haml-rails-0.9.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0.1[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.1[ruby_targets_ruby21] >=dev-ruby/railties-4.0.1[ruby_targets_ruby21] >=dev-ruby/haml-4.0.6[ruby_targets_ruby21] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0.1[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0.1[ruby_targets_ruby22] >=dev-ruby/railties-4.0.1[ruby_targets_ruby22] >=dev-ruby/haml-4.0.6[ruby_targets_ruby22] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rails-4.0.1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rails-4.0.1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0.1[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0.1[ruby_targets_ruby22] >=dev-ruby/railties-4.0.1[ruby_targets_ruby22] >=dev-ruby/haml-4.0.6[ruby_targets_ruby22] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rails-4.0.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) 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=Provides Haml generators for Rails 4
 EAPI=5
 HOMEPAGE=https://github.com/indirect/haml-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0.1[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.1[ruby_targets_ruby21] >=dev-ruby/railties-4.0.1[ruby_targets_ruby21] >=dev-ruby/haml-4.0.6[ruby_targets_ruby21] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0.1[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0.1[ruby_targets_ruby22] >=dev-ruby/railties-4.0.1[ruby_targets_ruby22] >=dev-ruby/haml-4.0.6[ruby_targets_ruby22] >=dev-ruby/html2haml-1.0.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/actionpack-4.0.1[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0.1[ruby_targets_ruby22] >=dev-ruby/railties-4.0.1[ruby_targets_ruby22] >=dev-ruby/haml-4.0.6[ruby_targets_ruby22] >=dev-ruby/html2haml-1.0.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/haml-rails-0.9.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_=d7be57726f4b37a8d2fedecfb40e9a96
diff --git a/metadata/md5-cache/dev-ruby/haml-rails-1.0.0 b/metadata/md5-cache/dev-ruby/haml-rails-1.0.0
index 3c3d52073a52..fd12be05bc7b 100644
--- a/metadata/md5-cache/dev-ruby/haml-rails-1.0.0
+++ b/metadata/md5-cache/dev-ruby/haml-rails-1.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0.1:*[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.1:*[ruby_targets_ruby21] >=dev-ruby/railties-4.0.1:*[ruby_targets_ruby21] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby21] <dev-ruby/haml-6:*[ruby_targets_ruby21] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0.1:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0.1:*[ruby_targets_ruby22] >=dev-ruby/railties-4.0.1:*[ruby_targets_ruby22] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby22] <dev-ruby/haml-6:*[ruby_targets_ruby22] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0.1:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0.1:*[ruby_targets_ruby23] >=dev-ruby/railties-4.0.1:*[ruby_targets_ruby23] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby23] <dev-ruby/haml-6:*[ruby_targets_ruby23] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rails-4.0.1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rails-4.0.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rails-4.0.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? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0.1:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0.1:*[ruby_targets_ruby22] >=dev-ruby/railties-4.0.1:*[ruby_targets_ruby22] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby22] <dev-ruby/haml-6:*[ruby_targets_ruby22] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0.1:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0.1:*[ruby_targets_ruby23] >=dev-ruby/railties-4.0.1:*[ruby_targets_ruby23] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby23] <dev-ruby/haml-6:*[ruby_targets_ruby23] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rails-4.0.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rails-4.0.1[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=Provides Haml generators for Rails 4
 EAPI=6
 HOMEPAGE=https://github.com/indirect/haml-rails
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0.1:*[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.1:*[ruby_targets_ruby21] >=dev-ruby/railties-4.0.1:*[ruby_targets_ruby21] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby21] <dev-ruby/haml-6:*[ruby_targets_ruby21] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0.1:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0.1:*[ruby_targets_ruby22] >=dev-ruby/railties-4.0.1:*[ruby_targets_ruby22] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby22] <dev-ruby/haml-6:*[ruby_targets_ruby22] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0.1:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0.1:*[ruby_targets_ruby23] >=dev-ruby/railties-4.0.1:*[ruby_targets_ruby23] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby23] <dev-ruby/haml-6:*[ruby_targets_ruby23] >=dev-ruby/html2haml-1.0.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/actionpack-4.0.1:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0.1:*[ruby_targets_ruby22] >=dev-ruby/railties-4.0.1:*[ruby_targets_ruby22] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby22] <dev-ruby/haml-6:*[ruby_targets_ruby22] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0.1:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0.1:*[ruby_targets_ruby23] >=dev-ruby/railties-4.0.1:*[ruby_targets_ruby23] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby23] <dev-ruby/haml-6:*[ruby_targets_ruby23] >=dev-ruby/html2haml-1.0.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/haml-rails-1.0.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_=a3a976a5f53f668d2d44190126dc5d20
diff --git a/metadata/md5-cache/dev-ruby/hamster-3.0.0-r1 b/metadata/md5-cache/dev-ruby/hamster-3.0.0-r1
index 8e1038891c04..02bb2d4c7815 100644
--- a/metadata/md5-cache/dev-ruby/hamster-3.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/hamster-3.0.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Efficient, immutable, thread-safe collection classes for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/hamstergem/hamster
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hamster-3.0.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_=4cfcd929028c27e644877075163ce16c
diff --git a/metadata/md5-cache/dev-ruby/hashdiff-0.3.4 b/metadata/md5-cache/dev-ruby/hashdiff-0.3.4
index 0efece35e76f..2e1d616cb61a 100644
--- a/metadata/md5-cache/dev-ruby/hashdiff-0.3.4
+++ b/metadata/md5-cache/dev-ruby/hashdiff-0.3.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Simple Hash extension to make working with nested hashes easier
 EAPI=6
 HOMEPAGE=https://github.com/liufengyun/hashdiff
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashdiff-0.3.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_=f122a9e662ec67d1e714f93caf214066
diff --git a/metadata/md5-cache/dev-ruby/hashdiff-0.3.5 b/metadata/md5-cache/dev-ruby/hashdiff-0.3.5
index 92796f2f5672..328e9312590a 100644
--- a/metadata/md5-cache/dev-ruby/hashdiff-0.3.5
+++ b/metadata/md5-cache/dev-ruby/hashdiff-0.3.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Simple Hash extension to make working with nested hashes easier
 EAPI=6
 HOMEPAGE=https://github.com/liufengyun/hashdiff
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashdiff-0.3.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_=e419cfe53781d608d54fecb100c7b8e2
diff --git a/metadata/md5-cache/dev-ruby/hashery-2.1.2 b/metadata/md5-cache/dev-ruby/hashery-2.1.2
index f246e5cdfbe9..af21efce4b6d 100644
--- a/metadata/md5-cache/dev-ruby/hashery-2.1.2
+++ b/metadata/md5-cache/dev-ruby/hashery-2.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/lemon[ruby_targets_ruby21] dev-ruby/qed[ruby_targets_ruby21] dev-ruby/rubytest[ruby_targets_ruby21] dev-ruby/rubytest-cli[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/lemon[ruby_targets_ruby22] dev-ruby/qed[ruby_targets_ruby22] dev-ruby/rubytest[ruby_targets_ruby22] dev-ruby/rubytest-cli[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/lemon[ruby_targets_ruby23] dev-ruby/qed[ruby_targets_ruby23] dev-ruby/rubytest[ruby_targets_ruby23] dev-ruby/rubytest-cli[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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/lemon[ruby_targets_ruby22] dev-ruby/qed[ruby_targets_ruby22] dev-ruby/rubytest[ruby_targets_ruby22] dev-ruby/rubytest-cli[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/lemon[ruby_targets_ruby23] dev-ruby/qed[ruby_targets_ruby23] dev-ruby/rubytest[ruby_targets_ruby23] dev-ruby/rubytest-cli[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=The Hashery is a tight collection of Hash-like classes
 EAPI=5
 HOMEPAGE=https://rubyworks.github.com/hashery
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
-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/hashery-2.1.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_=4827a97c420659b5b20a2fc1d9e2554c
diff --git a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.4-r1 b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.4-r1
index 6366ac047375..1cdcf80ac2b9 100644
--- a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.4-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Internal HashiCorp service to check version information
 EAPI=5
 HOMEPAGE=http://www.hashicorp.com
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashicorp-checkpoint-0.1.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_=df94dcf2b22a4c0f5a14f57cf34bf2d0
diff --git a/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1 b/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
index 133dabc29e1c..0ae0da4f7811 100644
--- a/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Hashie is a small collection of tools that make hashes more powerful
 EAPI=5
 HOMEPAGE=http://intridea.com/posts/hashie-the-hash-toolkit
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashie-2.1.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_=f4da09e8a18d4a59efcdfd57800f7adc
diff --git a/metadata/md5-cache/dev-ruby/hashie-3.4.6 b/metadata/md5-cache/dev-ruby/hashie-3.4.6
index 167b720c899c..4fe01e92baae 100644
--- a/metadata/md5-cache/dev-ruby/hashie-3.4.6
+++ b/metadata/md5-cache/dev-ruby/hashie-3.4.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/activesupport[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activesupport[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: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/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activesupport[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: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=Hashie is a small collection of tools that make hashes more powerful
 EAPI=5
 HOMEPAGE=http://intridea.com/posts/hashie-the-hash-toolkit
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=3
 SRC_URI=mirror://rubygems/hashie-3.4.6.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_=93555959c43ba2750d96d25a45a37a45
diff --git a/metadata/md5-cache/dev-ruby/hashie-3.5.1 b/metadata/md5-cache/dev-ruby/hashie-3.5.1
index b2b9166f6094..e6827e1176e0 100644
--- a/metadata/md5-cache/dev-ruby/hashie-3.5.1
+++ b/metadata/md5-cache/dev-ruby/hashie-3.5.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/activesupport[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activesupport[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: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/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activesupport[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: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=Hashie is a small collection of tools that make hashes more powerful
 EAPI=5
 HOMEPAGE=https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=3
 SRC_URI=mirror://rubygems/hashie-3.5.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_=fc18f23b2f3eeeceec627e1f5a39a7ec
diff --git a/metadata/md5-cache/dev-ruby/hashie-3.5.5 b/metadata/md5-cache/dev-ruby/hashie-3.5.5
index a7350f3f371a..d51c6cd30f6d 100644
--- a/metadata/md5-cache/dev-ruby/hashie-3.5.5
+++ b/metadata/md5-cache/dev-ruby/hashie-3.5.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/activesupport[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activesupport[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/activesupport[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activesupport[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/activesupport[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Hashie is a small collection of tools that make hashes more powerful
 EAPI=5
 HOMEPAGE=https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/hashie-3.5.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_=9c7efdc1093374387dd7dcd000d000c2
diff --git a/metadata/md5-cache/dev-ruby/hashie-3.5.6 b/metadata/md5-cache/dev-ruby/hashie-3.5.6
index 43a771998d06..1b3ab4509dd0 100644
--- a/metadata/md5-cache/dev-ruby/hashie-3.5.6
+++ b/metadata/md5-cache/dev-ruby/hashie-3.5.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/activesupport[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activesupport[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/activesupport[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activesupport[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/activesupport[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Hashie is a small collection of tools that make hashes more powerful
 EAPI=6
 HOMEPAGE=https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/hashie-3.5.6.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_=a903f166b1cd96b64e448e2954187436
diff --git a/metadata/md5-cache/dev-ruby/hashr-2.0.0 b/metadata/md5-cache/dev-ruby/hashr-2.0.0
index 08bac20bb689..bd12667f17ba 100644
--- a/metadata/md5-cache/dev-ruby/hashr-2.0.0
+++ b/metadata/md5-cache/dev-ruby/hashr-2.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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: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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) 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=Simple Hash extension to make working with nested hashes easier
 EAPI=5
 HOMEPAGE=https://github.com/svenfuchs/hashr
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/hashr-2.0.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_=15d7e1c71cce1676cfccd6a1b58212c4
diff --git a/metadata/md5-cache/dev-ruby/hashr-2.0.1 b/metadata/md5-cache/dev-ruby/hashr-2.0.1
index 1c1d59b20c92..226049a878f5 100644
--- a/metadata/md5-cache/dev-ruby/hashr-2.0.1
+++ b/metadata/md5-cache/dev-ruby/hashr-2.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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: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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) 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=Simple Hash extension to make working with nested hashes easier
 EAPI=5
 HOMEPAGE=https://github.com/svenfuchs/hashr
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/hashr-2.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_=e5a1b0be5ccddf38952f7c28fc8b77ba
diff --git a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0 b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
index 4a39f8f9a6db..9f8c7f9b0660 100644
--- a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
+++ b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Removes leading whitespace from Ruby heredocs
 EAPI=5
 HOMEPAGE=https://github.com/adrianomitre/heredoc_unindent
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/heredoc_unindent-1.2.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_=15b983f9a585297e7afcab91a2645359
diff --git a/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1 b/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1
index 54b55ca06879..afc5ef29e35a 100644
--- a/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1
+++ b/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json[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/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_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/mocha[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/json[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A simple pluggable Hierarchical Database
 EAPI=5
 HOMEPAGE=http://projects.puppetlabs.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=amd64 hppa ppc ~sparc x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json[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/json[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/hiera-1.3.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_=6a7851924cc2090f4bfbc5d372b92525
diff --git a/metadata/md5-cache/dev-ruby/hiera-2.0.0 b/metadata/md5-cache/dev-ruby/hiera-2.0.0
index 7fb4c5d59a68..b16dd6f5ca5c 100644
--- a/metadata/md5-cache/dev-ruby/hiera-2.0.0
+++ b/metadata/md5-cache/dev-ruby/hiera-2.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json[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=ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/json[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json[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=A simple pluggable Hierarchical Database
 EAPI=5
 HOMEPAGE=http://projects.puppetlabs.com/
-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 ~hppa ~ppc ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json[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/json[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json[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/hiera-2.0.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_=f3f1aca46e5ef362904afd823f337a07
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.2.2 b/metadata/md5-cache/dev-ruby/hiera-3.2.2
index 1fa4b57ccd79..92e3a24d4b38 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.2.2
+++ b/metadata/md5-cache/dev-ruby/hiera-3.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/deep_merge[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/deep_merge[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/deep_merge[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: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/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/deep_merge[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/deep_merge[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: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=A simple pluggable Hierarchical Database
 EAPI=5
 HOMEPAGE=http://projects.puppetlabs.com/
-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 hppa x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/deep_merge[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/deep_merge[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/deep_merge[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/deep_merge[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/deep_merge[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/hiera-3.2.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_=95cbdbecc570927e6ae946edd28be11a
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.3.0 b/metadata/md5-cache/dev-ruby/hiera-3.3.0
index 2510090573ff..abca1a8fdb00 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.3.0
+++ b/metadata/md5-cache/dev-ruby/hiera-3.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/deep_merge[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/deep_merge[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/deep_merge[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: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/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/deep_merge[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/deep_merge[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: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=A simple pluggable Hierarchical Database
 EAPI=5
 HOMEPAGE=https://docs.puppet.com/hiera/latest/
-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 ~hppa ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/deep_merge[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/deep_merge[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/deep_merge[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/deep_merge[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/deep_merge[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/hiera-3.3.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_=1a64b704e09738bed9dd51c31a055630
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.3.1 b/metadata/md5-cache/dev-ruby/hiera-3.3.1
index 466c1faf5cc5..6f857411c609 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.3.1
+++ b/metadata/md5-cache/dev-ruby/hiera-3.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/deep_merge[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/deep_merge[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/deep_merge[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: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/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/deep_merge[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/deep_merge[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: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=A simple pluggable Hierarchical Database
 EAPI=5
 HOMEPAGE=https://docs.puppet.com/hiera/latest/
-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 ~hppa ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/deep_merge[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/deep_merge[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/deep_merge[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/deep_merge[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/deep_merge[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/hiera-3.3.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_=1a64b704e09738bed9dd51c31a055630
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.4.0 b/metadata/md5-cache/dev-ruby/hiera-3.4.0
index 03641a44620a..c51dbf8ef8eb 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.4.0
+++ b/metadata/md5-cache/dev-ruby/hiera-3.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/deep_merge[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/deep_merge[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/deep_merge[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/deep_merge[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/deep_merge[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/deep_merge[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/deep_merge[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A simple pluggable Hierarchical Database
 EAPI=6
 HOMEPAGE=https://docs.puppet.com/hiera/latest/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/deep_merge[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/deep_merge[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/deep_merge[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/deep_merge[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/deep_merge[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/deep_merge[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/deep_merge[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-3.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_=70b301f7b976d10ebf031b79c852b4a2
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.1.0 b/metadata/md5-cache/dev-ruby/hiera-eyaml-2.1.0
index 867d9b11a4c2..198da95f4e56 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.1.0
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-2.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/highline-1.6.19[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/highline-1.6.19[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/trollop:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/trollop:2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-util/cucumber[ruby_targets_ruby21] =dev-util/aruba-0.6.2[ruby_targets_ruby21] app-admin/puppet[ruby_targets_ruby21] dev-ruby/hiera-eyaml-plaintext[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] =dev-util/aruba-0.6.2[ruby_targets_ruby22] app-admin/puppet[ruby_targets_ruby22] dev-ruby/hiera-eyaml-plaintext[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/highline-1.6.19[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/trollop:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] =dev-util/aruba-0.6.2[ruby_targets_ruby22] app-admin/puppet[ruby_targets_ruby22] dev-ruby/hiera-eyaml-plaintext[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=Encrypted YAML backend for hiera
 EAPI=5
 HOMEPAGE=https://github.com/TomPoulton/hiera-eyaml
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/highline-1.6.19[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/highline-1.6.19[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-ruby/trollop:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/trollop: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/highline-1.6.19[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-ruby/trollop: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=https://github.com/TomPoulton/hiera-eyaml/archive/v2.1.0.tar.gz -> hiera-eyaml-2.1.0.tar.gz
 _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_=e7df4b7de9331de2cb72fa94cc4c763f
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6 b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6
index 90bbae40067f..008aa703788e 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/gpgme-2.0.0[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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A GPG backend for hiera-eyaml
 EAPI=5
 HOMEPAGE=https://github.com/sihil/hiera-eyaml-gpg
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby22] ) ruby_targets_ruby21? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/gpgme-2.0.0[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/hiera-eyaml-1.3.8[ruby_targets_ruby22] ) ruby_targets_ruby22? ( >=dev-ruby/gpgme-2.0.0[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/hiera-eyaml-gpg-0.6.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_=ba0bd1d203a4d0dfbc4610a3e0309bc6
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6 b/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6
index 9cd1d0e0bc81..084dc8555534 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) 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? ( 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A plaintext backend for hiera-eyaml
 EAPI=5
 HOMEPAGE=https://github.com/gtmtechltd/hiera-eyaml-plaintext
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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/hiera-eyaml-plaintext-0.6.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_=0f768a0932c8c1aa6c6ee563b49a1e37
diff --git a/metadata/md5-cache/dev-ruby/highline-1.7.6 b/metadata/md5-cache/dev-ruby/highline-1.7.6
index f56b8eabac22..395a947f72a2 100644
--- a/metadata/md5-cache/dev-ruby/highline-1.7.6
+++ b/metadata/md5-cache/dev-ruby/highline-1.7.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=Highline is a high-level command-line IO library for ruby
 EAPI=5
 HOMEPAGE=https://github.com/JEG2/highline
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/highline-1.7.6.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_=dcfb1483fba05aa3f7769ebc6c85a9a0
diff --git a/metadata/md5-cache/dev-ruby/highline-1.7.8 b/metadata/md5-cache/dev-ruby/highline-1.7.8
index 4714126a699c..26efaef0f655 100644
--- a/metadata/md5-cache/dev-ruby/highline-1.7.8
+++ b/metadata/md5-cache/dev-ruby/highline-1.7.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Highline is a high-level command-line IO library for ruby
 EAPI=5
 HOMEPAGE=https://github.com/JEG2/highline
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/highline-1.7.8.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_=5c81bb6b85a862e3404a4f8c1dbd8218
diff --git a/metadata/md5-cache/dev-ruby/hike-1.2.3-r1 b/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
index 2928954319e2..0377b2c70192 100644
--- a/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Hike is a Ruby library for finding files in a set of paths
 EAPI=5
 HOMEPAGE=https://github.com/sstephenson/hike
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=https://github.com/sstephenson/hike/archive/v1.2.3.tar.gz -> hike-1.2.3.tgz
 _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_=dd80ce1ef1738f5f3d446afb261c5265
diff --git a/metadata/md5-cache/dev-ruby/hike-2.1.2 b/metadata/md5-cache/dev-ruby/hike-2.1.2
index 7dc677e13050..ca5e97bfa7b9 100644
--- a/metadata/md5-cache/dev-ruby/hike-2.1.2
+++ b/metadata/md5-cache/dev-ruby/hike-2.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[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/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[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=Hike is a Ruby library for finding files in a set of paths
 EAPI=5
 HOMEPAGE=https://github.com/sstephenson/hike
-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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=2
 SRC_URI=https://github.com/sstephenson/hike/archive/v2.1.2.tar.gz -> hike-2.1.2.tgz
 _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_=3340a4f0917407004a85de6eb9df10c4
diff --git a/metadata/md5-cache/dev-ruby/hipchat-1.6.0 b/metadata/md5-cache/dev-ruby/hipchat-1.6.0
index 9a57dc6bbad9..fb5116cebe96 100644
--- a/metadata/md5-cache/dev-ruby/hipchat-1.6.0
+++ b/metadata/md5-cache/dev-ruby/hipchat-1.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/httparty[ruby_targets_ruby21] dev-ruby/mimemagic[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/httparty[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/httparty[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rr[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] >dev-ruby/webmock-1.22.6:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rr[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] >dev-ruby/webmock-1.22.6:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rr[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] >dev-ruby/webmock-1.22.6:0[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=test? ( ruby_targets_ruby22? ( dev-ruby/httparty[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/httparty[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rr[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] >dev-ruby/webmock-1.22.6:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rr[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] >dev-ruby/webmock-1.22.6:0[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=Ruby library to interact with HipChat
 EAPI=6
 HOMEPAGE=https://github.com/hipchat/hipchat-rb
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/httparty[ruby_targets_ruby21] dev-ruby/mimemagic[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/httparty[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/httparty[ruby_targets_ruby23] dev-ruby/mimemagic[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/httparty[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/httparty[ruby_targets_ruby23] dev-ruby/mimemagic[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=https://github.com/hipchat/hipchat-rb/archive/v1.6.0.tar.gz -> hipchat-1.6.0.tar.gz
 _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_=a0a7c5b75691acd7fa7a3904d2cb2d5a
diff --git a/metadata/md5-cache/dev-ruby/hitimes-1.2.4 b/metadata/md5-cache/dev-ruby/hitimes-1.2.4
index 7127e491e8f4..4e0e3b0ec1b0 100644
--- a/metadata/md5-cache/dev-ruby/hitimes-1.2.4
+++ b/metadata/md5-cache/dev-ruby/hitimes-1.2.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/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? ( 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/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=A fast, high resolution timer library
 EAPI=5
 HOMEPAGE=https://github.com/copiousfreetime/hitimes
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC
-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/hitimes-1.2.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_=1f1ddc62c23fde9b6d3a1fb9cfd52c9b
diff --git a/metadata/md5-cache/dev-ruby/hitimes-1.2.5 b/metadata/md5-cache/dev-ruby/hitimes-1.2.5
index e164946c26d6..366f68b5f2f8 100644
--- a/metadata/md5-cache/dev-ruby/hitimes-1.2.5
+++ b/metadata/md5-cache/dev-ruby/hitimes-1.2.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A fast, high resolution timer library
 EAPI=6
 HOMEPAGE=https://github.com/copiousfreetime/hitimes
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hitimes-1.2.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_=9399519a2f1b40804439421af9143a31
diff --git a/metadata/md5-cache/dev-ruby/hitimes-1.2.6 b/metadata/md5-cache/dev-ruby/hitimes-1.2.6
index 7adf0fcfe1fa..04f8cc1ec793 100644
--- a/metadata/md5-cache/dev-ruby/hitimes-1.2.6
+++ b/metadata/md5-cache/dev-ruby/hitimes-1.2.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A fast, high resolution timer library
 EAPI=6
 HOMEPAGE=https://github.com/copiousfreetime/hitimes
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hitimes-1.2.6.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_=9399519a2f1b40804439421af9143a31
diff --git a/metadata/md5-cache/dev-ruby/hocon-1.2.5 b/metadata/md5-cache/dev-ruby/hocon-1.2.5
index c13cb1d37384..056a1bf793f5 100644
--- a/metadata/md5-cache/dev-ruby/hocon-1.2.5
+++ b/metadata/md5-cache/dev-ruby/hocon-1.2.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=This is a port of the Typesafe Config library to Ruby.
 EAPI=5
 HOMEPAGE=https://github.com/puppetlabs/ruby-hocon
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Apache-2.0
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hocon-1.2.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_=fa1496ef0bf0d0daba28a6aee2d9d5bd
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.13.0-r1 b/metadata/md5-cache/dev-ruby/hoe-3.13.0-r1
index ac8d28e02396..c71da16ae508 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.13.0-r1
+++ b/metadata/md5-cache/dev-ruby/hoe-3.13.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] >=dev-ruby/rdoc-4.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] >=dev-ruby/rdoc-4.0[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/minitest-5.3:5[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] >=dev-ruby/rdoc-4.0[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=Hoe extends rake to provide full project automation
 EAPI=5
 HOMEPAGE=http://seattlerb.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] >=dev-ruby/rdoc-4.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] >=dev-ruby/rdoc-4.0[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/rake-0.8.7[ruby_targets_ruby22] >=dev-ruby/rdoc-4.0[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/hoe-3.13.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_=83c4741105c536e8d18a8d3e15fb62f6
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.15.3-r2 b/metadata/md5-cache/dev-ruby/hoe-3.15.3-r2
index 4b1ed0ca87be..f852ff0ae33c 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.15.3-r2
+++ b/metadata/md5-cache/dev-ruby/hoe-3.15.3-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] <dev-ruby/rake-13.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] <dev-ruby/rake-13.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] <dev-ruby/rake-13.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] <dev-ruby/rake-13.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] <dev-ruby/rake-13.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] <dev-ruby/rake-13.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] <dev-ruby/rake-13.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Hoe extends rake to provide full project automation
 EAPI=5
 HOMEPAGE=https://www.zenspider.com/projects/hoe.html
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] <dev-ruby/rake-13.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] <dev-ruby/rake-13.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] <dev-ruby/rake-13.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] <dev-ruby/rake-13.0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] <dev-ruby/rake-13.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] <dev-ruby/rake-13.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] <dev-ruby/rake-13.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-3.15.3.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_=8e999758d212849af852a2129cbef17a
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.16.0 b/metadata/md5-cache/dev-ruby/hoe-3.16.0
index 839cea273e9b..0dc1ec68e0a4 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.16.0
+++ b/metadata/md5-cache/dev-ruby/hoe-3.16.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] <dev-ruby/rake-13.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] <dev-ruby/rake-13.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] <dev-ruby/rake-13.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] <dev-ruby/rake-13.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] <dev-ruby/rake-13.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] <dev-ruby/rake-13.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] <dev-ruby/rake-13.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Hoe extends rake to provide full project automation
 EAPI=5
 HOMEPAGE=https://www.zenspider.com/projects/hoe.html
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] <dev-ruby/rake-13.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] <dev-ruby/rake-13.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] <dev-ruby/rake-13.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] <dev-ruby/rake-13.0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] <dev-ruby/rake-13.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] <dev-ruby/rake-13.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] <dev-ruby/rake-13.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-3.16.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_=be56418488ef3520d9cf2b68c45a620c
diff --git a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4 b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4
index b4ede8831bf4..294dc33a6266 100644
--- a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4
+++ b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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? ( 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? ( 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=Hoe plugins providing tasks used by seattle.rb
 EAPI=5
 HOMEPAGE=http://seattlerb.rubyforge.org/hoe-seattlerb
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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/hoe-seattlerb-1.3.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_=97084346ed1d4577278a4d8a9d5f26d3
diff --git a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.5 b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.5
index f20b361fb263..c0a2bdf9a6c7 100644
--- a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.5
+++ b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Hoe plugins providing tasks used by seattle.rb
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/hoe-seattlerb
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-seattlerb-1.3.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_=6ee12666c30d0588017cecea6b75b3aa
diff --git a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5 b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
index cc5818e2cf4a..66dcdb3a17d6 100644
--- a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
+++ b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] dev-ruby/rake-compiler[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/rake-compiler[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/rake-compiler[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] dev-ruby/rake-compiler[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( dev-ruby/fast_xs[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/fast_xs[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/fast_xs[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/fast_xs[ruby_targets_ruby24] ) ) dev-util/ragel 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/rake-compiler[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/rake-compiler[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] dev-ruby/rake-compiler[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( dev-ruby/fast_xs[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/fast_xs[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/fast_xs[ruby_targets_ruby24] ) ) dev-util/ragel ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A fast and liberal HTML parser for Ruby
 EAPI=5
 HOMEPAGE=https://wiki.github.com/hpricot/hpricot
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/fast_xs[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/fast_xs[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/fast_xs[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/fast_xs[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/fast_xs[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/fast_xs[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/fast_xs[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hpricot-0.8.6.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_=20ca905ffb478d33ec8f1172a160336a
diff --git a/metadata/md5-cache/dev-ruby/html2haml-2.2.0 b/metadata/md5-cache/dev-ruby/html2haml-2.2.0
index 6daabdcfedf5..5b94db309574 100644
--- a/metadata/md5-cache/dev-ruby/html2haml-2.2.0
+++ b/metadata/md5-cache/dev-ruby/html2haml-2.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby21] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby21] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby21] >=dev-ruby/haml-4.0.0[ruby_targets_ruby21] <dev-ruby/haml-6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby22] >=dev-ruby/haml-4.0.0[ruby_targets_ruby22] <dev-ruby/haml-6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby23] >=dev-ruby/haml-4.0.0[ruby_targets_ruby23] <dev-ruby/haml-6[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:0[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby22] >=dev-ruby/haml-4.0.0[ruby_targets_ruby22] <dev-ruby/haml-6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby23] >=dev-ruby/haml-4.0.0[ruby_targets_ruby23] <dev-ruby/haml-6[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:0[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=Convert HTML and HTML+Erb to Haml
 EAPI=6
 HOMEPAGE=https://github.com/haml/html2haml
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby21] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby21] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby21] >=dev-ruby/haml-4.0.0[ruby_targets_ruby21] <dev-ruby/haml-6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby22] >=dev-ruby/haml-4.0.0[ruby_targets_ruby22] <dev-ruby/haml-6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby23] >=dev-ruby/haml-4.0.0[ruby_targets_ruby23] <dev-ruby/haml-6[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/nokogiri-1.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby22] >=dev-ruby/haml-4.0.0[ruby_targets_ruby22] <dev-ruby/haml-6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.5[ruby_targets_ruby23] >=dev-ruby/haml-4.0.0[ruby_targets_ruby23] <dev-ruby/haml-6[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/html2haml-2.2.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_=24cfe7b244d099c78a3d8cd456fde76d
diff --git a/metadata/md5-cache/dev-ruby/htmlentities-4.3.4 b/metadata/md5-cache/dev-ruby/htmlentities-4.3.4
index 5bc0ec37fabb..efafa346bda4 100644
--- a/metadata/md5-cache/dev-ruby/htmlentities-4.3.4
+++ b/metadata/md5-cache/dev-ruby/htmlentities-4.3.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A simple library for encoding/decoding entities in (X)HTML documents
 EAPI=5
 HOMEPAGE=https://github.com/threedaymonk/htmlentities
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=amd64 x86 ~x86-macos
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/htmlentities-4.3.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_=2ec6096064467dcda51feb312d46598c
diff --git a/metadata/md5-cache/dev-ruby/http-0.6.3-r1 b/metadata/md5-cache/dev-ruby/http-0.6.3-r1
index bca7c66f3942..0c66df3342a8 100644
--- a/metadata/md5-cache/dev-ruby/http-0.6.3-r1
+++ b/metadata/md5-cache/dev-ruby/http-0.6.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby21] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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_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? ( ruby_targets_ruby22? ( >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=An easy-to-use client library for making requests from Ruby
 EAPI=5
 HOMEPAGE=https://github.com/tarcieri/http
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby21] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[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/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[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.6
 SRC_URI=mirror://rubygems/http-0.6.3.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_=902064b80ef928ed3ae5702f6462f6d4
diff --git a/metadata/md5-cache/dev-ruby/http-0.9.8 b/metadata/md5-cache/dev-ruby/http-0.9.8
index 9ae4adc9d157..37541e797ace 100644
--- a/metadata/md5-cache/dev-ruby/http-0.9.8
+++ b/metadata/md5-cache/dev-ruby/http-0.9.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby21] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby21] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby21] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby21] dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=An easy-to-use client library for making requests from Ruby
 EAPI=5
 HOMEPAGE=https://github.com/tarcieri/http
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby21] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby21] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby21] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[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/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[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.8
 SRC_URI=mirror://rubygems/http-0.9.8.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_=dfa62faa00d2445b9fbb972895ab226b
diff --git a/metadata/md5-cache/dev-ruby/http-0.9.8-r1 b/metadata/md5-cache/dev-ruby/http-0.9.8-r1
index 677c3f81b46c..12c0d1f538f6 100644
--- a/metadata/md5-cache/dev-ruby/http-0.9.8-r1
+++ b/metadata/md5-cache/dev-ruby/http-0.9.8-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby21] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby21] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby21] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby21] dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby23] dev-ruby/rspec-its[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby23] dev-ruby/rspec-its[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=An easy-to-use client library for making requests from Ruby
 EAPI=5
 HOMEPAGE=https://github.com/tarcieri/http
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby21] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby21] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby21] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[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/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[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.8
 SRC_URI=mirror://rubygems/http-0.9.8.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_=3f6c004aa2be814beb1ee6dba0468b56
diff --git a/metadata/md5-cache/dev-ruby/http-0.9.8-r2 b/metadata/md5-cache/dev-ruby/http-0.9.8-r2
index 3b41d12b34bb..98af2890c310 100644
--- a/metadata/md5-cache/dev-ruby/http-0.9.8-r2
+++ b/metadata/md5-cache/dev-ruby/http-0.9.8-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby21] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby21] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby21] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby24] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby24] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby24] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby21] dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby24] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby24] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby24] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An easy-to-use client library for making requests from Ruby
 EAPI=5
 HOMEPAGE=https://github.com/tarcieri/http
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby21] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby21] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby21] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby24] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby24] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby24] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby24] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby24] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby24] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.8
 SRC_URI=mirror://rubygems/http-0.9.8.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_=f8f4286c9bddac4f853e47da3f06db12
diff --git a/metadata/md5-cache/dev-ruby/http-1.0.2 b/metadata/md5-cache/dev-ruby/http-1.0.2
index 996ff49b9e06..a203509f828a 100644
--- a/metadata/md5-cache/dev-ruby/http-1.0.2
+++ b/metadata/md5-cache/dev-ruby/http-1.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby21] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby21] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby21] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby21] dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby23] dev-ruby/rspec-its[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby23] dev-ruby/rspec-its[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=An easy-to-use client library for making requests from Ruby
 EAPI=5
 HOMEPAGE=https://github.com/tarcieri/http
-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 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby21] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby21] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby21] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[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/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[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=1.0
 SRC_URI=mirror://rubygems/http-1.0.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_=4a1d5e160c6f829b18c28048970c7a54
diff --git a/metadata/md5-cache/dev-ruby/http-2.2.1 b/metadata/md5-cache/dev-ruby/http-2.2.1
index e0aef82ca1c7..fedc35a641c1 100644
--- a/metadata/md5-cache/dev-ruby/http-2.2.1
+++ b/metadata/md5-cache/dev-ruby/http-2.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby21] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby21] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby21] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby21] dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby23] dev-ruby/rspec-its[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby23] dev-ruby/rspec-its[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=An easy-to-use client library for making requests from Ruby
 EAPI=5
 HOMEPAGE=https://github.com/tarcieri/http
-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 ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby21] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby21] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby21] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[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/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[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=2.0
 SRC_URI=mirror://rubygems/http-2.2.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_=14682bed854c3d959cb29917dd38443b
diff --git a/metadata/md5-cache/dev-ruby/http-2.2.2 b/metadata/md5-cache/dev-ruby/http-2.2.2
index 413d22e19139..b0030c25f4c7 100644
--- a/metadata/md5-cache/dev-ruby/http-2.2.2
+++ b/metadata/md5-cache/dev-ruby/http-2.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby21] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby21] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby21] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby21] dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby23] dev-ruby/rspec-its[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby23] dev-ruby/rspec-its[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=An easy-to-use client library for making requests from Ruby
 EAPI=6
 HOMEPAGE=https://github.com/tarcieri/http
-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 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby21] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby21] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby21] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[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/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[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=2.0
 SRC_URI=mirror://rubygems/http-2.2.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_=b5648c498e944111d68263a837a98e76
diff --git a/metadata/md5-cache/dev-ruby/http-cookie-1.0.2-r1 b/metadata/md5-cache/dev-ruby/http-cookie-1.0.2-r1
index 705734a4a6a1..e691705f6df6 100644
--- a/metadata/md5-cache/dev-ruby/http-cookie-1.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/http-cookie-1.0.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/domain_name-0.5:0[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/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=test? ( ruby_targets_ruby22? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/domain_name-0.5:0[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/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=A ruby library to handle HTTP cookies
 EAPI=5
 HOMEPAGE=https://github.com/sparklemotion/http-cookie
-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=~alpha amd64 ~arm ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/domain_name-0.5:0[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/domain_name-0.5:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/domain_name-0.5:0[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/http-cookie-1.0.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_=225e0b6f795933907d246a5985905735
diff --git a/metadata/md5-cache/dev-ruby/http-cookie-1.0.3 b/metadata/md5-cache/dev-ruby/http-cookie-1.0.3
index 566d4501956a..ebc2a486dc0c 100644
--- a/metadata/md5-cache/dev-ruby/http-cookie-1.0.3
+++ b/metadata/md5-cache/dev-ruby/http-cookie-1.0.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A ruby library to handle HTTP cookies
 EAPI=5
 HOMEPAGE=https://github.com/sparklemotion/http-cookie
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/http-cookie-1.0.3.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_=fc1431c6ee30fc66135f17cc4727d0d3
diff --git a/metadata/md5-cache/dev-ruby/http-form_data-1.0.1-r1 b/metadata/md5-cache/dev-ruby/http-form_data-1.0.1-r1
index ad6b7fca035f..7828ba38794b 100644
--- a/metadata/md5-cache/dev-ruby/http-form_data-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/http-form_data-1.0.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Utility-belt to build form data request bodies
 EAPI=5
 HOMEPAGE=https://github.com/httprb/form_data.rb
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=MIT
-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=1.0
 SRC_URI=mirror://rubygems/http-form_data-1.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_=e76bee61470324f5282bff1c68a512ae
diff --git a/metadata/md5-cache/dev-ruby/http-form_data-1.0.2 b/metadata/md5-cache/dev-ruby/http-form_data-1.0.2
index 48ac138c00e4..ae06c968861e 100644
--- a/metadata/md5-cache/dev-ruby/http-form_data-1.0.2
+++ b/metadata/md5-cache/dev-ruby/http-form_data-1.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Utility-belt to build form data request bodies
 EAPI=5
 HOMEPAGE=https://github.com/httprb/form_data.rb
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/http-form_data-1.0.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_=d22c33f57dca9b6c37afe1b68d6a4e83
diff --git a/metadata/md5-cache/dev-ruby/http-form_data-1.0.3 b/metadata/md5-cache/dev-ruby/http-form_data-1.0.3
index af0664b9483b..f3e33bb3cf17 100644
--- a/metadata/md5-cache/dev-ruby/http-form_data-1.0.3
+++ b/metadata/md5-cache/dev-ruby/http-form_data-1.0.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Utility-belt to build form data request bodies
 EAPI=6
 HOMEPAGE=https://github.com/httprb/form_data.rb
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/http-form_data-1.0.3.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_=654781b951e2a16e19a21501a0cb8d01
diff --git a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1 b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
index 146e8930d934..2e80505f75a0 100644
--- a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Simple callback-based HTTP request/response parser
 EAPI=5
 HOMEPAGE=https://github.com/tmm1/http_parser.rb
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/http_parser.rb-0.6.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_=2dfc14577a218ab1b9ed0a82cbe71cf1
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.14.0-r1 b/metadata/md5-cache/dev-ruby/httparty-0.14.0-r1
index b542fc12dd5a..b70d04e9cc83 100644
--- a/metadata/md5-cache/dev-ruby/httparty-0.14.0-r1
+++ b/metadata/md5-cache/dev-ruby/httparty-0.14.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/fakeweb[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/fakeweb[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/fakeweb[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/fakeweb[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/fakeweb[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: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=Makes http fun! Also, makes consuming restful web services dead easy
 EAPI=5
 HOMEPAGE=https://jnunemaker.github.com/httparty
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_xml-0.5.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/multi_xml-0.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_xml-0.5.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/httparty-0.14.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_=f0c7f3fff2bd28d6cd7c80189cec96ed
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.15.5 b/metadata/md5-cache/dev-ruby/httparty-0.15.5
index a8c661cd9950..e3469f8d0a8e 100644
--- a/metadata/md5-cache/dev-ruby/httparty-0.15.5
+++ b/metadata/md5-cache/dev-ruby/httparty-0.15.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/fakeweb[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/fakeweb[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/fakeweb[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/fakeweb[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/fakeweb[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: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=Makes http fun! Also, makes consuming restful web services dead easy
 EAPI=6
 HOMEPAGE=https://jnunemaker.github.com/httparty
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_xml-0.5.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/multi_xml-0.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_xml-0.5.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/httparty-0.15.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_=e28aec3c78ee4b84773254b140810c64
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.15.6 b/metadata/md5-cache/dev-ruby/httparty-0.15.6
index 3893b6e307bb..d2d7c5eca7e8 100644
--- a/metadata/md5-cache/dev-ruby/httparty-0.15.6
+++ b/metadata/md5-cache/dev-ruby/httparty-0.15.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/fakeweb[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/fakeweb[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/fakeweb[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/fakeweb[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/fakeweb[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: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=Makes http fun! Also, makes consuming restful web services dead easy
 EAPI=6
 HOMEPAGE=https://jnunemaker.github.com/httparty
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_xml-0.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_xml-0.5.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/multi_xml-0.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_xml-0.5.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/httparty-0.15.6.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_=e28aec3c78ee4b84773254b140810c64
diff --git a/metadata/md5-cache/dev-ruby/httpauth-0.2.1 b/metadata/md5-cache/dev-ruby/httpauth-0.2.1
index 8c051a2ae9c0..3870a62e8b3f 100644
--- a/metadata/md5-cache/dev-ruby/httpauth-0.2.1
+++ b/metadata/md5-cache/dev-ruby/httpauth-0.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Library implementing the full HTTP Authentication protocol (RFC 2617)
 EAPI=5
 HOMEPAGE=https://github.com/Manfred/HTTPauth
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/Manfred/HTTPauth/archive/v0.2.1.tar.gz -> httpauth-0.2.1.tar.gz
 _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_=53a065a40e3574dd061cd6a243e3d75b
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.8.2.4 b/metadata/md5-cache/dev-ruby/httpclient-2.8.2.4
index aba146d691f5..6b02b2b04983 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.8.2.4
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.8.2.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ) 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/test-unit[ruby_targets_ruby21] dev-ruby/http-cookie[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit[ruby_targets_ruby22] dev-ruby/http-cookie[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit[ruby_targets_ruby23] dev-ruby/http-cookie[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ) 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/test-unit[ruby_targets_ruby22] dev-ruby/http-cookie[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit[ruby_targets_ruby23] dev-ruby/http-cookie[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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='httpclient' gives something like the functionality of libwww-perl (LWP) in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/nahi/httpclient
-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=~alpha amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Ruby
-RDEPEND=!dev-ruby/http-access2 ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[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=!dev-ruby/http-access2 ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[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=https://github.com/nahi/httpclient/archive/v2.8.2.4.tar.gz -> httpclient-2.8.2.4.tgz
 _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_=6f347011bd03d24460ac8556e072a3b0
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.8.3 b/metadata/md5-cache/dev-ruby/httpclient-2.8.3
index 4652a286a94e..ab6c1f963238 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.8.3
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.8.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit[ruby_targets_ruby21] dev-ruby/http-cookie[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit[ruby_targets_ruby22] dev-ruby/http-cookie[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit[ruby_targets_ruby23] dev-ruby/http-cookie[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit[ruby_targets_ruby24] dev-ruby/http-cookie[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit[ruby_targets_ruby22] dev-ruby/http-cookie[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit[ruby_targets_ruby23] dev-ruby/http-cookie[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit[ruby_targets_ruby24] dev-ruby/http-cookie[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION='httpclient' gives something like the functionality of libwww-perl (LWP) in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/nahi/httpclient
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Ruby
-RDEPEND=!dev-ruby/http-access2 ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=!dev-ruby/http-access2 ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/nahi/httpclient/archive/v2.8.3.tar.gz -> httpclient-2.8.3.tgz
 _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_=8bb76f3c0f4e1e4a961bab0ea69e56c2
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.6.11-r1 b/metadata/md5-cache/dev-ruby/i18n-0.6.11-r1
index dc1bb9bf1acd..007ed9ab005b 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.6.11-r1
+++ b/metadata/md5-cache/dev-ruby/i18n-0.6.11-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/activesupport[ruby_targets_ruby21] dev-ruby/mocha:1.0[ruby_targets_ruby21] dev-ruby/test_declarative[ruby_targets_ruby21] dev-ruby/minitest:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/activesupport[ruby_targets_ruby22] dev-ruby/mocha:1.0[ruby_targets_ruby22] dev-ruby/test_declarative[ruby_targets_ruby22] dev-ruby/minitest:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activesupport[ruby_targets_ruby23] dev-ruby/mocha:1.0[ruby_targets_ruby23] dev-ruby/test_declarative[ruby_targets_ruby23] dev-ruby/minitest:0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/activesupport[ruby_targets_ruby24] dev-ruby/mocha:1.0[ruby_targets_ruby24] dev-ruby/test_declarative[ruby_targets_ruby24] dev-ruby/minitest:0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/activesupport[ruby_targets_ruby22] dev-ruby/mocha:1.0[ruby_targets_ruby22] dev-ruby/test_declarative[ruby_targets_ruby22] dev-ruby/minitest:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activesupport[ruby_targets_ruby23] dev-ruby/mocha:1.0[ruby_targets_ruby23] dev-ruby/test_declarative[ruby_targets_ruby23] dev-ruby/minitest:0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/activesupport[ruby_targets_ruby24] dev-ruby/mocha:1.0[ruby_targets_ruby24] dev-ruby/test_declarative[ruby_targets_ruby24] dev-ruby/minitest:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Add Internationalization support to your Ruby application
 EAPI=5
 HOMEPAGE=http://rails-i18n.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.6
 SRC_URI=mirror://rubygems/i18n-0.6.11.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_=8b8bc4cd460fa000aefd3f557b9dab57
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.7.0-r2 b/metadata/md5-cache/dev-ruby/i18n-0.7.0-r2
index 1395856a25f6..07c741a651c5 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.7.0-r2
+++ b/metadata/md5-cache/dev-ruby/i18n-0.7.0-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/activesupport-3.2[ruby_targets_ruby21] <dev-ruby/activesupport-4.3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] >=dev-ruby/mocha-0.13[ruby_targets_ruby21] dev-ruby/test_declarative[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activesupport-3.2[ruby_targets_ruby22] <dev-ruby/activesupport-4.3[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/test_declarative[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activesupport-3.2[ruby_targets_ruby23] <dev-ruby/activesupport-4.3[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/test_declarative[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/activesupport-3.2[ruby_targets_ruby24] <dev-ruby/activesupport-4.3[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] dev-ruby/test_declarative[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/activesupport-3.2[ruby_targets_ruby22] <dev-ruby/activesupport-4.3[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/test_declarative[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activesupport-3.2[ruby_targets_ruby23] <dev-ruby/activesupport-4.3[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/test_declarative[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/activesupport-3.2[ruby_targets_ruby24] <dev-ruby/activesupport-4.3[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] dev-ruby/test_declarative[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Add Internationalization support to your Ruby application
 EAPI=5
 HOMEPAGE=http://rails-i18n.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.7
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v0.7.0.tar.gz -> i18n-0.7.0.tar.gz
 _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_=7291f334797181ecef86e31143645225
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.8.1 b/metadata/md5-cache/dev-ruby/i18n-0.8.1
index 165573e7309c..d96cc7e3002f 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.8.1
+++ b/metadata/md5-cache/dev-ruby/i18n-0.8.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] >=dev-ruby/mocha-0.13[ruby_targets_ruby21] dev-ruby/test_declarative[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/test_declarative[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/test_declarative[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? ( 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/activesupport-4.2[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/test_declarative[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/test_declarative[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? ( 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=Add Internationalization support to your Ruby application
 EAPI=5
 HOMEPAGE=http://rails-i18n.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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.8
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v0.8.1.tar.gz -> i18n-0.8.1.tar.gz
 _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_=2fbab2bb3265fec2a9d64c062689121e
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.8.4 b/metadata/md5-cache/dev-ruby/i18n-0.8.4
index c21c817bc6e4..1b444ebf21ab 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.8.4
+++ b/metadata/md5-cache/dev-ruby/i18n-0.8.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] >=dev-ruby/mocha-0.13[ruby_targets_ruby21] dev-ruby/test_declarative[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/test_declarative[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/test_declarative[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] dev-ruby/test_declarative[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/test_declarative[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/test_declarative[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] dev-ruby/test_declarative[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Add Internationalization support to your Ruby application
 EAPI=6
 HOMEPAGE=http://rails-i18n.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.8
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v0.8.4.tar.gz -> i18n-0.8.4.tar.gz
 _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_=7432f09a84e5de67e216c9acb2d8b2a4
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.8.5 b/metadata/md5-cache/dev-ruby/i18n-0.8.5
index ee4b4045c252..1536cfda45bc 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.8.5
+++ b/metadata/md5-cache/dev-ruby/i18n-0.8.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] >=dev-ruby/mocha-0.13[ruby_targets_ruby21] dev-ruby/test_declarative[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/test_declarative[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/test_declarative[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] dev-ruby/test_declarative[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/test_declarative[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/test_declarative[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] dev-ruby/test_declarative[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Add Internationalization support to your Ruby application
 EAPI=6
 HOMEPAGE=http://rails-i18n.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.8
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v0.8.5.tar.gz -> i18n-0.8.5.tar.gz
 _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_=7432f09a84e5de67e216c9acb2d8b2a4
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.8.6 b/metadata/md5-cache/dev-ruby/i18n-0.8.6
index a130e928ff16..920ead49de18 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.8.6
+++ b/metadata/md5-cache/dev-ruby/i18n-0.8.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] >=dev-ruby/mocha-0.13[ruby_targets_ruby21] dev-ruby/test_declarative[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/test_declarative[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/test_declarative[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] dev-ruby/test_declarative[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/test_declarative[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/test_declarative[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] dev-ruby/test_declarative[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Add Internationalization support to your Ruby application
 EAPI=6
 HOMEPAGE=http://rails-i18n.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.8
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v0.8.6.tar.gz -> i18n-0.8.6.tar.gz
 _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_=7432f09a84e5de67e216c9acb2d8b2a4
diff --git a/metadata/md5-cache/dev-ruby/ice_nine-0.11.2 b/metadata/md5-cache/dev-ruby/ice_nine-0.11.2
index 6066cf307447..d9010778d99e 100644
--- a/metadata/md5-cache/dev-ruby/ice_nine-0.11.2
+++ b/metadata/md5-cache/dev-ruby/ice_nine-0.11.2
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Deep Freeze Ruby Objects
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/ice_nine https://github.com/dkubb/ice_nine
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ice_nine-0.11.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_=d5d4198267efd94702bcd05c223cacb0
diff --git a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1 b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
index 662ae977ba69..1de17069f8d7 100644
--- a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
+++ b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Measure image size (GIF, PNG, JPEG, etc)
 EAPI=5
 HOMEPAGE=http://imagesize.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=amd64 ~ppc x86
 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=https://github.com/mattheworiordan/imagesize/archive/bd5be2afb088beba3f0d863cef4eac7db56ca804.tar.gz -> imagesize-0.1.1_p20100902.tar.gz
 _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_=4fc597fe1dbb5de652c59fde273010fc
diff --git a/metadata/md5-cache/dev-ruby/inflecto-0.0.2 b/metadata/md5-cache/dev-ruby/inflecto-0.0.2
index 6f19561561e0..b8d4f0689a32 100644
--- a/metadata/md5-cache/dev-ruby/inflecto-0.0.2
+++ b/metadata/md5-cache/dev-ruby/inflecto-0.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Inflector for ruby
 EAPI=6
 HOMEPAGE=https://github.com/mbj/inflecto
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/inflecto-0.0.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_=98533d1e94944fa05542043f7c703323
diff --git a/metadata/md5-cache/dev-ruby/inifile-3.0.0 b/metadata/md5-cache/dev-ruby/inifile-3.0.0
index cafc598f7885..a875bc54e0e1 100644
--- a/metadata/md5-cache/dev-ruby/inifile-3.0.0
+++ b/metadata/md5-cache/dev-ruby/inifile-3.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Native Ruby package for reading and writing INI files
 EAPI=5
 HOMEPAGE=https://github.com/TwP/inifile
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/inifile-3.0.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_=91a622fa2ae828f66674e1ab7d38a22e
diff --git a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0 b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
index fd3c0c926158..7c25e78b14bd 100644
--- a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
+++ b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/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? ( 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/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=Manage class instances with dictionary
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/instance_storage/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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/instance_storage-1.0.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_=324f91ee656b079a6ee1231bb9e62151
diff --git a/metadata/md5-cache/dev-ruby/instantiator-0.0.6 b/metadata/md5-cache/dev-ruby/instantiator-0.0.6
index 685f60e4b66d..08e564a39604 100644
--- a/metadata/md5-cache/dev-ruby/instantiator-0.0.6
+++ b/metadata/md5-cache/dev-ruby/instantiator-0.0.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/blankslate:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/blankslate:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/blankslate:*[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/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=test? ( ruby_targets_ruby22? ( dev-ruby/blankslate:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/blankslate:*[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/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=Instantiate an arbitrary Ruby class
 EAPI=5
 HOMEPAGE=https://github.com/floehopper/introspection
-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=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/blankslate:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/blankslate:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/blankslate:*[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/blankslate:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/blankslate:*[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/instantiator-0.0.6.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_=8560c724842cc6b56a8417d1c2800c75
diff --git a/metadata/md5-cache/dev-ruby/instantiator-0.0.7 b/metadata/md5-cache/dev-ruby/instantiator-0.0.7
index bb128826a66c..a62b2e07f041 100644
--- a/metadata/md5-cache/dev-ruby/instantiator-0.0.7
+++ b/metadata/md5-cache/dev-ruby/instantiator-0.0.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/blankslate:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/blankslate:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/blankslate:*[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/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=test? ( ruby_targets_ruby22? ( dev-ruby/blankslate:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/blankslate:*[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/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=Instantiate an arbitrary Ruby class
 EAPI=5
 HOMEPAGE=https://github.com/floehopper/introspection
-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=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/blankslate:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/blankslate:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/blankslate:*[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/blankslate:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/blankslate:*[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/instantiator-0.0.7.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_=a69343821c83de6b6a27c8af6d435eaa
diff --git a/metadata/md5-cache/dev-ruby/introspection-0.0.3 b/metadata/md5-cache/dev-ruby/introspection-0.0.3
index 70b5f12dfc86..7e64ba70c8d3 100644
--- a/metadata/md5-cache/dev-ruby/introspection-0.0.3
+++ b/metadata/md5-cache/dev-ruby/introspection-0.0.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby21] >=dev-ruby/instantiator-0.0.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby22] >=dev-ruby/instantiator-0.0.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby23] >=dev-ruby/instantiator-0.0.3[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby22] >=dev-ruby/instantiator-0.0.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby23] >=dev-ruby/instantiator-0.0.3[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=Dynamic inspection of the hierarchy of method definitions on a Ruby object
 EAPI=5
 HOMEPAGE=http://jamesmead.org/
-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=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby21] >=dev-ruby/instantiator-0.0.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby22] >=dev-ruby/instantiator-0.0.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby23] >=dev-ruby/instantiator-0.0.3[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/metaclass-0.0.1[ruby_targets_ruby22] >=dev-ruby/instantiator-0.0.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby23] >=dev-ruby/instantiator-0.0.3[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/introspection-0.0.3.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_=a761b83976a101e57b7b0e6046e994b9
diff --git a/metadata/md5-cache/dev-ruby/introspection-0.0.4 b/metadata/md5-cache/dev-ruby/introspection-0.0.4
index 493040b3d192..5279b817546f 100644
--- a/metadata/md5-cache/dev-ruby/introspection-0.0.4
+++ b/metadata/md5-cache/dev-ruby/introspection-0.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/blankslate[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/blankslate[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/blankslate[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/blankslate[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/blankslate[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/blankslate[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/blankslate[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Dynamic inspection of the hierarchy of method definitions on a Ruby object
 EAPI=5
 HOMEPAGE=http://jamesmead.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/introspection-0.0.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_=efdbfa813490847c152844e4c770c4df
diff --git a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3 b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
index 9a8a40d98bbe..15f7ab8e89c5 100644
--- a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
+++ b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=IO::Buffer is a byte queue which is intended for non-blocking I/O applications
 EAPI=5
 HOMEPAGE=https://github.com/tarcieri/iobuffer
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/tarcieri/iobuffer/tarball/v1.1.2 -> iobuffer-git-1.1.2.tgz
 _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_=c44e5f115d66a7f14298735fb29da683
diff --git a/metadata/md5-cache/dev-ruby/itextomml-1.5.4 b/metadata/md5-cache/dev-ruby/itextomml-1.5.4
index b2891e32a7a3..a935dbd5f9bc 100644
--- a/metadata/md5-cache/dev-ruby/itextomml-1.5.4
+++ b/metadata/md5-cache/dev-ruby/itextomml-1.5.4
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Native Ruby bindings to itex2MML, which converts itex equations to MathML
 EAPI=5
 HOMEPAGE=http://golem.ph.utexas.edu/~distler/blog/itex2MML.html
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=|| ( GPL-2+ MPL-1.1 LGPL-2+ )
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/itextomml-1.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_=045f5944b6eb6e049b6001e342c675fe
diff --git a/metadata/md5-cache/dev-ruby/itextomml-1.5.5 b/metadata/md5-cache/dev-ruby/itextomml-1.5.5
index a8ee09f36afb..e801a7262de1 100644
--- a/metadata/md5-cache/dev-ruby/itextomml-1.5.5
+++ b/metadata/md5-cache/dev-ruby/itextomml-1.5.5
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Native Ruby bindings to itex2MML, which converts itex equations to MathML
 EAPI=5
 HOMEPAGE=http://golem.ph.utexas.edu/~distler/blog/itex2MML.html
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-2+ MPL-1.1 LGPL-2+ )
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/itextomml-1.5.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_=84b2f135f05edf37939b92be87949456
diff --git a/metadata/md5-cache/dev-ruby/itextomml-1.5.6 b/metadata/md5-cache/dev-ruby/itextomml-1.5.6
index a2df429aff5f..a235e4bdcbaa 100644
--- a/metadata/md5-cache/dev-ruby/itextomml-1.5.6
+++ b/metadata/md5-cache/dev-ruby/itextomml-1.5.6
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Native Ruby bindings to itex2MML, which converts itex equations to MathML
 EAPI=6
 HOMEPAGE=https://golem.ph.utexas.edu/~distler/blog/itex2MML.html
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-2+ MPL-1.1 LGPL-2+ )
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/itextomml-1.5.6.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_=d7e9517edcbd74e55569c87dd9efc45e
diff --git a/metadata/md5-cache/dev-ruby/jeweler-2.3.7 b/metadata/md5-cache/dev-ruby/jeweler-2.3.7
index 20950ae7c976..59ce1ca171df 100644
--- a/metadata/md5-cache/dev-ruby/jeweler-2.3.7
+++ b/metadata/md5-cache/dev-ruby/jeweler-2.3.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) test? ( dev-ruby/shoulda[ruby_targets_ruby21] dev-ruby/rr[ruby_targets_ruby21] dev-ruby/test-unit-rr[ruby_targets_ruby21] dev-ruby/test_construct[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/shoulda[ruby_targets_ruby22] dev-ruby/rr[ruby_targets_ruby22] dev-ruby/test-unit-rr[ruby_targets_ruby22] dev-ruby/test_construct[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/shoulda[ruby_targets_ruby23] dev-ruby/rr[ruby_targets_ruby23] dev-ruby/test-unit-rr[ruby_targets_ruby23] dev-ruby/test_construct[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/builder:*[ruby_targets_ruby21] >=dev-ruby/bundler-1.0[ruby_targets_ruby21] >=dev-ruby/git-1.2.5[ruby_targets_ruby21] >=dev-ruby/github_api-0.16.0[ruby_targets_ruby21] >=dev-ruby/highline-1.6.15[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby21] dev-ruby/psych:0[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] dev-ruby/semver2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/builder:*[ruby_targets_ruby22] >=dev-ruby/bundler-1.0[ruby_targets_ruby22] >=dev-ruby/git-1.2.5[ruby_targets_ruby22] >=dev-ruby/github_api-0.16.0[ruby_targets_ruby22] >=dev-ruby/highline-1.6.15[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby22] dev-ruby/psych:0[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/semver2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/builder:*[ruby_targets_ruby23] >=dev-ruby/bundler-1.0[ruby_targets_ruby23] >=dev-ruby/git-1.2.5[ruby_targets_ruby23] >=dev-ruby/github_api-0.16.0[ruby_targets_ruby23] >=dev-ruby/highline-1.6.15[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby23] dev-ruby/psych:0[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/semver2[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/shoulda[ruby_targets_ruby22] dev-ruby/rr[ruby_targets_ruby22] dev-ruby/test-unit-rr[ruby_targets_ruby22] dev-ruby/test_construct[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/shoulda[ruby_targets_ruby23] dev-ruby/rr[ruby_targets_ruby23] dev-ruby/test-unit-rr[ruby_targets_ruby23] dev-ruby/test_construct[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/builder:*[ruby_targets_ruby22] >=dev-ruby/bundler-1.0[ruby_targets_ruby22] >=dev-ruby/git-1.2.5[ruby_targets_ruby22] >=dev-ruby/github_api-0.16.0[ruby_targets_ruby22] >=dev-ruby/highline-1.6.15[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby22] dev-ruby/psych:0[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/semver2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/builder:*[ruby_targets_ruby23] >=dev-ruby/bundler-1.0[ruby_targets_ruby23] >=dev-ruby/git-1.2.5[ruby_targets_ruby23] >=dev-ruby/github_api-0.16.0[ruby_targets_ruby23] >=dev-ruby/highline-1.6.15[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby23] dev-ruby/psych:0[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/semver2[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Rake tasks to manage gems, versioning and generate new projects
 EAPI=6
 HOMEPAGE=https://wiki.github.com/technicalpickles/jeweler
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/builder:*[ruby_targets_ruby21] >=dev-ruby/bundler-1.0[ruby_targets_ruby21] >=dev-ruby/git-1.2.5[ruby_targets_ruby21] >=dev-ruby/github_api-0.16.0[ruby_targets_ruby21] >=dev-ruby/highline-1.6.15[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby21] dev-ruby/psych:0[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] dev-ruby/semver2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/builder:*[ruby_targets_ruby22] >=dev-ruby/bundler-1.0[ruby_targets_ruby22] >=dev-ruby/git-1.2.5[ruby_targets_ruby22] >=dev-ruby/github_api-0.16.0[ruby_targets_ruby22] >=dev-ruby/highline-1.6.15[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby22] dev-ruby/psych:0[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/semver2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/builder:*[ruby_targets_ruby23] >=dev-ruby/bundler-1.0[ruby_targets_ruby23] >=dev-ruby/git-1.2.5[ruby_targets_ruby23] >=dev-ruby/github_api-0.16.0[ruby_targets_ruby23] >=dev-ruby/highline-1.6.15[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby23] dev-ruby/psych:0[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/semver2[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:*[ruby_targets_ruby22] >=dev-ruby/bundler-1.0[ruby_targets_ruby22] >=dev-ruby/git-1.2.5[ruby_targets_ruby22] >=dev-ruby/github_api-0.16.0[ruby_targets_ruby22] >=dev-ruby/highline-1.6.15[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby22] dev-ruby/psych:0[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/semver2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/builder:*[ruby_targets_ruby23] >=dev-ruby/bundler-1.0[ruby_targets_ruby23] >=dev-ruby/git-1.2.5[ruby_targets_ruby23] >=dev-ruby/github_api-0.16.0[ruby_targets_ruby23] >=dev-ruby/highline-1.6.15[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby23] dev-ruby/psych:0[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/semver2[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/jeweler-2.3.7.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_=2dce1cbc38af28306fd9c0bb04d0acf8
diff --git a/metadata/md5-cache/dev-ruby/jira-ruby-1.3.0 b/metadata/md5-cache/dev-ruby/jira-ruby-1.3.0
index 43dd6cc7bf6c..d430e8f50620 100644
--- a/metadata/md5-cache/dev-ruby/jira-ruby-1.3.0
+++ b/metadata/md5-cache/dev-ruby/jira-ruby-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/jira-ruby-1.3.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_=befbeb7f0d0f42acb151142379f25798
diff --git a/metadata/md5-cache/dev-ruby/jira-ruby-1.4.0 b/metadata/md5-cache/dev-ruby/jira-ruby-1.4.0
index bd1a6b7be545..764a84fcb2d1 100644
--- a/metadata/md5-cache/dev-ruby/jira-ruby-1.4.0
+++ b/metadata/md5-cache/dev-ruby/jira-ruby-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/jira-ruby-1.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_=befbeb7f0d0f42acb151142379f25798
diff --git a/metadata/md5-cache/dev-ruby/jira-ruby-1.4.1 b/metadata/md5-cache/dev-ruby/jira-ruby-1.4.1
index c440655cc1f0..f1fb6c772077 100644
--- a/metadata/md5-cache/dev-ruby/jira-ruby-1.4.1
+++ b/metadata/md5-cache/dev-ruby/jira-ruby-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/jira-ruby-1.4.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_=befbeb7f0d0f42acb151142379f25798
diff --git a/metadata/md5-cache/dev-ruby/jmespath-1.3.1 b/metadata/md5-cache/dev-ruby/jmespath-1.3.1
index 8d0bd6e0abb5..c06b083e49fe 100644
--- a/metadata/md5-cache/dev-ruby/jmespath-1.3.1
+++ b/metadata/md5-cache/dev-ruby/jmespath-1.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Implements JMESPath for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/jmespath/jmespath.rb
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=https://github.com/jmespath/jmespath.rb/archive/v1.3.1.tar.gz -> jmespath-1.3.1.tar.gz
 _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_=8efd8d7d16a3cc76f8cc73408d17c190
diff --git a/metadata/md5-cache/dev-ruby/journey-1.0.4-r1 b/metadata/md5-cache/dev-ruby/journey-1.0.4-r1
index cb3887ef93ce..8ec176817dbe 100644
--- a/metadata/md5-cache/dev-ruby/journey-1.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/journey-1.0.4-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/json[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/json[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/hoe[ruby_targets_ruby24] dev-ruby/json[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/json[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/json[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/hoe[ruby_targets_ruby24] dev-ruby/json[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Journey is a router. It routes requests
 EAPI=5
 HOMEPAGE=https://github.com/rails/journey
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/journey-1.0.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_=45d38476f5373f9e6abd9803f86be820
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-3.1.4 b/metadata/md5-cache/dev-ruby/jquery-rails-3.1.4
index 37d3f0737c6d..d838cdb3c420 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-3.1.4
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-3.1.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] <dev-ruby/railties-5.0:*[ruby_targets_ruby21] >=dev-ruby/thor-0.14[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] <dev-ruby/railties-5.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] <dev-ruby/railties-5.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14[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] ) 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-ruby/railties-3.0:*[ruby_targets_ruby22] <dev-ruby/railties-5.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] <dev-ruby/railties-5.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=jQuery! For Rails! So great
 EAPI=5
 HOMEPAGE=http://www.rubyonrails.org
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] <dev-ruby/railties-5.0:*[ruby_targets_ruby21] >=dev-ruby/thor-0.14[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] <dev-ruby/railties-5.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] <dev-ruby/railties-5.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14[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/railties-3.0:*[ruby_targets_ruby22] <dev-ruby/railties-5.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] <dev-ruby/railties-5.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14[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=3
 SRC_URI=mirror://rubygems/jquery-rails-3.1.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_=36735e9fa59a35edb97c9e821756c2b9
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.1.1 b/metadata/md5-cache/dev-ruby/jquery-rails-4.1.1
index 60cd20b60ebc..773b8350d3c0 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.1.1
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby21] >=dev-ruby/thor-0.14[ruby_targets_ruby21] dev-ruby/rails-dom-testing:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] dev-ruby/rails-dom-testing: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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] dev-ruby/rails-dom-testing:1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=jQuery! For Rails! So great
 EAPI=5
 HOMEPAGE=http://www.rubyonrails.org
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby21] >=dev-ruby/thor-0.14[ruby_targets_ruby21] dev-ruby/rails-dom-testing:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] dev-ruby/rails-dom-testing: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/railties-4.2.0[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] dev-ruby/rails-dom-testing: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=4
 SRC_URI=mirror://rubygems/jquery-rails-4.1.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_=5b2eca8b752ef2721bbe1135458742c5
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.1.1-r1 b/metadata/md5-cache/dev-ruby/jquery-rails-4.1.1-r1
index 2f7d6a90c323..326571905dae 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.1.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby21] >=dev-ruby/thor-0.14[ruby_targets_ruby21] dev-ruby/rails-dom-testing:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] dev-ruby/rails-dom-testing:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] >=dev-ruby/thor-0.14[ruby_targets_ruby23] dev-ruby/rails-dom-testing: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] ) 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-ruby/railties-4.2.0[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] dev-ruby/rails-dom-testing:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] >=dev-ruby/thor-0.14[ruby_targets_ruby23] dev-ruby/rails-dom-testing: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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=jQuery! For Rails! So great
 EAPI=5
 HOMEPAGE=http://www.rubyonrails.org
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~arm ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby21] >=dev-ruby/thor-0.14[ruby_targets_ruby21] dev-ruby/rails-dom-testing:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] dev-ruby/rails-dom-testing:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] >=dev-ruby/thor-0.14[ruby_targets_ruby23] dev-ruby/rails-dom-testing: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/railties-4.2.0[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] dev-ruby/rails-dom-testing:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] >=dev-ruby/thor-0.14[ruby_targets_ruby23] dev-ruby/rails-dom-testing: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=4
 SRC_URI=mirror://rubygems/jquery-rails-4.1.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_=f9df0332d32d7f055c0cbc5288b04827
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.2.2 b/metadata/md5-cache/dev-ruby/jquery-rails-4.2.2
index 0fe3a8445a81..b51cb26d9dea 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.2.2
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby21] >=dev-ruby/thor-0.14[ruby_targets_ruby21] <dev-ruby/thor-2[ruby_targets_ruby21] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby21] dev-ruby/rails-dom-testing:1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] dev-ruby/rails-dom-testing:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] dev-ruby/rails-dom-testing: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] ) 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-ruby/railties-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] dev-ruby/rails-dom-testing:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] dev-ruby/rails-dom-testing: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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=jQuery! For Rails! So great
 EAPI=5
 HOMEPAGE=http://www.rubyonrails.org
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby21] >=dev-ruby/thor-0.14[ruby_targets_ruby21] <dev-ruby/thor-2[ruby_targets_ruby21] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby21] dev-ruby/rails-dom-testing:1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] dev-ruby/rails-dom-testing:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] dev-ruby/rails-dom-testing: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/railties-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] dev-ruby/rails-dom-testing:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] dev-ruby/rails-dom-testing: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=4
 SRC_URI=mirror://rubygems/jquery-rails-4.2.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_=61a380796f0c78a965c5cfa75190dce7
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.3.1 b/metadata/md5-cache/dev-ruby/jquery-rails-4.3.1
index b8a8e28c7e08..c824c98cc763 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.3.1
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby21] >=dev-ruby/thor-0.14[ruby_targets_ruby21] <dev-ruby/thor-2[ruby_targets_ruby21] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby21] dev-ruby/rails-dom-testing:1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] dev-ruby/rails-dom-testing:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] dev-ruby/rails-dom-testing: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] ) 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-ruby/railties-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] dev-ruby/rails-dom-testing:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] dev-ruby/rails-dom-testing: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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=jQuery! For Rails! So great
 EAPI=5
 HOMEPAGE=http://www.rubyonrails.org
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby21] >=dev-ruby/thor-0.14[ruby_targets_ruby21] <dev-ruby/thor-2[ruby_targets_ruby21] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby21] dev-ruby/rails-dom-testing:1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] dev-ruby/rails-dom-testing:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] dev-ruby/rails-dom-testing: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/railties-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] dev-ruby/rails-dom-testing:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] dev-ruby/rails-dom-testing: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=4
 SRC_URI=mirror://rubygems/jquery-rails-4.3.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_=de649ed4646c106bf742652bd95a4749
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.3.1-r1 b/metadata/md5-cache/dev-ruby/jquery-rails-4.3.1-r1
index 2a073bf6b91d..8d8f08899226 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.3.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby21] >=dev-ruby/thor-0.14[ruby_targets_ruby21] <dev-ruby/thor-2[ruby_targets_ruby21] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby21] dev-ruby/rails-dom-testing:1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] dev-ruby/rails-dom-testing:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] dev-ruby/rails-dom-testing:1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby24] >=dev-ruby/thor-0.14[ruby_targets_ruby24] <dev-ruby/thor-2[ruby_targets_ruby24] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] dev-ruby/rails-dom-testing:1[ruby_targets_ruby24] ) ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] dev-ruby/rails-dom-testing:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] dev-ruby/rails-dom-testing:1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby24] >=dev-ruby/thor-0.14[ruby_targets_ruby24] <dev-ruby/thor-2[ruby_targets_ruby24] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] dev-ruby/rails-dom-testing:1[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=jQuery! For Rails! So great
 EAPI=5
 HOMEPAGE=http://www.rubyonrails.org
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby21] >=dev-ruby/thor-0.14[ruby_targets_ruby21] <dev-ruby/thor-2[ruby_targets_ruby21] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby21] dev-ruby/rails-dom-testing:1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] dev-ruby/rails-dom-testing:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] dev-ruby/rails-dom-testing:1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby24] >=dev-ruby/thor-0.14[ruby_targets_ruby24] <dev-ruby/thor-2[ruby_targets_ruby24] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] dev-ruby/rails-dom-testing:1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/thor-0.14[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] dev-ruby/rails-dom-testing:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/thor-0.14[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] dev-ruby/rails-dom-testing:1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby24] >=dev-ruby/thor-0.14[ruby_targets_ruby24] <dev-ruby/thor-2[ruby_targets_ruby24] || ( dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] dev-ruby/rails-dom-testing:1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=mirror://rubygems/jquery-rails-4.3.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_=a60a3c9df7ab8d7b71a1a66732943437
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1
index d5d2aa5659fa..269ae972631a 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/railties-3.2.16[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.2.16[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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/railties-3.2.16[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=The jQuery UI assets for the Rails 3.2+ asset pipeline
 EAPI=5
 HOMEPAGE=http://www.rubyonrails.org
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-3.2.16[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.2.16[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/railties-3.2.16[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=4
 SRC_URI=mirror://rubygems/jquery-ui-rails-4.2.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_=b0a40c442a217ee02fa3c97f10247762
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5
index 1cb0f3ac9e64..7fafa7503662 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[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] ) 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-ruby/railties-3.2.16:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=The jQuery UI assets for the Rails 3.2+ asset pipeline
 EAPI=5
 HOMEPAGE=http://www.rubyonrails.org
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[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/railties-3.2.16:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[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=5
 SRC_URI=mirror://rubygems/jquery-ui-rails-5.0.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_=e9f35fb3a00ab4d55e95baa0a9660ad4
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.0 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.0
index b7cdb42e149d..2da4bf9fe125 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.0
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[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] ) 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-ruby/railties-3.2.16:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=The jQuery UI assets for the Rails 3.2+ asset pipeline
 EAPI=5
 HOMEPAGE=https://github.com/joliss/jquery-ui-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[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/railties-3.2.16:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[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=6
 SRC_URI=mirror://rubygems/jquery-ui-rails-6.0.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_=44393a9618a9e7c896293040aba24e71
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1
index 5de227eb9996..cc96666015f7 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[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] ) 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-ruby/railties-3.2.16:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=The jQuery UI assets for the Rails 3.2+ asset pipeline
 EAPI=5
 HOMEPAGE=https://github.com/joliss/jquery-ui-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[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/railties-3.2.16:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[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=6
 SRC_URI=mirror://rubygems/jquery-ui-rails-6.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_=44393a9618a9e7c896293040aba24e71
diff --git a/metadata/md5-cache/dev-ruby/jsobfu-0.3.0-r1 b/metadata/md5-cache/dev-ruby/jsobfu-0.3.0-r1
index 7a8112c9934c..e8a8f5c496f0 100644
--- a/metadata/md5-cache/dev-ruby/jsobfu-0.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/jsobfu-0.3.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( !dev-ruby/jsobfu:0[ruby_targets_ruby21] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !dev-ruby/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/execjs[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/execjs[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( !dev-ruby/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/execjs[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Javascript code obfuscator
 EAPI=5
 HOMEPAGE=https://github.com/rapid7/jsobfu
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( !dev-ruby/jsobfu:0[ruby_targets_ruby21] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !dev-ruby/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[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/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[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.3.0
 SRC_URI=mirror://rubygems/jsobfu-0.3.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_=8ed0b163256476c16c0844e064b1ec02
diff --git a/metadata/md5-cache/dev-ruby/jsobfu-0.4.2 b/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
index 9b88622b3670..cfdd1ccd4971 100644
--- a/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
+++ b/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( !dev-ruby/jsobfu:0[ruby_targets_ruby21] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !dev-ruby/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !dev-ruby/jsobfu:0[ruby_targets_ruby23] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/execjs[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/execjs[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/execjs[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=test? ( ruby_targets_ruby22? ( !dev-ruby/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !dev-ruby/jsobfu:0[ruby_targets_ruby23] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/execjs[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/execjs[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=A Javascript code obfuscator
 EAPI=6
 HOMEPAGE=https://github.com/rapid7/jsobfu
-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 ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( !dev-ruby/jsobfu:0[ruby_targets_ruby21] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !dev-ruby/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !dev-ruby/jsobfu:0[ruby_targets_ruby23] >=dev-ruby/rkelly-remix-0.0.6:0[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/jsobfu:0[ruby_targets_ruby22] >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !dev-ruby/jsobfu:0[ruby_targets_ruby23] >=dev-ruby/rkelly-remix-0.0.6:0[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.4.2
 SRC_URI=mirror://rubygems/jsobfu-0.4.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_=3b20111ef743d6f2d30e1aa5e86d522b
diff --git a/metadata/md5-cache/dev-ruby/json-1.8.2-r1 b/metadata/md5-cache/dev-ruby/json-1.8.2-r1
index 486a3eda6f64..a641ea87bb29 100644
--- a/metadata/md5-cache/dev-ruby/json-1.8.2-r1
+++ b/metadata/md5-cache/dev-ruby/json-1.8.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=dev-util/ragel ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=A JSON implementation as a Ruby extension
 EAPI=5
 HOMEPAGE=https://github.com/flori/json
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby GPL-2 )
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/json-1.8.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_=49cc9e7408bfeb6c7aa69038456daf5d
diff --git a/metadata/md5-cache/dev-ruby/json-1.8.3 b/metadata/md5-cache/dev-ruby/json-1.8.3
index 0ff779278da1..8be454a85a9c 100644
--- a/metadata/md5-cache/dev-ruby/json-1.8.3
+++ b/metadata/md5-cache/dev-ruby/json-1.8.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] doc? ( dev-ruby/rdoc[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=dev-util/ragel ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] doc? ( dev-ruby/rdoc[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A JSON implementation as a Ruby extension
 EAPI=5
 HOMEPAGE=https://github.com/flori/json
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby GPL-2 )
-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/json-1.8.3.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_=2f48f9706b70034ace9b3ed6f53f3d3c
diff --git a/metadata/md5-cache/dev-ruby/json-1.8.6 b/metadata/md5-cache/dev-ruby/json-1.8.6
index defc3840aaa2..64ab105f7ced 100644
--- a/metadata/md5-cache/dev-ruby/json-1.8.6
+++ b/metadata/md5-cache/dev-ruby/json-1.8.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=dev-util/ragel ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A JSON implementation as a Ruby extension
 EAPI=6
 HOMEPAGE=https://github.com/flori/json
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby GPL-2 )
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/json-1.8.6.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_=9901448e7736b83008d544687d102964
diff --git a/metadata/md5-cache/dev-ruby/json-2.0.4 b/metadata/md5-cache/dev-ruby/json-2.0.4
index cc0aacb71fb5..ef5349f2f395 100644
--- a/metadata/md5-cache/dev-ruby/json-2.0.4
+++ b/metadata/md5-cache/dev-ruby/json-2.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=dev-util/ragel ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A JSON implementation as a Ruby extension
 EAPI=5
 HOMEPAGE=https://github.com/flori/json
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/json-2.0.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_=2225b4dbc6091d6a4904756d74ca46a9
diff --git a/metadata/md5-cache/dev-ruby/json-2.1.0 b/metadata/md5-cache/dev-ruby/json-2.1.0
index b04b1f5dd219..fe889716eb7e 100644
--- a/metadata/md5-cache/dev-ruby/json-2.1.0
+++ b/metadata/md5-cache/dev-ruby/json-2.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=dev-util/ragel ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A JSON implementation as a Ruby extension
 EAPI=6
 HOMEPAGE=https://github.com/flori/json
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/json-2.1.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_=e6d950706cccaabc3ac8f477f628e75f
diff --git a/metadata/md5-cache/dev-ruby/jwt-1.5.4 b/metadata/md5-cache/dev-ruby/jwt-1.5.4
index c5b5a1f824e7..6fa14d260666 100644
--- a/metadata/md5-cache/dev-ruby/jwt-1.5.4
+++ b/metadata/md5-cache/dev-ruby/jwt-1.5.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Ruby implementation of JSON Web Token draft 06
 EAPI=5
 HOMEPAGE=https://github.com/jwt/ruby-jwt
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jwt/ruby-jwt/archive/v1.5.4.tar.gz -> jwt-1.5.4.tar.gz
 _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_=26145ec949b795b2c09fdd9b289e2696
diff --git a/metadata/md5-cache/dev-ruby/jwt-1.5.5 b/metadata/md5-cache/dev-ruby/jwt-1.5.5
index 50e41cc467f3..dfe65b49b7e0 100644
--- a/metadata/md5-cache/dev-ruby/jwt-1.5.5
+++ b/metadata/md5-cache/dev-ruby/jwt-1.5.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=A Ruby implementation of JSON Web Token draft 06
 EAPI=5
 HOMEPAGE=https://github.com/jwt/ruby-jwt
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~ppc64
 LICENSE=MIT
-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=https://github.com/jwt/ruby-jwt/archive/v1.5.5.tar.gz -> jwt-1.5.5.tar.gz
 _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_=6fa136c666f13d53bebb6c31a5b1cf5f
diff --git a/metadata/md5-cache/dev-ruby/jwt-1.5.6 b/metadata/md5-cache/dev-ruby/jwt-1.5.6
index e1ab1a599887..77865be802de 100644
--- a/metadata/md5-cache/dev-ruby/jwt-1.5.6
+++ b/metadata/md5-cache/dev-ruby/jwt-1.5.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Ruby implementation of JSON Web Token draft 06
 EAPI=5
 HOMEPAGE=https://github.com/jwt/ruby-jwt
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/jwt/ruby-jwt/archive/v1.5.6.tar.gz -> jwt-1.5.6.tar.gz
 _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_=82871ffdca8a40bdac93c10fbfb38b39
diff --git a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2 b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
index 56621b0c7c8c..ae785b65938a 100644
--- a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
+++ b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A simple Ruby DBMS that stores data in plaintext files
 EAPI=5
 HOMEPAGE=http://www.netpromi.com/kirbybase_ruby.html
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=amd64 ~ppc64 x86
 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/KirbyBase-2.6.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_=fa210294535d457497b0753cc0cd28b8
diff --git a/metadata/md5-cache/dev-ruby/kissfft-0.0.2 b/metadata/md5-cache/dev-ruby/kissfft-0.0.2
index 9a8179858c06..1c19beda311e 100644
--- a/metadata/md5-cache/dev-ruby/kissfft-0.0.2
+++ b/metadata/md5-cache/dev-ruby/kissfft-0.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) 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? ( 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=ruby interface to kissfft
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/kissfft
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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/kissfft-0.0.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_=17564cf74ca56a5482bddf065015b709
diff --git a/metadata/md5-cache/dev-ruby/kpeg-1.1.0 b/metadata/md5-cache/dev-ruby/kpeg-1.1.0
index bd587264c201..ad7c82e0740b 100644
--- a/metadata/md5-cache/dev-ruby/kpeg-1.1.0
+++ b/metadata/md5-cache/dev-ruby/kpeg-1.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A simple PEG library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/evanphx/kpeg
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/kpeg-1.1.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_=58133c73b4e3a5fb556a1b709e48305c
diff --git a/metadata/md5-cache/dev-ruby/kramdown-1.12.0 b/metadata/md5-cache/dev-ruby/kramdown-1.12.0
index e50817e913ce..2302026ea95c 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-1.12.0
+++ b/metadata/md5-cache/dev-ruby/kramdown-1.12.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-text/htmltidy ) test? ( ruby_targets_ruby21? ( dev-ruby/prawn:2[ruby_targets_ruby21] dev-ruby/prawn-table[ruby_targets_ruby21] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby21] >=dev-ruby/itextomml-1.5[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby21] >=dev-ruby/ritex-1.0[ruby_targets_ruby21] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] dev-ruby/prawn-table[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=test? ( latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-text/htmltidy ) test? ( ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] dev-ruby/prawn-table[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition
 EAPI=5
 HOMEPAGE=http://kramdown.gettalong.org/
-IUSE=latex test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=latex test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby_targets_ruby21? ( dev-ruby/prawn:2[ruby_targets_ruby21] dev-ruby/prawn-table[ruby_targets_ruby21] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby21] >=dev-ruby/itextomml-1.5[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby21] >=dev-ruby/ritex-1.0[ruby_targets_ruby21] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] dev-ruby/prawn-table[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.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=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] dev-ruby/prawn-table[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.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/kramdown-1.12.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_=f2df49cd01b9c50873a9042d084ee974
diff --git a/metadata/md5-cache/dev-ruby/kramdown-1.13.1 b/metadata/md5-cache/dev-ruby/kramdown-1.13.1
index 22dfc620947e..2ada2da79cfc 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-1.13.1
+++ b/metadata/md5-cache/dev-ruby/kramdown-1.13.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-text/htmltidy ) test? ( ruby_targets_ruby21? ( dev-ruby/prawn:2[ruby_targets_ruby21] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby21] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby21] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby21] >=dev-ruby/itextomml-1.5[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby21] >=dev-ruby/ritex-1.0[ruby_targets_ruby21] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby22] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=test? ( latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-text/htmltidy ) test? ( ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby22] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition
 EAPI=5
 HOMEPAGE=http://kramdown.gettalong.org/
-IUSE=latex test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=latex test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby_targets_ruby21? ( dev-ruby/prawn:2[ruby_targets_ruby21] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby21] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby21] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby21] >=dev-ruby/itextomml-1.5[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby21] >=dev-ruby/ritex-1.0[ruby_targets_ruby21] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby22] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.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=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby22] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.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/kramdown-1.13.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_=377aa80935d707e3e8ea40127bfe6bbd
diff --git a/metadata/md5-cache/dev-ruby/kramdown-1.13.2 b/metadata/md5-cache/dev-ruby/kramdown-1.13.2
index 56876bb2619f..e642c7d8384b 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-1.13.2
+++ b/metadata/md5-cache/dev-ruby/kramdown-1.13.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-text/htmltidy ) test? ( ruby_targets_ruby21? ( dev-ruby/prawn:2[ruby_targets_ruby21] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby21] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby21] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby21] >=dev-ruby/itextomml-1.5[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby21] >=dev-ruby/ritex-1.0[ruby_targets_ruby21] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby22] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=test? ( latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-text/htmltidy ) test? ( ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby22] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition
 EAPI=5
 HOMEPAGE=http://kramdown.gettalong.org/
-IUSE=latex test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=latex test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby_targets_ruby21? ( dev-ruby/prawn:2[ruby_targets_ruby21] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby21] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby21] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby21] >=dev-ruby/itextomml-1.5[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby21] >=dev-ruby/ritex-1.0[ruby_targets_ruby21] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby22] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.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=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby22] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.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/kramdown-1.13.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_=377aa80935d707e3e8ea40127bfe6bbd
diff --git a/metadata/md5-cache/dev-ruby/kramdown-1.13.2-r1 b/metadata/md5-cache/dev-ruby/kramdown-1.13.2-r1
index 2472fce0a405..634d09678c0b 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-1.13.2-r1
+++ b/metadata/md5-cache/dev-ruby/kramdown-1.13.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-text/htmltidy ) test? ( ruby_targets_ruby21? ( dev-ruby/prawn:2[ruby_targets_ruby21] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby21] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby21] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby21] >=dev-ruby/itextomml-1.5[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby21] >=dev-ruby/ritex-1.0[ruby_targets_ruby21] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby22] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/prawn:2[ruby_targets_ruby23] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby23] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby23] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby23] >=dev-ruby/itextomml-1.5[ruby_targets_ruby23] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby23] >=dev-ruby/ritex-1.0[ruby_targets_ruby23] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) test? ( >=dev-ruby/minitest-5.0[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-text/htmltidy ) test? ( ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby22] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/prawn:2[ruby_targets_ruby23] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby23] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby23] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby23] >=dev-ruby/itextomml-1.5[ruby_targets_ruby23] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby23] >=dev-ruby/ritex-1.0[ruby_targets_ruby23] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) test? ( >=dev-ruby/minitest-5.0[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition
 EAPI=5
 HOMEPAGE=http://kramdown.gettalong.org/
-IUSE=latex test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=latex test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64
 LICENSE=MIT
-RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby_targets_ruby21? ( dev-ruby/prawn:2[ruby_targets_ruby21] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby21] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby21] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby21] >=dev-ruby/itextomml-1.5[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby21] >=dev-ruby/ritex-1.0[ruby_targets_ruby21] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby22] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/prawn:2[ruby_targets_ruby23] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby23] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby23] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby23] >=dev-ruby/itextomml-1.5[ruby_targets_ruby23] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby23] >=dev-ruby/ritex-1.0[ruby_targets_ruby23] >=dev-ruby/stringex-1.5.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=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby22] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/prawn:2[ruby_targets_ruby23] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby23] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby23] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby23] >=dev-ruby/itextomml-1.5[ruby_targets_ruby23] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby23] >=dev-ruby/ritex-1.0[ruby_targets_ruby23] >=dev-ruby/stringex-1.5.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/kramdown-1.13.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_=4f00c8e773adc67596786d43b9543117
diff --git a/metadata/md5-cache/dev-ruby/kramdown-1.14.0 b/metadata/md5-cache/dev-ruby/kramdown-1.14.0
index 10e7af8368a8..9285c8749902 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-1.14.0
+++ b/metadata/md5-cache/dev-ruby/kramdown-1.14.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-text/htmltidy ) test? ( ruby_targets_ruby21? ( dev-ruby/prawn:2[ruby_targets_ruby21] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby21] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby21] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby21] >=dev-ruby/itextomml-1.5[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby21] >=dev-ruby/ritex-1.0[ruby_targets_ruby21] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby22] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/prawn:2[ruby_targets_ruby23] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby23] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby23] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby23] >=dev-ruby/itextomml-1.5[ruby_targets_ruby23] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby23] >=dev-ruby/ritex-1.0[ruby_targets_ruby23] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) test? ( >=dev-ruby/minitest-5.0[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-text/htmltidy ) test? ( ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby22] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/prawn:2[ruby_targets_ruby23] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby23] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby23] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby23] >=dev-ruby/itextomml-1.5[ruby_targets_ruby23] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby23] >=dev-ruby/ritex-1.0[ruby_targets_ruby23] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) test? ( >=dev-ruby/minitest-5.0[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition
 EAPI=5
 HOMEPAGE=http://kramdown.gettalong.org/
-IUSE=latex test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=latex test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=MIT
-RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby_targets_ruby21? ( dev-ruby/prawn:2[ruby_targets_ruby21] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby21] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby21] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby21] >=dev-ruby/itextomml-1.5[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby21] >=dev-ruby/ritex-1.0[ruby_targets_ruby21] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby22] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/prawn:2[ruby_targets_ruby23] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby23] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby23] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby23] >=dev-ruby/itextomml-1.5[ruby_targets_ruby23] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby23] >=dev-ruby/ritex-1.0[ruby_targets_ruby23] >=dev-ruby/stringex-1.5.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=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby_targets_ruby22? ( dev-ruby/prawn:2[ruby_targets_ruby22] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby22] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby22] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby22] >=dev-ruby/itextomml-1.5[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby22] >=dev-ruby/ritex-1.0[ruby_targets_ruby22] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/prawn:2[ruby_targets_ruby23] >=dev-ruby/prawn-table-0.2.2[ruby_targets_ruby23] =dev-ruby/prawn-table-0.2*[ruby_targets_ruby23] >=dev-ruby/rouge-1.8:0[ruby_targets_ruby23] >=dev-ruby/itextomml-1.5[ruby_targets_ruby23] >=dev-ruby/coderay-1.0.0[ruby_targets_ruby23] >=dev-ruby/ritex-1.0[ruby_targets_ruby23] >=dev-ruby/stringex-1.5.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/kramdown-1.14.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_=7396366db29fab9eeaf5c809619621c9
diff --git a/metadata/md5-cache/dev-ruby/launchy-2.4.3 b/metadata/md5-cache/dev-ruby/launchy-2.4.3
index 62a106ef9d65..fedc775d4faf 100644
--- a/metadata/md5-cache/dev-ruby/launchy-2.4.3
+++ b/metadata/md5-cache/dev-ruby/launchy-2.4.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] !!x11-misc/launchy[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] !!x11-misc/launchy[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] !!x11-misc/launchy[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=Helper class for launching cross-platform applications
 EAPI=5
 HOMEPAGE=http://copiousfreetime.rubyforge.org/launchy/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] !!x11-misc/launchy[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] !!x11-misc/launchy[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/addressable-2.3[ruby_targets_ruby22] !!x11-misc/launchy[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/launchy-2.4.3.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_=46ec4b755c6c015011cbb1a788b15f8e
diff --git a/metadata/md5-cache/dev-ruby/launchy-2.4.3-r1 b/metadata/md5-cache/dev-ruby/launchy-2.4.3-r1
index d41a6266bdc1..bc8b52a82a2e 100644
--- a/metadata/md5-cache/dev-ruby/launchy-2.4.3-r1
+++ b/metadata/md5-cache/dev-ruby/launchy-2.4.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] !!x11-misc/launchy[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] !!x11-misc/launchy[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] !!x11-misc/launchy[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.0:5[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] !!x11-misc/launchy[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] !!x11-misc/launchy[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.0:5[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Helper class for launching cross-platform applications
 EAPI=5
 HOMEPAGE=https://github.com/copiousfreetime/launchy
-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 ~x86
 LICENSE=ISC
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] !!x11-misc/launchy[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] !!x11-misc/launchy[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] !!x11-misc/launchy[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/addressable-2.3[ruby_targets_ruby22] !!x11-misc/launchy[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] !!x11-misc/launchy[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/launchy-2.4.3.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_=8643305d0168e84804820c99a2471dd0
diff --git a/metadata/md5-cache/dev-ruby/launchy-2.4.3-r2 b/metadata/md5-cache/dev-ruby/launchy-2.4.3-r2
index 60d3c8fce842..8c7e77e99e2a 100644
--- a/metadata/md5-cache/dev-ruby/launchy-2.4.3-r2
+++ b/metadata/md5-cache/dev-ruby/launchy-2.4.3-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] !!x11-misc/launchy[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] !!x11-misc/launchy[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] !!x11-misc/launchy[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby24] !!x11-misc/launchy[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] !!x11-misc/launchy[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] !!x11-misc/launchy[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby24] !!x11-misc/launchy[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Helper class for launching cross-platform applications
 EAPI=5
 HOMEPAGE=https://github.com/copiousfreetime/launchy
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=ISC
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] !!x11-misc/launchy[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] !!x11-misc/launchy[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] !!x11-misc/launchy[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby24] !!x11-misc/launchy[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] !!x11-misc/launchy[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] !!x11-misc/launchy[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby24] !!x11-misc/launchy[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/launchy-2.4.3.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_=dbbc192f34a8fb7f8195c52af957e921
diff --git a/metadata/md5-cache/dev-ruby/lemon-0.9.1 b/metadata/md5-cache/dev-ruby/lemon-0.9.1
index 5d68de24dde7..6a528b950d8c 100644
--- a/metadata/md5-cache/dev-ruby/lemon-0.9.1
+++ b/metadata/md5-cache/dev-ruby/lemon-0.9.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/qed[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/qed[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/qed[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/ae[ruby_targets_ruby21] >=dev-ruby/ansi-1.3[ruby_targets_ruby21] dev-ruby/rubytest[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ae[ruby_targets_ruby22] >=dev-ruby/ansi-1.3[ruby_targets_ruby22] dev-ruby/rubytest[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ae[ruby_targets_ruby23] >=dev-ruby/ansi-1.3[ruby_targets_ruby23] dev-ruby/rubytest[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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/qed[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/qed[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/ae[ruby_targets_ruby22] >=dev-ruby/ansi-1.3[ruby_targets_ruby22] dev-ruby/rubytest[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ae[ruby_targets_ruby23] >=dev-ruby/ansi-1.3[ruby_targets_ruby23] dev-ruby/rubytest[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=Lemon is a unit testing framework
 EAPI=5
 HOMEPAGE=https://rubyworks.github.io/lemon/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/ae[ruby_targets_ruby21] >=dev-ruby/ansi-1.3[ruby_targets_ruby21] dev-ruby/rubytest[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ae[ruby_targets_ruby22] >=dev-ruby/ansi-1.3[ruby_targets_ruby22] dev-ruby/rubytest[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ae[ruby_targets_ruby23] >=dev-ruby/ansi-1.3[ruby_targets_ruby23] dev-ruby/rubytest[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/ae[ruby_targets_ruby22] >=dev-ruby/ansi-1.3[ruby_targets_ruby22] dev-ruby/rubytest[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ae[ruby_targets_ruby23] >=dev-ruby/ansi-1.3[ruby_targets_ruby23] dev-ruby/rubytest[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/lemon-0.9.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_=cffa56a4fee38bd338e037261bc0f5cf
diff --git a/metadata/md5-cache/dev-ruby/letter_opener-1.4.1 b/metadata/md5-cache/dev-ruby/letter_opener-1.4.1
index e73c92c5566b..835af95ce070 100644
--- a/metadata/md5-cache/dev-ruby/letter_opener-1.4.1
+++ b/metadata/md5-cache/dev-ruby/letter_opener-1.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/mail:2.6[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mail:2.6[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mail:2.6[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/launchy[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/launchy[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/launchy[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=ruby_targets_ruby22? ( test? ( dev-ruby/mail:2.6[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mail:2.6[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/launchy[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/launchy[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=Preview mail in the browser instead of sending
 EAPI=5
 HOMEPAGE=https://github.com/ryanb/letter_opener
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/launchy[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/launchy[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/launchy[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/launchy[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/launchy[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=https://github.com/ryanb/letter_opener/archive/v1.4.1.tar.gz -> letter_opener-1.4.1.tar.gz
 _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_=50cd7054a61627489b69f23eb3712b8d
diff --git a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2 b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
index 66b3ffef550f..6e0ce9997aec 100644
--- a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
+++ b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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=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=Levenshtein distance algorithm
 EAPI=5
 HOMEPAGE=https://github.com/mbleigh/mash
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-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/levenshtein-0.2.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_=9939a2dc74930db623c8bcec9d357e3f
diff --git a/metadata/md5-cache/dev-ruby/libxml-2.8.0-r1 b/metadata/md5-cache/dev-ruby/libxml-2.8.0-r1
index 533d9c5cf8ad..e3e2a6dc0d6d 100644
--- a/metadata/md5-cache/dev-ruby/libxml-2.8.0-r1
+++ b/metadata/md5-cache/dev-ruby/libxml-2.8.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/libxml2 ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=dev-libs/libxml2 ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=Ruby libxml with a user friendly API, akin to REXML
 EAPI=5
 HOMEPAGE=https://github.com/xml4r/libxml-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=dev-libs/libxml2 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=dev-libs/libxml2 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/libxml-ruby-2.8.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_=35f1006752468db466e7cdcadfb481b0
diff --git a/metadata/md5-cache/dev-ruby/libxml-2.9.0 b/metadata/md5-cache/dev-ruby/libxml-2.9.0
index e5dcbad50900..6a9eb7b0c3ff 100644
--- a/metadata/md5-cache/dev-ruby/libxml-2.9.0
+++ b/metadata/md5-cache/dev-ruby/libxml-2.9.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/libxml2 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? ( 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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=dev-libs/libxml2 ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Ruby libxml with a user friendly API, akin to REXML
 EAPI=5
 HOMEPAGE=https://github.com/xml4r/libxml-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=dev-libs/libxml2 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=dev-libs/libxml2 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/libxml-ruby-2.9.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_=d42faf835bd8dcc0fd73415ea038543d
diff --git a/metadata/md5-cache/dev-ruby/liquid-2.6.2 b/metadata/md5-cache/dev-ruby/liquid-2.6.2
index 7f0bb362a266..cb8684ebc9ea 100644
--- a/metadata/md5-cache/dev-ruby/liquid-2.6.2
+++ b/metadata/md5-cache/dev-ruby/liquid-2.6.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Template engine for Ruby
 EAPI=5
 HOMEPAGE=http://www.liquidmarkup.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/liquid-2.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_=e110d27ff5fd7f2c0dfe8738b27a46b0
diff --git a/metadata/md5-cache/dev-ruby/liquid-3.0.6 b/metadata/md5-cache/dev-ruby/liquid-3.0.6
index 05d89f6ca767..74239b948faa 100644
--- a/metadata/md5-cache/dev-ruby/liquid-3.0.6
+++ b/metadata/md5-cache/dev-ruby/liquid-3.0.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/spy[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/spy[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/spy[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/minitest[ruby_targets_ruby22] dev-ruby/spy[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/spy[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=Template engine for Ruby
 EAPI=5
 HOMEPAGE=http://www.liquidmarkup.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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=3
 SRC_URI=https://github.com/Shopify/liquid/archive/v3.0.6.tar.gz -> liquid-3.0.6.tar.gz
 _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_=80c0e3cd32d2e0f8726aa047f5bf5190
diff --git a/metadata/md5-cache/dev-ruby/liquid-4.0.0 b/metadata/md5-cache/dev-ruby/liquid-4.0.0
index 83e613ec21c6..eed6f27c16e0 100644
--- a/metadata/md5-cache/dev-ruby/liquid-4.0.0
+++ b/metadata/md5-cache/dev-ruby/liquid-4.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/spy[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/spy[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/spy[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] dev-ruby/spy[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/spy[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/spy[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] dev-ruby/spy[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Template engine for Ruby
 EAPI=6
 HOMEPAGE=http://www.liquidmarkup.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=https://github.com/Shopify/liquid/archive/v4.0.0.tar.gz -> liquid-4.0.0.tar.gz
 _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_=39d83e523c4b691f46e851b9248c9706
diff --git a/metadata/md5-cache/dev-ruby/liquid-c-3.0.0 b/metadata/md5-cache/dev-ruby/liquid-c-3.0.0
index c563dc276dc0..91ceaf3d8666 100644
--- a/metadata/md5-cache/dev-ruby/liquid-c-3.0.0
+++ b/metadata/md5-cache/dev-ruby/liquid-c-3.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/liquid-3.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/liquid-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/liquid-3.0.0[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] ) 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-ruby/liquid-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/liquid-3.0.0[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Liquid performance extension in C
 EAPI=5
 HOMEPAGE=https://github.com/Shopify/liquid-c
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/liquid-3.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/liquid-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/liquid-3.0.0[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/liquid-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/liquid-3.0.0[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/liquid-c-3.0.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_=35e431b9de9aaa83fbb7f0ef4e0aebb4
diff --git a/metadata/md5-cache/dev-ruby/listen-0.7.3-r2 b/metadata/md5-cache/dev-ruby/listen-0.7.3-r2
index a64b6f7d6917..5c89fd900f6b 100644
--- a/metadata/md5-cache/dev-ruby/listen-0.7.3-r2
+++ b/metadata/md5-cache/dev-ruby/listen-0.7.3-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.0[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/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_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? ( ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Listens to file modifications and notifies you about the changes
 EAPI=5
 HOMEPAGE=https://github.com/guard/listen
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.0[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/rb-inotify-0.9.0[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=https://github.com/guard/listen/archive/v0.7.3.tar.gz -> listen-0.7.3-git.tgz
 _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_=21566dcc89ed2097699cf45dd572df9d
diff --git a/metadata/md5-cache/dev-ruby/listen-1.3.1-r3 b/metadata/md5-cache/dev-ruby/listen-1.3.1-r3
index 9c7bda2bb058..831437ee6ae7 100644
--- a/metadata/md5-cache/dev-ruby/listen-1.3.1-r3
+++ b/metadata/md5-cache/dev-ruby/listen-1.3.1-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.0[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/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_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? ( ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Listens to file modifications and notifies you about the changes
 EAPI=5
 HOMEPAGE=https://github.com/guard/listen
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x64-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.0[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/rb-inotify-0.9.0[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=1
 SRC_URI=https://github.com/guard/listen/archive/v1.3.1.tar.gz -> listen-1.3.1-git.tgz
 _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_=88320d12311661e37b0e83b1c22d7b1e
diff --git a/metadata/md5-cache/dev-ruby/listen-1.3.1-r4 b/metadata/md5-cache/dev-ruby/listen-1.3.1-r4
index 8c625010d8a4..b5b0d0e96520 100644
--- a/metadata/md5-cache/dev-ruby/listen-1.3.1-r4
+++ b/metadata/md5-cache/dev-ruby/listen-1.3.1-r4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Listens to file modifications and notifies you about the changes
 EAPI=5
 HOMEPAGE=https://github.com/guard/listen
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=https://github.com/guard/listen/archive/v1.3.1.tar.gz -> listen-1.3.1-git.tgz
 _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_=40c386e7eec78be1b29cd4d890254eed
diff --git a/metadata/md5-cache/dev-ruby/listen-3.0.8 b/metadata/md5-cache/dev-ruby/listen-3.0.8
index 3016a6429c7d..ece2456c7847 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.0.8
+++ b/metadata/md5-cache/dev-ruby/listen-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/thor[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/thor[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/thor[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/thor[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/thor[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: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=Listens to file modifications and notifies you about the changes
 EAPI=5
 HOMEPAGE=https://github.com/guard/listen
-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 ~ppc ~ppc64 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2 ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.7[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=!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2 ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.7[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=3
 SRC_URI=https://github.com/guard/listen/archive/v3.0.8.tar.gz -> listen-3.0.8.tar.gz
 _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_=8e1b08ca5d63c5a4ffddfe4a5c48a327
diff --git a/metadata/md5-cache/dev-ruby/listen-3.1.5 b/metadata/md5-cache/dev-ruby/listen-3.1.5
index 704bfe5453a4..9a0cfb78e844 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.1.5
+++ b/metadata/md5-cache/dev-ruby/listen-3.1.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby21] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby22] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby23] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/thor[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/thor[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/thor[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby22] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby23] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/thor[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/thor[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: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=Listens to file modifications and notifies you about the changes
 EAPI=5
 HOMEPAGE=https://github.com/guard/listen
-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=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2 ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby21] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby22] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby23] >=dev-ruby/ruby_dep-1.2: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=!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2 ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby22] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby23] >=dev-ruby/ruby_dep-1.2: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=3
 SRC_URI=https://github.com/guard/listen/archive/v3.1.5.tar.gz -> listen-3.1.5.tar.gz
 _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_=468a8dd5b26745cc3d4f70c8d59ddba5
diff --git a/metadata/md5-cache/dev-ruby/listen-3.1.5-r1 b/metadata/md5-cache/dev-ruby/listen-3.1.5-r1
index e7456059f3da..b51d36676d64 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/listen-3.1.5-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby21] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby22] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby23] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby24] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/thor[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/thor[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/thor[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/thor[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby22] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby23] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby24] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/thor[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/thor[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/thor[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Listens to file modifications and notifies you about the changes
 EAPI=6
 HOMEPAGE=https://github.com/guard/listen
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
 LICENSE=MIT
-RDEPEND=!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2 ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby21] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby22] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby23] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby24] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2 ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby22] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby23] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby24] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.1.5.tar.gz -> listen-3.1.5.tar.gz
 _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_=db439f126673168835b29493a4a2f8b2
diff --git a/metadata/md5-cache/dev-ruby/litc-1.0.3-r1 b/metadata/md5-cache/dev-ruby/litc-1.0.3-r1
index e276c1bd4f82..07dc174175a3 100644
--- a/metadata/md5-cache/dev-ruby/litc-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/litc-1.0.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/shoulda[ruby_targets_ruby21] dev-ruby/fakeweb[ruby_targets_ruby21] dev-ruby/minitest:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/shoulda[ruby_targets_ruby22] dev-ruby/fakeweb[ruby_targets_ruby22] dev-ruby/minitest:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/shoulda[ruby_targets_ruby23] dev-ruby/fakeweb[ruby_targets_ruby23] dev-ruby/minitest:0[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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/shoulda[ruby_targets_ruby22] dev-ruby/fakeweb[ruby_targets_ruby22] dev-ruby/minitest:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/shoulda[ruby_targets_ruby23] dev-ruby/fakeweb[ruby_targets_ruby23] dev-ruby/minitest:0[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A tiny ruby module for Amazon EC2 intance metadata
 EAPI=5
 HOMEPAGE=https://github.com/bkaney/litc
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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/litc-1.0.3.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_=a750af71bb82cb5055192f000e346da2
diff --git a/metadata/md5-cache/dev-ruby/little-plugger-1.1.4 b/metadata/md5-cache/dev-ruby/little-plugger-1.1.4
index c52695939505..c1d64e5e2848 100644
--- a/metadata/md5-cache/dev-ruby/little-plugger-1.1.4
+++ b/metadata/md5-cache/dev-ruby/little-plugger-1.1.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Module that provides Gem based plugin management
 EAPI=5
 HOMEPAGE=https://github.com/TwP/little-plugger
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/little-plugger-1.1.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_=824e9073e27bfc30c879d6e6b4e34115
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.0-r2 b/metadata/md5-cache/dev-ruby/locale-2.1.0-r2
index 9d8d5edcefb4..0da2adf32594 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.0-r2
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.0-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/test-unit-rr[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/test-unit-rr[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? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/test-unit-rr[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=A pure ruby library which provides basic APIs for localization
 EAPI=5
 HOMEPAGE=https://github.com/ruby-gettext/locale
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-macos
 LICENSE=|| ( Ruby GPL-2 )
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.0.tar.gz -> locale-2.1.0-git.tgz
 _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_=68bf7893f4b4f9364934dd6044a0c531
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.1 b/metadata/md5-cache/dev-ruby/locale-2.1.1
index 827f121aee97..dd21665b640f 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.1
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/test-unit-rr[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/test-unit-rr[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? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/test-unit-rr[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=A pure ruby library which provides basic APIs for localization
 EAPI=5
 HOMEPAGE=https://github.com/ruby-gettext/locale
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos
 LICENSE=|| ( Ruby GPL-2 )
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.1.tar.gz -> locale-2.1.1-git.tgz
 _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_=4449157248c2b55b1e80a9632eb2beff
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.2 b/metadata/md5-cache/dev-ruby/locale-2.1.2
index ba61776af8ce..74a33d6082cd 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.2
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/test-unit-rr[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/test-unit-rr[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/test-unit-rr[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? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/test-unit-rr[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/test-unit-rr[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=A pure ruby library which provides basic APIs for localization
 EAPI=5
 HOMEPAGE=https://github.com/ruby-gettext/locale
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos
 LICENSE=|| ( Ruby GPL-2 )
-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=https://github.com/ruby-gettext/locale/archive/2.1.2.tar.gz -> locale-2.1.2-git.tgz
 _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_=59708b1e5e37909e12622a6f4c142438
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.2-r1 b/metadata/md5-cache/dev-ruby/locale-2.1.2-r1
index 30c589cbe936..b8fd2bf29d55 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/test-unit-rr[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/test-unit-rr[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/test-unit-rr[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/test-unit-rr[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/test-unit-rr[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/test-unit-rr[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/test-unit-rr[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A pure ruby library which provides basic APIs for localization
 EAPI=5
 HOMEPAGE=https://github.com/ruby-gettext/locale
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-macos
 LICENSE=|| ( Ruby GPL-2 )
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.2.tar.gz -> locale-2.1.2-git.tgz
 _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_=5cdd3dee4727639b89ed9ee2b873e168
diff --git a/metadata/md5-cache/dev-ruby/lockfile-2.1.3 b/metadata/md5-cache/dev-ruby/lockfile-2.1.3
index 65009a787f2f..3115343a3f7a 100644
--- a/metadata/md5-cache/dev-ruby/lockfile-2.1.3
+++ b/metadata/md5-cache/dev-ruby/lockfile-2.1.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A ruby library for creating NFS safe lockfiles
 EAPI=5
 HOMEPAGE=https://github.com/ahoward/lockfile
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64
 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/lockfile-2.1.3.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_=8aeec88bebd6941325f0ae7335b2d5e5
diff --git a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2 b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
index 5173d0e4544c..1bcc343bf494 100644
--- a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
+++ b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A comprehensive and flexible logging library written in Ruby
 EAPI=5
 HOMEPAGE=http://log4r.sourceforge.net/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=alpha amd64 arm ia64 ppc ppc64 ~sparc x86
 LICENSE=LGPL-3
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/log4r-1.1.10.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_=4f4eed08685ce9f801d5378ca8c9577e
diff --git a/metadata/md5-cache/dev-ruby/log_buddy-0.7.0 b/metadata/md5-cache/dev-ruby/log_buddy-0.7.0
index 284e5bb80e14..4337bb15fcb7 100644
--- a/metadata/md5-cache/dev-ruby/log_buddy-0.7.0
+++ b/metadata/md5-cache/dev-ruby/log_buddy-0.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/mocha-0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.9[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=ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.9[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=Log statements along with their name easily
 EAPI=5
 HOMEPAGE=https://github.com/relevance/log_buddy
-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=MIT
-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/log_buddy-0.7.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_=4ce7ced49a9218ffa57ec9a3b4d21c33
diff --git a/metadata/md5-cache/dev-ruby/logging-2.1.0 b/metadata/md5-cache/dev-ruby/logging-2.1.0
index 92e66e97bba6..21fa30fdd945 100644
--- a/metadata/md5-cache/dev-ruby/logging-2.1.0
+++ b/metadata/md5-cache/dev-ruby/logging-2.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby21] >=dev-ruby/multi_json-1.10[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-ruby/bones[ruby_targets_ruby21] test? ( dev-ruby/flexmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/bones[ruby_targets_ruby22] test? ( dev-ruby/flexmock[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-ruby/bones[ruby_targets_ruby22] test? ( dev-ruby/flexmock[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=Flexible logging library based on the design of Java's log4j library
 EAPI=5
 HOMEPAGE=http://rubygems.org/gems/logging
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby21] >=dev-ruby/multi_json-1.10[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[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/little-plugger-1.1.3[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[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/logging-2.1.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_=bed46841267948e4466e24467b4b4895
diff --git a/metadata/md5-cache/dev-ruby/logging-2.2.0 b/metadata/md5-cache/dev-ruby/logging-2.2.0
index 0977038ff496..cf76eb757837 100644
--- a/metadata/md5-cache/dev-ruby/logging-2.2.0
+++ b/metadata/md5-cache/dev-ruby/logging-2.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby21] >=dev-ruby/multi_json-1.10[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-ruby/bones[ruby_targets_ruby21] test? ( dev-ruby/flexmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/bones[ruby_targets_ruby22] test? ( dev-ruby/flexmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/bones[ruby_targets_ruby23] test? ( dev-ruby/flexmock[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-ruby/bones[ruby_targets_ruby22] test? ( dev-ruby/flexmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/bones[ruby_targets_ruby23] test? ( dev-ruby/flexmock[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Flexible logging library based on the design of Java's log4j library
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/logging
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby21] >=dev-ruby/multi_json-1.10[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[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/little-plugger-1.1.3[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[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/logging-2.2.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_=767d4c399064a5e7355688033f36fab9
diff --git a/metadata/md5-cache/dev-ruby/logging-2.2.2 b/metadata/md5-cache/dev-ruby/logging-2.2.2
index 722543ca149a..cb39be481d5f 100644
--- a/metadata/md5-cache/dev-ruby/logging-2.2.2
+++ b/metadata/md5-cache/dev-ruby/logging-2.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby21] >=dev-ruby/multi_json-1.10[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-ruby/bones[ruby_targets_ruby21] test? ( dev-ruby/flexmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/bones[ruby_targets_ruby22] test? ( dev-ruby/flexmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/bones[ruby_targets_ruby23] test? ( dev-ruby/flexmock[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-ruby/bones[ruby_targets_ruby22] test? ( dev-ruby/flexmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/bones[ruby_targets_ruby23] test? ( dev-ruby/flexmock[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Flexible logging library based on the design of Java's log4j library
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/logging
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby21] >=dev-ruby/multi_json-1.10[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[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/little-plugger-1.1.3[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[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/logging-2.2.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_=df0bf108c39b21c4dcf91ff58ac1fc60
diff --git a/metadata/md5-cache/dev-ruby/logue-1.0.4 b/metadata/md5-cache/dev-ruby/logue-1.0.4
index 71aac9ee987a..f881f58d018b 100644
--- a/metadata/md5-cache/dev-ruby/logue-1.0.4
+++ b/metadata/md5-cache/dev-ruby/logue-1.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rainbow-2.0.0[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/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=test? ( ruby_targets_ruby22? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rainbow-2.0.0[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/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=A module that adds logging/trace functionality
 EAPI=5
 HOMEPAGE=https://github.com/jpace/logue
-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 hppa ~ppc ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rainbow-2.0.0[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/rainbow-2.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rainbow-2.0.0[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=https://github.com/jpace/logue/archive/v1.0.4.tar.gz -> logue-git-1.0.4.tgz
 _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_=176107018f1b712d1034aa943e0387bc
diff --git a/metadata/md5-cache/dev-ruby/logue-1.0.8 b/metadata/md5-cache/dev-ruby/logue-1.0.8
index b4fa4ce930e3..a688e72118d3 100644
--- a/metadata/md5-cache/dev-ruby/logue-1.0.8
+++ b/metadata/md5-cache/dev-ruby/logue-1.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A module that adds logging/trace functionality
 EAPI=6
 HOMEPAGE=https://github.com/jpace/logue
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/jpace/logue/archive/v1.0.8.tar.gz -> logue-git-1.0.8.tgz
 _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_=c82f0f4e84406737305ed9eaf8a38f56
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.0.3 b/metadata/md5-cache/dev-ruby/loofah-2.0.3
index 8420cea2f0f9..9e0eb41ad213 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.0.3
+++ b/metadata/md5-cache/dev-ruby/loofah-2.0.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rr-1.1.0[ruby_targets_ruby21] >=dev-ruby/hoe-2.3.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rr-1.1.0[ruby_targets_ruby22] >=dev-ruby/hoe-2.3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rr-1.1.0[ruby_targets_ruby23] >=dev-ruby/hoe-2.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rr-1.1.0[ruby_targets_ruby24] >=dev-ruby/hoe-2.3.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rr-1.1.0[ruby_targets_ruby22] >=dev-ruby/hoe-2.3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rr-1.1.0[ruby_targets_ruby23] >=dev-ruby/hoe-2.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rr-1.1.0[ruby_targets_ruby24] >=dev-ruby/hoe-2.3.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Library for manipulating and transforming HTML/XML documents and fragments.
 EAPI=5
 HOMEPAGE=https://github.com/flavorjones/loofah
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/loofah-2.0.3.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_=35ab6da0f1470c172dc4e3ad6bab5ab8
diff --git a/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2 b/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2
index de1b3db896a9..c2cb8b22b493 100644
--- a/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2
+++ b/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Descriptive configuration files for Ruby written in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/TwP/loquacious
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/loquacious-1.9.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_=0170a8d384b2a14818d1e2d15f3bbd67
diff --git a/metadata/md5-cache/dev-ruby/lumberjack-1.0.10 b/metadata/md5-cache/dev-ruby/lumberjack-1.0.10
index 6441c6d35804..fc959982837f 100644
--- a/metadata/md5-cache/dev-ruby/lumberjack-1.0.10
+++ b/metadata/md5-cache/dev-ruby/lumberjack-1.0.10
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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=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=A simple, powerful, and very fast logging utility
 EAPI=5
 HOMEPAGE=https://github.com/bdurand/lumberjack
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/lumberjack-1.0.10.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_=fbf64e1eb50335bfceeeb53879ebab86
diff --git a/metadata/md5-cache/dev-ruby/lumberjack-1.0.11 b/metadata/md5-cache/dev-ruby/lumberjack-1.0.11
index f42d5fa8c5ce..dfd445dc5c52 100644
--- a/metadata/md5-cache/dev-ruby/lumberjack-1.0.11
+++ b/metadata/md5-cache/dev-ruby/lumberjack-1.0.11
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/timecop-0.8[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/timecop-0.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/timecop-0.8[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: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/timecop-0.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/timecop-0.8[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: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=A simple, powerful, and very fast logging utility
 EAPI=5
 HOMEPAGE=https://github.com/bdurand/lumberjack
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/lumberjack-1.0.11.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_=cd6905eba6ce82072e0f59317e2fe1e3
diff --git a/metadata/md5-cache/dev-ruby/lumberjack-1.0.12 b/metadata/md5-cache/dev-ruby/lumberjack-1.0.12
index 9aeefa1bb864..992605538539 100644
--- a/metadata/md5-cache/dev-ruby/lumberjack-1.0.12
+++ b/metadata/md5-cache/dev-ruby/lumberjack-1.0.12
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/timecop-0.8[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/timecop-0.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/timecop-0.8[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/timecop-0.8[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/timecop-0.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/timecop-0.8[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/timecop-0.8[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A simple, powerful, and very fast logging utility
 EAPI=6
 HOMEPAGE=https://github.com/bdurand/lumberjack
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/lumberjack-1.0.12.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_=4bee1697608d7f0eacf5bf38bbaebc97
diff --git a/metadata/md5-cache/dev-ruby/mab-0.0.3 b/metadata/md5-cache/dev-ruby/mab-0.0.3
index 7601e59681b2..5f9b520d6f6d 100644
--- a/metadata/md5-cache/dev-ruby/mab-0.0.3
+++ b/metadata/md5-cache/dev-ruby/mab-0.0.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-4:0[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/minitest-4:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-4:0[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=Markup as Ruby
 EAPI=5
 HOMEPAGE=https://github.com/camping/mab
-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 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=MIT
-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/mab-0.0.3.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_=f9f05045b943045993071167754fa550
diff --git a/metadata/md5-cache/dev-ruby/magic-0.2.9 b/metadata/md5-cache/dev-ruby/magic-0.2.9
index b3bfad1383ee..c355fbfdf1e3 100644
--- a/metadata/md5-cache/dev-ruby/magic-0.2.9
+++ b/metadata/md5-cache/dev-ruby/magic-0.2.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-apps/file ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( virtual/ruby-ffi[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[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? ( 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-apps/file ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[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? ( 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=Ruby FFI bindings to libmagic
 EAPI=5
 HOMEPAGE=https://github.com/qoobaa/magic
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=sys-apps/file ruby_targets_ruby21? ( virtual/ruby-ffi[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[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=sys-apps/file ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[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=https://github.com/qoobaa/magic/archive/v0.2.9.tar.gz -> magic-0.2.9.tar.gz
 _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_=0a556841b01ce3f13f5effc5b8764fc5
diff --git a/metadata/md5-cache/dev-ruby/mail-2.6.4 b/metadata/md5-cache/dev-ruby/mail-2.6.4
index 50b09a7d1203..8ffa432e0a87 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.6.4
+++ b/metadata/md5-cache/dev-ruby/mail-2.6.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] <dev-ruby/mime-types-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[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-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[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=An email handling library
 EAPI=5
 HOMEPAGE=https://github.com/mikel/mail
-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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] <dev-ruby/mime-types-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[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/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[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=2.6
 SRC_URI=https://github.com/mikel/mail/archive/2.6.4.tar.gz -> mail-2.6.4-git.tar.gz
 _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_=af4255dcf696fbf10c360a71986ebc11
diff --git a/metadata/md5-cache/dev-ruby/mail-2.6.5 b/metadata/md5-cache/dev-ruby/mail-2.6.5
index 2bff81c29554..3a56f83be088 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.6.5
+++ b/metadata/md5-cache/dev-ruby/mail-2.6.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] <dev-ruby/mime-types-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) 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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) 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: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=An email handling library
 EAPI=6
 HOMEPAGE=https://github.com/mikel/mail
-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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] <dev-ruby/mime-types-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) 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-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) 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 )
 SLOT=2.6
 SRC_URI=https://github.com/mikel/mail/archive/2.6.5.tar.gz -> mail-2.6.5-git.tar.gz
 _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_=42edd28262d9a422ece0865b88574914
diff --git a/metadata/md5-cache/dev-ruby/mail-2.6.6 b/metadata/md5-cache/dev-ruby/mail-2.6.6
index 1710607e53f1..e5241e5178b7 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.6.6
+++ b/metadata/md5-cache/dev-ruby/mail-2.6.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] <dev-ruby/mime-types-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby24] <dev-ruby/mime-types-4:*[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby24] <dev-ruby/mime-types-4:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An email handling library
 EAPI=6
 HOMEPAGE=https://github.com/mikel/mail
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] <dev-ruby/mime-types-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby24] <dev-ruby/mime-types-4:*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby24] <dev-ruby/mime-types-4:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2.6
 SRC_URI=https://github.com/mikel/mail/archive/2.6.6.tar.gz -> mail-2.6.6-git.tar.gz
 _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_=f6860ab5043f4ff1b7ba0698fc6f35e8
diff --git a/metadata/md5-cache/dev-ruby/maruku-0.7.2-r1 b/metadata/md5-cache/dev-ruby/maruku-0.7.2-r1
index f6ab785fdc6d..472e3bcf5dc0 100644
--- a/metadata/md5-cache/dev-ruby/maruku-0.7.2-r1
+++ b/metadata/md5-cache/dev-ruby/maruku-0.7.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/nokogiri-diff[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/nokogiri-diff[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri-diff[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby23] ) ) ) test? ( app-text/blahtexml ) 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: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=ruby_targets_ruby22? ( test? ( dev-ruby/nokogiri-diff[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri-diff[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby23] ) ) ) test? ( app-text/blahtexml ) 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: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=A Markdown-superset interpreter written in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/bhollis/maruku
-IUSE=highlight test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=highlight test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=amd64 arm ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( highlight? ( dev-ruby/syntax[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? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( highlight? ( dev-ruby/syntax[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/maruku-0.7.2.gem
 _eclass_exported_funcs=pkg_postinst:- 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_=c240c2f4c7a9f99c0d1ce033a12c4b1b
diff --git a/metadata/md5-cache/dev-ruby/maruku-0.7.3 b/metadata/md5-cache/dev-ruby/maruku-0.7.3
index 19a23b42f465..d4dee1358688 100644
--- a/metadata/md5-cache/dev-ruby/maruku-0.7.3
+++ b/metadata/md5-cache/dev-ruby/maruku-0.7.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/nokogiri-diff[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/nokogiri-diff[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri-diff[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/nokogiri-diff[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby24] ) ) ) test? ( app-text/blahtexml ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/nokogiri-diff[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri-diff[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/nokogiri-diff[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby24] ) ) ) test? ( app-text/blahtexml ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Markdown-superset interpreter written in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/bhollis/maruku
-IUSE=highlight test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=highlight test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/maruku-0.7.3.gem
 _eclass_exported_funcs=pkg_postinst:- 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_=788a0bb643c0f81516ed0ab2211ea6d9
diff --git a/metadata/md5-cache/dev-ruby/mash-0.1.1-r2 b/metadata/md5-cache/dev-ruby/mash-0.1.1-r2
index 01261bd40863..7e35160ca2e3 100644
--- a/metadata/md5-cache/dev-ruby/mash-0.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/mash-0.1.1-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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=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=Mash is an extended Hash that gives simple pseudo-object functionality
 EAPI=5
 HOMEPAGE=https://github.com/mbleigh/mash
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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/mash-0.1.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_=130334c562f9cf0b2122a855a0060d88
diff --git a/metadata/md5-cache/dev-ruby/maxitest-2.4.0 b/metadata/md5-cache/dev-ruby/maxitest-2.4.0
index 9bcd5a318f25..608a7feb7761 100644
--- a/metadata/md5-cache/dev-ruby/maxitest-2.4.0
+++ b/metadata/md5-cache/dev-ruby/maxitest-2.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Minitest + all the features you always wanted
 EAPI=5
 HOMEPAGE=https://github.com/grosser/maxitest
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=https://github.com/grosser/maxitest/archive/v2.4.0.tar.gz -> maxitest-2.4.0.tar.gz
 _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_=bd552d3019bdcaed758cd921885278e5
diff --git a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1 b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
index 714642a07aa8..699f84a880d3 100644
--- a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
+++ b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~app-text/mecab-0.996 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_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=~app-text/mecab-0.996 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=Ruby binding for MeCab
 EAPI=5
 HOMEPAGE=http://mecab.sourceforge.net/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( BSD LGPL-2.1 GPL-2 )
-RDEPEND=~app-text/mecab-0.996 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_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=~app-text/mecab-0.996 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://mecab.googlecode.com/files/mecab-ruby-0.996.tar.gz
 _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-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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=54f330f3c48e1ae09590cd4ced50d638
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.3-r1 b/metadata/md5-cache/dev-ruby/mechanize-2.7.3-r1
index 7a1fe9e4e394..7b7ead9b99ed 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.7.3-r1
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.7.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby21] test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby22] test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby21] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby21] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby21] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby21] >=dev-ruby/mime-types-2.0[ruby_targets_ruby21] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-2.0[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby22] test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-2.0[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=A Ruby library used for automating interaction with websites
 EAPI=5
 HOMEPAGE=https://github.com/sparklemotion/mechanize
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby21] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby21] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby21] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby21] >=dev-ruby/mime-types-2.0[ruby_targets_ruby21] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-2.0[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.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/nokogiri-1.4.4-r1[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-2.0[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.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/mechanize-2.7.3.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_=22ae27f0d28f361ff32d953ec52339ca
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.5 b/metadata/md5-cache/dev-ruby/mechanize-2.7.5
index f86ccf549e36..88eebda9096b 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.7.5
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.7.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby21] test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby22] test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby21] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby21] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby21] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby21] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby21] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby22] test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=A Ruby library used for automating interaction with websites
 EAPI=5
 HOMEPAGE=https://github.com/sparklemotion/mechanize
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby21] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby21] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby21] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby21] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby21] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.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/nokogiri-1.6[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.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/mechanize-2.7.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_=f30e7b20fa77c5c099a15b893193f3b9
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.5-r2 b/metadata/md5-cache/dev-ruby/mechanize-2.7.5-r2
index b0c5c7b5cf19..e21489b80e9c 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.7.5-r2
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.7.5-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby21] test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby22] test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby23] test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby21] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby21] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby21] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby21] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby21] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby23] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby23] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby23] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby23] >=dev-ruby/domain_name-0.5.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? ( 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/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? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby22] test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby23] test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby23] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby23] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby23] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby23] >=dev-ruby/domain_name-0.5.1[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/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=A Ruby library used for automating interaction with websites
 EAPI=5
 HOMEPAGE=https://github.com/sparklemotion/mechanize
-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 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby21] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby21] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby21] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby21] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby21] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby23] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby23] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby23] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby23] >=dev-ruby/domain_name-0.5.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/nokogiri-1.6[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby23] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby23] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby23] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby23] >=dev-ruby/domain_name-0.5.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/mechanize-2.7.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_=34b8ce1064417d0b997cd02afee2034f
diff --git a/metadata/md5-cache/dev-ruby/memoist-0.14.0 b/metadata/md5-cache/dev-ruby/memoist-0.14.0
index a93fd7041027..bdaf64f7662c 100644
--- a/metadata/md5-cache/dev-ruby/memoist-0.14.0
+++ b/metadata/md5-cache/dev-ruby/memoist-0.14.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[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/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/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[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/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=ActiveSupport::Memoizable with a few enhancements
 EAPI=5
 HOMEPAGE=https://github.com/matthewrudy/memoist
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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/memoist-0.14.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_=3916f87455a49078dc3f0bac70af2359
diff --git a/metadata/md5-cache/dev-ruby/memoist-0.15.0 b/metadata/md5-cache/dev-ruby/memoist-0.15.0
index f93c4846a3fe..22ae816ac05f 100644
--- a/metadata/md5-cache/dev-ruby/memoist-0.15.0
+++ b/metadata/md5-cache/dev-ruby/memoist-0.15.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[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/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/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[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/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=ActiveSupport::Memoizable with a few enhancements
 EAPI=5
 HOMEPAGE=https://github.com/matthewrudy/memoist
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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/memoist-0.15.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_=3916f87455a49078dc3f0bac70af2359
diff --git a/metadata/md5-cache/dev-ruby/memoist-0.16.0 b/metadata/md5-cache/dev-ruby/memoist-0.16.0
index a4ce9cf602ca..898bf232beb7 100644
--- a/metadata/md5-cache/dev-ruby/memoist-0.16.0
+++ b/metadata/md5-cache/dev-ruby/memoist-0.16.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=ActiveSupport::Memoizable with a few enhancements
 EAPI=6
 HOMEPAGE=https://github.com/matthewrudy/memoist
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/memoist-0.16.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_=ff928340da63527230d950061d17618f
diff --git a/metadata/md5-cache/dev-ruby/memoizable-0.4.2 b/metadata/md5-cache/dev-ruby/memoizable-0.4.2
index 323c8f229732..f9069558630e 100644
--- a/metadata/md5-cache/dev-ruby/memoizable-0.4.2
+++ b/metadata/md5-cache/dev-ruby/memoizable-0.4.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.3.1:0[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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-ruby/thread_safe-0.3.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.3.1:0[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=Memoize method return values
 EAPI=5
 HOMEPAGE=https://github.com/dkubb/memoizable
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.3.1:0[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/thread_safe-0.3.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.3.1:0[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/memoizable-0.4.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_=178b85329ce79c8005aebb51012eb515
diff --git a/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1 b/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1
index 7d671163f505..e5b6c9530d8e 100644
--- a/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit: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? ( 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/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/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[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/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=A Ruby library that lets you memoize methods
 EAPI=5
 HOMEPAGE=https://github.com/djberg96/memoize
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
-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/memoize-1.3.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_=78c519985113b2977d9af53cd73a8e93
diff --git a/metadata/md5-cache/dev-ruby/mercenary-0.3.6 b/metadata/md5-cache/dev-ruby/mercenary-0.3.6
index 6e204313a845..0d5a9f8a81f3 100644
--- a/metadata/md5-cache/dev-ruby/mercenary-0.3.6
+++ b/metadata/md5-cache/dev-ruby/mercenary-0.3.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Lightweight and flexible library for writing command-line apps
 EAPI=5
 HOMEPAGE=https://github.com/jekyll/mercenary
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/mercenary-0.3.6.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_=ff5bea4e6b7e50a8c61127e39fb3448e
diff --git a/metadata/md5-cache/dev-ruby/metaclass-0.0.4 b/metadata/md5-cache/dev-ruby/metaclass-0.0.4
index 21e469bb0405..c4f034362f12 100644
--- a/metadata/md5-cache/dev-ruby/metaclass-0.0.4
+++ b/metadata/md5-cache/dev-ruby/metaclass-0.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Adds a __metaclass__ method to all Ruby objects
 EAPI=5
 HOMEPAGE=https://github.com/floehopper/metaclass
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/floehopper/metaclass/archive/v0.0.4.tar.gz -> metaclass-0.0.4.tar.gz
 _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_=2b4ed43baed120a8f26b233a04917064
diff --git a/metadata/md5-cache/dev-ruby/metaid-1.0-r3 b/metadata/md5-cache/dev-ruby/metaid-1.0-r3
index 156736577420..5b7df52aee3d 100644
--- a/metadata/md5-cache/dev-ruby/metaid-1.0-r3
+++ b/metadata/md5-cache/dev-ruby/metaid-1.0-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=An aid to Ruby metaprogramming
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/metaid
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~ia64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/metaid-1.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_=4ea1c72503a1102e1d7215410e423fd7
diff --git a/metadata/md5-cache/dev-ruby/metasm-1.0.2-r4 b/metadata/md5-cache/dev-ruby/metasm-1.0.2-r4
index b6f381b0ff88..7022dac16d93 100644
--- a/metadata/md5-cache/dev-ruby/metasm-1.0.2-r4
+++ b/metadata/md5-cache/dev-ruby/metasm-1.0.2-r4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/bundler[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/bundler[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/bundler[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/bundler[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-ruby/bundler[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/bundler[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/bundler[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=cross-architecture assembler, disassembler, linker, and debugger
 EAPI=6
 HOMEPAGE=http://metasm.cr0.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.0.2
 SRC_URI=mirror://rubygems/metasm-1.0.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_=e99a3f50580f7b2e5553793a906a8faf
diff --git a/metadata/md5-cache/dev-ruby/metasm-9999 b/metadata/md5-cache/dev-ruby/metasm-9999
index e3a65e1ad387..10c2fce1c1e6 100644
--- a/metadata/md5-cache/dev-ruby/metasm-9999
+++ b/metadata/md5-cache/dev-ruby/metasm-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/bundler[ruby_targets_ruby21] gtk? ( dev-ruby/ruby-gtk2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/bundler[ruby_targets_ruby22] gtk? ( dev-ruby/ruby-gtk2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/bundler[ruby_targets_ruby23] gtk? ( dev-ruby/ruby-gtk2[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] ) ) >=dev-vcs/git-1.8.2.1
+DEPEND=ruby_targets_ruby22? ( dev-ruby/bundler[ruby_targets_ruby22] gtk? ( dev-ruby/ruby-gtk2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/bundler[ruby_targets_ruby23] gtk? ( dev-ruby/ruby-gtk2[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] ) ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=cross-architecture assembler, disassembler, linker, and debugger
 EAPI=6
 HOMEPAGE=http://metasm.cr0.org/
-IUSE=gtk elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=gtk elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 LICENSE=LGPL-2.1
-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=9999
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:git-r3 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	git-r3	cbafa3261c37c7e3af44bb16a34ea390	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	git-r3	cbafa3261c37c7e3af44bb16a34ea390	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4f8abbac5426f1e996831b52a9da60d9
diff --git a/metadata/md5-cache/dev-ruby/metasploit-concern-2.0.1 b/metadata/md5-cache/dev-ruby/metasploit-concern-2.0.1
index da579ffe4e0d..b0679c4cbb97 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-concern-2.0.1
+++ b/metadata/md5-cache/dev-ruby/metasploit-concern-2.0.1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-4.2.6:4.2[ruby_targets_ruby22] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/railties-4.2.6:4.2[ruby_targets_ruby22] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=Metasploit concern allows you to define concerns in app/concerns.
 EAPI=5
 HOMEPAGE=https://github.com/rapid7/metasploit-concern
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=!dev-ruby/metasploit-concern:0 ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-4.2.6:4.2[ruby_targets_ruby22] >=dev-ruby/activesupport-4.2.6:4.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=!dev-ruby/metasploit-concern:0 ruby_targets_ruby22? ( >=dev-ruby/railties-4.2.6:4.2[ruby_targets_ruby22] >=dev-ruby/activesupport-4.2.6:4.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 )
 RESTRICT=test
 SLOT=2.0
 SRC_URI=mirror://rubygems/metasploit-concern-2.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_=a03bdbf1da27e705ba510171508c1df9
diff --git a/metadata/md5-cache/dev-ruby/metasploit-concern-2.0.3 b/metadata/md5-cache/dev-ruby/metasploit-concern-2.0.3
index ac53410ad6da..9682b30f16aa 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-concern-2.0.3
+++ b/metadata/md5-cache/dev-ruby/metasploit-concern-2.0.3
@@ -12,5 +12,5 @@ RESTRICT=test
 SLOT=2.0
 SRC_URI=mirror://rubygems/metasploit-concern-2.0.3.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_=91375d251a783ee7433eb6c8af6f3e30
diff --git a/metadata/md5-cache/dev-ruby/metasploit-credential-2.0.3 b/metadata/md5-cache/dev-ruby/metasploit-credential-2.0.3
deleted file mode 100644
index d6dba47f39d6..000000000000
--- a/metadata/md5-cache/dev-ruby/metasploit-credential-2.0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/metasploit-concern:2.0[ruby_targets_ruby21] >=dev-ruby/metasploit_data_models-1.2.0:*[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] dev-ruby/rubyntlm[ruby_targets_ruby21] >=dev-ruby/railties-4.2.6:4.2[ruby_targets_ruby21] dev-ruby/pg[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=Code for modeling and managing credentials in Metasploit
-EAPI=5
-HOMEPAGE=https://github.com/rapid7/metasploit-credential
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/metasploit-concern:2.0[ruby_targets_ruby21] >=dev-ruby/metasploit_data_models-1.2.0:*[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] dev-ruby/rubyntlm[ruby_targets_ruby21] >=dev-ruby/railties-4.2.6:4.2[ruby_targets_ruby21] dev-ruby/pg[ruby_targets_ruby21] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 )
-RESTRICT=test
-SLOT=2.0.3
-SRC_URI=mirror://rubygems/metasploit-credential-2.0.3.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
-_md5_=73892c58af3e48c01b4d48f7d5c1797f
diff --git a/metadata/md5-cache/dev-ruby/metasploit-credential-2.0.8 b/metadata/md5-cache/dev-ruby/metasploit-credential-2.0.8
index afa8d318336f..88539e338a5d 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-credential-2.0.8
+++ b/metadata/md5-cache/dev-ruby/metasploit-credential-2.0.8
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/metasploit-concern:2.0[ruby_targets_ruby21] >=dev-ruby/metasploit_data_models-1.2.0:*[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] dev-ruby/rubyntlm[ruby_targets_ruby21] >=dev-ruby/railties-4.2.6:4.2[ruby_targets_ruby21] dev-ruby/pg[ruby_targets_ruby21] ) ruby_targets_ruby23? ( dev-ruby/metasploit-concern:2.0[ruby_targets_ruby23] >=dev-ruby/metasploit_data_models-1.2.0:*[ruby_targets_ruby23] >=dev-ruby/metasploit-model-1.0.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] dev-ruby/rubyntlm[ruby_targets_ruby23] >=dev-ruby/railties-4.2.6:4.2[ruby_targets_ruby23] dev-ruby/pg[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/metasploit-concern:2.0[ruby_targets_ruby23] >=dev-ruby/metasploit_data_models-1.2.0:*[ruby_targets_ruby23] >=dev-ruby/metasploit-model-1.0.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] dev-ruby/rubyntlm[ruby_targets_ruby23] >=dev-ruby/railties-4.2.6:4.2[ruby_targets_ruby23] dev-ruby/pg[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Code for modeling and managing credentials in Metasploit
 EAPI=6
 HOMEPAGE=https://github.com/rapid7/metasploit-credential
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby23 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/metasploit-concern:2.0[ruby_targets_ruby21] >=dev-ruby/metasploit_data_models-1.2.0:*[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] dev-ruby/rubyntlm[ruby_targets_ruby21] >=dev-ruby/railties-4.2.6:4.2[ruby_targets_ruby21] dev-ruby/pg[ruby_targets_ruby21] ) ruby_targets_ruby23? ( dev-ruby/metasploit-concern:2.0[ruby_targets_ruby23] >=dev-ruby/metasploit_data_models-1.2.0:*[ruby_targets_ruby23] >=dev-ruby/metasploit-model-1.0.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] dev-ruby/rubyntlm[ruby_targets_ruby23] >=dev-ruby/railties-4.2.6:4.2[ruby_targets_ruby23] dev-ruby/pg[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/metasploit-concern:2.0[ruby_targets_ruby23] >=dev-ruby/metasploit_data_models-1.2.0:*[ruby_targets_ruby23] >=dev-ruby/metasploit-model-1.0.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] dev-ruby/rubyntlm[ruby_targets_ruby23] >=dev-ruby/railties-4.2.6:4.2[ruby_targets_ruby23] dev-ruby/pg[ruby_targets_ruby23] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=2.0.8
 SRC_URI=mirror://rubygems/metasploit-credential-2.0.8.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_=524848039cf6903a77c87a608bbfaeca
diff --git a/metadata/md5-cache/dev-ruby/metasploit-model-2.0.0 b/metadata/md5-cache/dev-ruby/metasploit-model-2.0.0
deleted file mode 100644
index d7869ac3ccf6..000000000000
--- a/metadata/md5-cache/dev-ruby/metasploit-model-2.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/activemodel-4.2.6:4.2[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( dev-ruby/bundler[ruby_targets_ruby21] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=Common code, such as validators and mixins
-EAPI=5
-HOMEPAGE=https://github.com/rapid7/metasploit-model
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=!dev-ruby/metasploit-model:0 ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/activemodel-4.2.6:4.2[ruby_targets_ruby21] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 )
-RESTRICT=test
-SLOT=2.0
-SRC_URI=mirror://rubygems/metasploit-model-2.0.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
-_md5_=b333499504b09190f5c2eee86dce7414
diff --git a/metadata/md5-cache/dev-ruby/metasploit-model-2.0.3 b/metadata/md5-cache/dev-ruby/metasploit-model-2.0.3
index b7cc0bbeb111..2634c095e053 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-model-2.0.3
+++ b/metadata/md5-cache/dev-ruby/metasploit-model-2.0.3
@@ -12,5 +12,5 @@ RESTRICT=test
 SLOT=2.0
 SRC_URI=mirror://rubygems/metasploit-model-2.0.3.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_=299632ef45464c774d6f198bce5ba236
diff --git a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.1.11 b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.1.11
index a7681fdb7531..e36d6606a37e 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.1.11
+++ b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.1.11
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Compiled binaries for Metasploit's Meterpreter
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/metasploit-payloads
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=test strip
 SLOT=1.1.11
 SRC_URI=mirror://rubygems/metasploit-payloads-1.1.11.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:-
-_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_=c6fc81ed278a3c083b6b5e074aeec4de
diff --git a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.1.13 b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.1.13
index 392ef68c1d23..01db345fe7d6 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.1.13
+++ b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.1.13
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Compiled binaries for Metasploit's Meterpreter
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/metasploit-payloads
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=test strip
 SLOT=1.1.13
 SRC_URI=mirror://rubygems/metasploit-payloads-1.1.13.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:-
-_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_=c6fc81ed278a3c083b6b5e074aeec4de
diff --git a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.2.24 b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.2.24
index f19e90655306..64b59d4898c5 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.2.24
+++ b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.2.24
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Compiled binaries for Metasploit's Meterpreter
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/metasploit-payloads
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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 )
 RESTRICT=test strip
 SLOT=1.2.24
 SRC_URI=mirror://rubygems/metasploit-payloads-1.2.24.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:-
-_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_=9d822da170a41affaa18c22322295ece
diff --git a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.2.28 b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.2.28
index 69f6a06f4f8f..ea78f58705bc 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.2.28
+++ b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.2.28
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Compiled binaries for Metasploit's Meterpreter
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/metasploit-payloads
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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 )
 RESTRICT=test strip
 SLOT=1.2.28
 SRC_URI=mirror://rubygems/metasploit-payloads-1.2.28.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:-
-_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_=9d822da170a41affaa18c22322295ece
diff --git a/metadata/md5-cache/dev-ruby/metasploit_data_models-2.0.0 b/metadata/md5-cache/dev-ruby/metasploit_data_models-2.0.0
deleted file mode 100644
index 7ea8cfb1d28d..000000000000
--- a/metadata/md5-cache/dev-ruby/metasploit_data_models-2.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activerecord-4.2.6:4.2[ruby_targets_ruby21,postgres] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby21] dev-ruby/pg[ruby_targets_ruby21] dev-ruby/postgres_ext[ruby_targets_ruby21] >=dev-ruby/railties-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/recog-2.0.0:*[ruby_targets_ruby21] dev-ruby/arel-helpers[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-2.0.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-2.0.0[ruby_targets_ruby21] <dev-ruby/thor-2.0[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( dev-ruby/bundler[ruby_targets_ruby21] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=The database layer for Metasploit
-EAPI=5
-HOMEPAGE=https://github.com/rapid7/metasploit_data_models
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=!dev-ruby/metasploit_data_models:0 ruby_targets_ruby21? ( >=dev-ruby/activerecord-4.2.6:4.2[ruby_targets_ruby21,postgres] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby21] dev-ruby/pg[ruby_targets_ruby21] dev-ruby/postgres_ext[ruby_targets_ruby21] >=dev-ruby/railties-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/recog-2.0.0:*[ruby_targets_ruby21] dev-ruby/arel-helpers[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-2.0.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-2.0.0[ruby_targets_ruby21] <dev-ruby/thor-2.0[ruby_targets_ruby21] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 )
-RESTRICT=test
-SLOT=2.0.0
-SRC_URI=mirror://rubygems/metasploit_data_models-2.0.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
-_md5_=9a06f8fb293f816660c6915b88cc786b
diff --git a/metadata/md5-cache/dev-ruby/metasploit_data_models-2.0.14 b/metadata/md5-cache/dev-ruby/metasploit_data_models-2.0.14
index 047fed40b73e..9635a7ead0ec 100644
--- a/metadata/md5-cache/dev-ruby/metasploit_data_models-2.0.14
+++ b/metadata/md5-cache/dev-ruby/metasploit_data_models-2.0.14
@@ -12,5 +12,5 @@ RESTRICT=test
 SLOT=2.0.14
 SRC_URI=mirror://rubygems/metasploit_data_models-2.0.14.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_=747535d383e41241508d1558c54d4617
diff --git a/metadata/md5-cache/dev-ruby/metasploit_payloads-mettle-0.0.6 b/metadata/md5-cache/dev-ruby/metasploit_payloads-mettle-0.0.6
index 216641f0bcd5..b03317a19326 100644
--- a/metadata/md5-cache/dev-ruby/metasploit_payloads-mettle-0.0.6
+++ b/metadata/md5-cache/dev-ruby/metasploit_payloads-mettle-0.0.6
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Compiled binaries for Metasploit's next-gen Meterpreter
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/metasploit_payloads-mettle
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=test strip
 SLOT=0.0.6
 SRC_URI=mirror://rubygems/metasploit_payloads-mettle-0.0.6.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:-
-_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_=3dde0707d278ab906026f4098f24d202
diff --git a/metadata/md5-cache/dev-ruby/metasploit_payloads-mettle-0.1.9 b/metadata/md5-cache/dev-ruby/metasploit_payloads-mettle-0.1.9
index e1dbfe048831..9131ad759962 100644
--- a/metadata/md5-cache/dev-ruby/metasploit_payloads-mettle-0.1.9
+++ b/metadata/md5-cache/dev-ruby/metasploit_payloads-mettle-0.1.9
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Compiled binaries for Metasploit's next-gen Meterpreter
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/metasploit_payloads-mettle
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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 )
 RESTRICT=test strip
 SLOT=0.1.9
 SRC_URI=mirror://rubygems/metasploit_payloads-mettle-0.1.9.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:-
-_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_=2bc45c83dfd4754126c93c9a8028bac0
diff --git a/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.22 b/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.22
index c683e8801e02..b4a72026236e 100644
--- a/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.22
+++ b/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.22
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Compiled binaries for Metasploit's Meterpreter
 EAPI=5
 HOMEPAGE=https://github.com/rapid7/meterpreter_bins
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=!dev-ruby/meterpreter_bins:0 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=!dev-ruby/meterpreter_bins:0 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=0.0.22
 SRC_URI=mirror://rubygems/meterpreter_bins-0.0.22.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_=6cf39fe50ac864c953585a6f91bddea1
diff --git a/metadata/md5-cache/dev-ruby/method_source-0.8.2-r3 b/metadata/md5-cache/dev-ruby/method_source-0.8.2-r3
index 5ca36b29eb99..6469f4730c49 100644
--- a/metadata/md5-cache/dev-ruby/method_source-0.8.2-r3
+++ b/metadata/md5-cache/dev-ruby/method_source-0.8.2-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/bacon-1.1.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/bacon-1.1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/bacon-1.1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/bacon-1.1.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/bacon-1.1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/bacon-1.1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/bacon-1.1.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Retrieve the source code for a method
 EAPI=5
 HOMEPAGE=https://github.com/banister/method_source
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/method_source-0.8.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_=b4199fa06cd7dd17cd762697f2ea7e0e
diff --git a/metadata/md5-cache/dev-ruby/mime-types-1.25.1 b/metadata/md5-cache/dev-ruby/mime-types-1.25.1
index c0454dcd96d5..3e64943fa04d 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-1.25.1
+++ b/metadata/md5-cache/dev-ruby/mime-types-1.25.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Provides a mailcap-like MIME Content-Type lookup for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/halostatue/mime-types/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT Artistic GPL-2
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mime-types-1.25.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_=8639928f70b6530a6f5027bce544c18b
diff --git a/metadata/md5-cache/dev-ruby/mime-types-2.6.2 b/metadata/md5-cache/dev-ruby/mime-types-2.6.2
index 7c98b950ea23..b096151c5c73 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-2.6.2
+++ b/metadata/md5-cache/dev-ruby/mime-types-2.6.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[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/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/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[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/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=Provides a mailcap-like MIME Content-Type lookup for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/mime-types/ruby-mime-types
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT Artistic GPL-2
-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=2
 SRC_URI=mirror://rubygems/mime-types-2.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_=51191d279b2ffafa9973a8f45616c6a9
diff --git a/metadata/md5-cache/dev-ruby/mime-types-2.99.2 b/metadata/md5-cache/dev-ruby/mime-types-2.99.2
index 9e7c42fdac89..ab5368179a4d 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-2.99.2
+++ b/metadata/md5-cache/dev-ruby/mime-types-2.99.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Provides a mailcap-like MIME Content-Type lookup for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/mime-types/ruby-mime-types
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT Artistic GPL-2
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/mime-types-2.99.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_=ed1ba9f5928231dddeb96381b2e05956
diff --git a/metadata/md5-cache/dev-ruby/mime-types-3.0 b/metadata/md5-cache/dev-ruby/mime-types-3.0
index 05c8e183e3ce..86346998c653 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-3.0
+++ b/metadata/md5-cache/dev-ruby/mime-types-3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Provides a mailcap-like MIME Content-Type lookup for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/mime-types/ruby-mime-types
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/mime-types-3.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_=5b459965b2cdf442dd28ff059af8c1c3
diff --git a/metadata/md5-cache/dev-ruby/mime-types-3.0-r1 b/metadata/md5-cache/dev-ruby/mime-types-3.0-r1
index f7338ceca6f6..4e1da6782c1c 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-3.0-r1
+++ b/metadata/md5-cache/dev-ruby/mime-types-3.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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/minitest:5[ruby_targets_ruby22] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Provides a mailcap-like MIME Content-Type lookup for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/mime-types/ruby-mime-types
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~ppc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mime-types-data-3.2015:3[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/mime-types-data-3.2015:3[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=3
 SRC_URI=mirror://rubygems/mime-types-3.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_=dd4b05f220bbb097c726b3119a929537
diff --git a/metadata/md5-cache/dev-ruby/mime-types-3.1 b/metadata/md5-cache/dev-ruby/mime-types-3.1
index 43344feed3e1..2e66e78e3bce 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-3.1
+++ b/metadata/md5-cache/dev-ruby/mime-types-3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby21] dev-ruby/minitest-hooks:1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby22] dev-ruby/minitest-hooks:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby23] dev-ruby/minitest-hooks:1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby24] dev-ruby/minitest-hooks:1[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby22] dev-ruby/minitest-hooks:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby23] dev-ruby/minitest-hooks:1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby24] dev-ruby/minitest-hooks:1[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Provides a mailcap-like MIME Content-Type lookup for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/mime-types/ruby-mime-types
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/mime-types-3.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_=bbafb84ac4f801516b7f0ba7f503b97f
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2016.0521 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2016.0521
index 71e6de8357b1..6d4899fe9799 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2016.0521
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2016.0521
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Registry for information about MIME media type definitions
 EAPI=5
 HOMEPAGE=https://github.com/mime-types/mime-types-data
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/mime-types-data-3.2016.0521.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_=9f8622ed143211b3a4d5eacd9f1ec37e
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.3.1 b/metadata/md5-cache/dev-ruby/mimemagic-0.3.1
index b31186cb92ab..563bb542b95e 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.3.1
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[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/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[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=Fast mime detection by extension or content
 EAPI=5
 HOMEPAGE=https://github.com/minad/mimemagic
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/mimemagic-0.3.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_=decb7467623f8603b30d7165d1076dfc
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.3.2 b/metadata/md5-cache/dev-ruby/mimemagic-0.3.2
index fae8217dd3b2..9b064249b9ad 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.3.2
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.3.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Fast mime detection by extension or content
 EAPI=5
 HOMEPAGE=https://github.com/minad/mimemagic
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/mimemagic-0.3.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_=662c411c5b12baf9f5c9df222a0e218a
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.5.1-r1 b/metadata/md5-cache/dev-ruby/mini_magick-4.5.1-r1
index 6e7a3ec01773..4f6d015d1d38 100644
--- a/metadata/md5-cache/dev-ruby/mini_magick-4.5.1-r1
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.5.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( virtual/imagemagick-tools[jpeg,png,tiff] ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] dev-ruby/posix-spawn[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/posix-spawn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/posix-spawn[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=test? ( virtual/imagemagick-tools[jpeg,png,tiff] ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/posix-spawn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/posix-spawn[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=Manipulate images with minimal use of memory
 EAPI=5
 HOMEPAGE=https://github.com/minimagick/minimagick
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=media-gfx/imagemagick 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=media-gfx/imagemagick 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=https://github.com/minimagick/minimagick/archive/v4.5.1.tar.gz -> mini_magick-4.5.1.tar.gz
 _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_=4ab62f9daa3e82a9ec2bd2de439512f5
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.8.0 b/metadata/md5-cache/dev-ruby/mini_magick-4.8.0
index 9105f40709ec..92f1d5357979 100644
--- a/metadata/md5-cache/dev-ruby/mini_magick-4.8.0
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.8.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( virtual/imagemagick-tools[jpeg,png,tiff] ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] dev-ruby/posix-spawn[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/posix-spawn[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/posix-spawn[ruby_targets_ruby23] dev-ruby/webmock[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=test? ( virtual/imagemagick-tools[jpeg,png,tiff] ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/posix-spawn[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/posix-spawn[ruby_targets_ruby23] dev-ruby/webmock[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=Manipulate images with minimal use of memory
 EAPI=6
 HOMEPAGE=https://github.com/minimagick/minimagick
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=media-gfx/imagemagick 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=media-gfx/imagemagick 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=https://github.com/minimagick/minimagick/archive/v4.8.0.tar.gz -> mini_magick-4.8.0.tar.gz
 _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_=5495dfeb53cbb54b8dfdc5c4a66f1c87
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-0.1.3 b/metadata/md5-cache/dev-ruby/mini_mime-0.1.3
index b6d3eb035818..f153b1d13d9c 100644
--- a/metadata/md5-cache/dev-ruby/mini_mime-0.1.3
+++ b/metadata/md5-cache/dev-ruby/mini_mime-0.1.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A lightweight mime type lookup toy
 EAPI=6
 HOMEPAGE=https://github.com/discourse/mini_mime
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/discourse/mini_mime/archive/v0.1.3.tar.gz -> mini_mime-0.1.3.tar.gz
 _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_=ba2a0fa8ac7a28a5443cde297dcaa34d
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-0.1.4 b/metadata/md5-cache/dev-ruby/mini_mime-0.1.4
index 4cf4cb0322c3..e6c1d0ac66de 100644
--- a/metadata/md5-cache/dev-ruby/mini_mime-0.1.4
+++ b/metadata/md5-cache/dev-ruby/mini_mime-0.1.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A lightweight mime type lookup toy
 EAPI=6
 HOMEPAGE=https://github.com/discourse/mini_mime
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/discourse/mini_mime/archive/v0.1.4.tar.gz -> mini_mime-0.1.4.tar.gz
 _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_=ba2a0fa8ac7a28a5443cde297dcaa34d
diff --git a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r1 b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r1
index f50d64db70f1..a2b70b3b8857 100644
--- a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=minitest/unit is a small and fast replacement for ruby's huge and slow test/unit
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/minitest
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitest-4.7.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_=16e6fb13069e6256471bd1029e72652b
diff --git a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2 b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
index 3cead76ec2cd..59accbff8c6a 100644
--- a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
+++ b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and slow test/unit
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/minitest
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitest-4.7.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_=8f33250e3910b111bb954614ef1c5d9e
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.10.2 b/metadata/md5-cache/dev-ruby/minitest-5.10.2
index 954e89892ace..2b74f2f6a7b0 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.10.2
+++ b/metadata/md5-cache/dev-ruby/minitest-5.10.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and slow test/unit
 EAPI=6
 HOMEPAGE=https://github.com/seattlerb/minitest
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.10.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_=058f558435ee31f0a02eb986bbb3556d
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.10.3 b/metadata/md5-cache/dev-ruby/minitest-5.10.3
index 351985221fea..8a9c2d284b1b 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.10.3
+++ b/metadata/md5-cache/dev-ruby/minitest-5.10.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and slow test/unit
 EAPI=6
 HOMEPAGE=https://github.com/seattlerb/minitest
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.10.3.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_=058f558435ee31f0a02eb986bbb3556d
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.3.3-r1 b/metadata/md5-cache/dev-ruby/minitest-5.3.3-r1
index 63816e78c0e0..02091142c8d5 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-5.3.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/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? ( 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/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=minitest/unit is a small and fast replacement for ruby's huge and slow test/unit
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/minitest
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=5
 SRC_URI=mirror://rubygems/minitest-5.3.3.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_=fc6dacd2d9f7745e4bac1f8750d52f1f
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.8.4 b/metadata/md5-cache/dev-ruby/minitest-5.8.4
index 7c7003534828..84147f64235f 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.8.4
+++ b/metadata/md5-cache/dev-ruby/minitest-5.8.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/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? ( 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/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=minitest/unit is a small and fast replacement for ruby's huge and slow test/unit
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/minitest
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=5
 SRC_URI=mirror://rubygems/minitest-5.8.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_=5684af4b39defba6dd437aa32d5ac424
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.9.1 b/metadata/md5-cache/dev-ruby/minitest-5.9.1
index f2fd9cf7bdc7..78a3d7bb8b97 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.9.1
+++ b/metadata/md5-cache/dev-ruby/minitest-5.9.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/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? ( 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/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=minitest/unit is a small and fast replacement for ruby's huge and slow test/unit
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/minitest
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=5
 SRC_URI=mirror://rubygems/minitest-5.9.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_=110ba35b5a0fb239572ce498f2d3bd7c
diff --git a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-2.0 b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-2.0
index c488acf6cabb..efe971a38651 100644
--- a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-2.0
+++ b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/minitest-pretty_diff[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/minitest-pretty_diff[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/minitest-pretty_diff[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/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/minitest[ruby_targets_ruby22] dev-ruby/minitest-pretty_diff[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/minitest-pretty_diff[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/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=Bonus assertions for minitest
 EAPI=5
 HOMEPAGE=https://github.com/halostatue/minitest-bonus-assertions
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=2
 SRC_URI=mirror://rubygems/minitest-bonus-assertions-2.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_=cf60053fa679a04d7d172fc5dff46bb7
diff --git a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0 b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
index c3f0a98035f7..d5dbe3dc99ad 100644
--- a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
+++ b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/minitest-pretty_diff[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/minitest-pretty_diff[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/minitest-pretty_diff[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] dev-ruby/minitest-pretty_diff[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/minitest-pretty_diff[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/minitest-pretty_diff[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] dev-ruby/minitest-pretty_diff[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Bonus assertions for minitest
 EAPI=6
 HOMEPAGE=https://github.com/halostatue/minitest-bonus-assertions
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/minitest-bonus-assertions-3.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_=3e2631038e55549cfe49ca443a20f271
diff --git a/metadata/md5-cache/dev-ruby/minitest-hooks-1.4.0 b/metadata/md5-cache/dev-ruby/minitest-hooks-1.4.0
index 9ea39d3e1794..024ca993f8b6 100644
--- a/metadata/md5-cache/dev-ruby/minitest-hooks-1.4.0
+++ b/metadata/md5-cache/dev-ruby/minitest-hooks-1.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Adds around and before_all/after_all/around_all hooks for Minitest
 EAPI=5
 HOMEPAGE=https://github.com/jeremyevans/minitest-hooks
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/minitest-hooks-1.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_=a7e278fab99312af7928b7d8fe90fe5e
diff --git a/metadata/md5-cache/dev-ruby/minitest-hooks-1.4.1 b/metadata/md5-cache/dev-ruby/minitest-hooks-1.4.1
index 35d56a7cd65d..5df4606fd887 100644
--- a/metadata/md5-cache/dev-ruby/minitest-hooks-1.4.1
+++ b/metadata/md5-cache/dev-ruby/minitest-hooks-1.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Adds around and before_all/after_all/around_all hooks for Minitest
 EAPI=6
 HOMEPAGE=https://github.com/jeremyevans/minitest-hooks
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/minitest-hooks-1.4.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_=02a2d1f3e8f3fa8da23d5492e1a5b362
diff --git a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1 b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
index 9e68b9f838ec..af337a962970 100644
--- a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
+++ b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Pretty-print hashes and arrays before diffing them in MiniTest
 EAPI=5
 HOMEPAGE=https://github.com/adammck/minitest-pretty_diff
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitest-pretty_diff-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_=a10af6946b926559dfcb8f89e5e5f14c
diff --git a/metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.7 b/metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.7
index a2b27c6266e9..d47fe2117023 100644
--- a/metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.7
+++ b/metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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: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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) 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=Run external commands on Unix or Windows
 EAPI=5
 HOMEPAGE=https://github.com/opscode/mixlib-shellout
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-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=https://github.com/opscode/mixlib-shellout/archive/2.2.7.tar.gz -> mixlib-shellout-2.2.7.tar.gz
 _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_=0179b2def9db846c0856046d6bc370b8
diff --git a/metadata/md5-cache/dev-ruby/mixlib-shellout-2.3.2 b/metadata/md5-cache/dev-ruby/mixlib-shellout-2.3.2
index e8e9b2c8eda7..3e78e2d1963e 100644
--- a/metadata/md5-cache/dev-ruby/mixlib-shellout-2.3.2
+++ b/metadata/md5-cache/dev-ruby/mixlib-shellout-2.3.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Run external commands on Unix or Windows
 EAPI=6
 HOMEPAGE=https://github.com/opscode/mixlib-shellout
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/opscode/mixlib-shellout/archive/v2.3.2.tar.gz -> mixlib-shellout-2.3.2.tar.gz
 _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_=6f4f25f007bc1bf56609db00db514329
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2 b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
index e8323381d15b..1277a9740ada 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
+++ b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/coderay[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/coderay[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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? ( doc? ( dev-ruby/coderay[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=Mocking and stubbing using a syntax like that of JMock and SchMock
 EAPI=5
 HOMEPAGE=http://mocha.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/metaclass[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/metaclass[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.10
 SRC_URI=mirror://rubygems/mocha-0.10.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_=556d54e1c8256d237c70a06c6736f1bc
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1 b/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
index 267ec2e5d364..989290450771 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Mocking and stubbing using a syntax like that of JMock and SchMock
 EAPI=5
 HOMEPAGE=http://gofreerange.com/mocha/docs/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/metaclass[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/metaclass[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.11
 SRC_URI=mirror://rubygems/mocha-0.11.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_=b3c3b332914e55ab4c45cfac9bba5e5f
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1 b/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1
index 7e220d7075d1..c6855fc8d6da 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Mocking and stubbing using a syntax like that of JMock and SchMock
 EAPI=5
 HOMEPAGE=http://gofreerange.com/mocha/docs/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/metaclass[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/metaclass[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.12
 SRC_URI=mirror://rubygems/mocha-0.12.10.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_=fa32db6debf84b852eb6432161e72633
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2 b/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2
index f97ebe0a8331..e939132aca36 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2
+++ b/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metaclass[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/metaclass[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metaclass[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/metaclass[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Mocking and stubbing using a syntax like that of JMock and SchMock
 EAPI=5
 HOMEPAGE=http://gofreerange.com/mocha/docs/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metaclass[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/metaclass[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metaclass[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/metaclass[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.13
 SRC_URI=mirror://rubygems/mocha-0.13.3.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_=844ed441323024f4c280387a72cd3f00
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.14.0 b/metadata/md5-cache/dev-ruby/mocha-0.14.0
index 8e8ea3c14819..e337c8b14ba1 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.14.0
+++ b/metadata/md5-cache/dev-ruby/mocha-0.14.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] dev-ruby/introspection[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] dev-ruby/introspection[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] dev-ruby/introspection[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] dev-ruby/introspection[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metaclass[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/metaclass[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] dev-ruby/introspection[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] dev-ruby/introspection[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] dev-ruby/introspection[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metaclass[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/metaclass[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Mocking and stubbing using a syntax like that of JMock and SchMock
 EAPI=5
 HOMEPAGE=http://gofreerange.com/mocha/docs/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metaclass[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/metaclass[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metaclass[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/metaclass[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.14
 SRC_URI=mirror://rubygems/mocha-0.14.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_=152c32ca48bae6d16573dda7d7ee124a
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.1.0 b/metadata/md5-cache/dev-ruby/mocha-1.1.0
index 96f78a4e5bf6..132de22431ec 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.1.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/introspection[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/introspection[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/introspection[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/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/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/introspection[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/introspection[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/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=Mocking and stubbing using a syntax like that of JMock and SchMock
 EAPI=5
 HOMEPAGE=http://gofreerange.com/mocha/docs/
-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=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/introspection[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/introspection[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/introspection[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/introspection[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/introspection[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=1.0
 SRC_URI=mirror://rubygems/mocha-1.1.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_=dced713d7b3a095befbf7b769e55e8bb
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.2.0 b/metadata/md5-cache/dev-ruby/mocha-1.2.0
index 98066b4029a9..00a40a169426 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.2.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] dev-ruby/introspection[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] dev-ruby/introspection[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] dev-ruby/introspection[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/metaclass-0.0*[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/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/test-unit-2.5.1-r1[ruby_targets_ruby22] dev-ruby/introspection[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] dev-ruby/introspection[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/metaclass-0.0*[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/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=Mocking and stubbing using a syntax like that of JMock and SchMock
 EAPI=5
 HOMEPAGE=http://gofreerange.com/mocha/docs/
-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=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/metaclass-0.0*[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/metaclass-0.0*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/metaclass-0.0*[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=1.0
 SRC_URI=mirror://rubygems/mocha-1.2.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_=1928862b5077d4127b84fc9cfb5b0bee
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.2.1 b/metadata/md5-cache/dev-ruby/mocha-1.2.1
index 20ad349b0dc9..a8caa63f1ca9 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.2.1
+++ b/metadata/md5-cache/dev-ruby/mocha-1.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] dev-ruby/introspection[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] dev-ruby/introspection[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] dev-ruby/introspection[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] dev-ruby/introspection[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] dev-ruby/introspection[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] dev-ruby/introspection[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] dev-ruby/introspection[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Mocking and stubbing using a syntax like that of JMock and SchMock
 EAPI=5
 HOMEPAGE=http://gofreerange.com/mocha/docs/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/mocha-1.2.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_=ea535068dd843cba08be89c18ba04006
diff --git a/metadata/md5-cache/dev-ruby/moneta-0.8.1 b/metadata/md5-cache/dev-ruby/moneta-0.8.1
index 3584209734b8..0ff2440d1672 100644
--- a/metadata/md5-cache/dev-ruby/moneta-0.8.1
+++ b/metadata/md5-cache/dev-ruby/moneta-0.8.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) 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? ( 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A unified interface to key/value stores
 EAPI=5
 HOMEPAGE=https://github.com/minad/moneta
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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=https://github.com/minad/moneta/archive/v0.8.1.tar.gz -> moneta-0.8.1.tar.gz
 _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_=9e655eebdcd0dcaacfbf2e27d7e02a0f
diff --git a/metadata/md5-cache/dev-ruby/moneta-1.0.0 b/metadata/md5-cache/dev-ruby/moneta-1.0.0
index 7bac0f042b05..ec9a866a4630 100644
--- a/metadata/md5-cache/dev-ruby/moneta-1.0.0
+++ b/metadata/md5-cache/dev-ruby/moneta-1.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A unified interface to key/value stores
 EAPI=5
 HOMEPAGE=https://github.com/minad/moneta
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/minad/moneta/archive/v1.0.0.tar.gz -> moneta-1.0.0.tar.gz
 _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_=f0045e836bc865d4ab964647906f4ca3
diff --git a/metadata/md5-cache/dev-ruby/mongo-2.0.6 b/metadata/md5-cache/dev-ruby/mongo-2.0.6
index f3936d0bf992..1bde474c0105 100644
--- a/metadata/md5-cache/dev-ruby/mongo-2.0.6
+++ b/metadata/md5-cache/dev-ruby/mongo-2.0.6
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/bson:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/bson:3[ruby_targets_ruby22] ) ) test? ( dev-db/mongodb ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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_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? ( ruby_targets_ruby22? ( dev-ruby/bson:3[ruby_targets_ruby22] ) ) test? ( dev-db/mongodb ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Ruby driver for MongoDB
 EAPI=5
 HOMEPAGE=http://www.mongodb.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=APSL-2
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/bson:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/bson:3[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/bson:3[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-ruby-driver/archive/2.0.6.tar.gz -> mongo-ruby-driver-2.0.6.tar.gz
 _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_=4f46bdb672b5676c81173e5ca239d2f3
diff --git a/metadata/md5-cache/dev-ruby/msgpack-0.7.6 b/metadata/md5-cache/dev-ruby/msgpack-0.7.6
index ca3f24698094..71efd23bc388 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-0.7.6
+++ b/metadata/md5-cache/dev-ruby/msgpack-0.7.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=Binary-based efficient data interchange format for ruby binding
 EAPI=5
 HOMEPAGE=http://msgpack.org/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86-fbsd
 LICENSE=Apache-2.0
-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/msgpack-0.7.6.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_=2adabb97be76cfa52628a33afad78331
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.0.1 b/metadata/md5-cache/dev-ruby/msgpack-1.0.1
index 9c15f705099e..77513da8ceca 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.0.1
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=Binary-based efficient data interchange format for ruby binding
 EAPI=5
 HOMEPAGE=http://msgpack.org/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd
 LICENSE=Apache-2.0
-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/msgpack-1.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_=ec73c7f0f11a21e6a00d9b1dfb8cd3cc
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.0.2 b/metadata/md5-cache/dev-ruby/msgpack-1.0.2
index 3d045ccc5635..18511da0959f 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.0.2
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=Binary-based efficient data interchange format for ruby binding
 EAPI=5
 HOMEPAGE=https://msgpack.org/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd
 LICENSE=Apache-2.0
-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/msgpack-1.0.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_=5f9671b670a1caa80f7fedaf9dd1fa20
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.0.3 b/metadata/md5-cache/dev-ruby/msgpack-1.0.3
index c36f4999db43..6eaedb4ae750 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.0.3
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.0.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=Binary-based efficient data interchange format for ruby binding
 EAPI=5
 HOMEPAGE=https://msgpack.org/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd
 LICENSE=Apache-2.0
-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/msgpack-1.0.3.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_=5788976a1a4574ae28bc2f6dabaddef0
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.1.0 b/metadata/md5-cache/dev-ruby/msgpack-1.1.0
index e0e5d59e87da..15b979130109 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.1.0
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=Binary-based efficient data interchange format for ruby binding
 EAPI=5
 HOMEPAGE=https://msgpack.org/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd
 LICENSE=Apache-2.0
-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/msgpack-1.1.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_=5788976a1a4574ae28bc2f6dabaddef0
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.11.2 b/metadata/md5-cache/dev-ruby/multi_json-1.11.2
index d42dad717099..98ab402f15d5 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.11.2
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.11.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby21] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby22] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby22] ) ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] dev-ruby/yajl-ruby[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/yajl-ruby[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby22] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby22] ) ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/yajl-ruby[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A gem to provide swappable JSON backends
 EAPI=5
 HOMEPAGE=https://github.com/intridea/multi_json
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby21] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby22] >=dev-ruby/yajl-ruby-1.0[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/json-1.4[ruby_targets_ruby22] >=dev-ruby/yajl-ruby-1.0[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=https://github.com/intridea/multi_json/archive/v1.11.2.tar.gz -> multi_json-1.11.2.tar.gz
 _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_=18beb28258a6785d7de95d41cf0bed20
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.12.1 b/metadata/md5-cache/dev-ruby/multi_json-1.12.1
index c1cdbd714200..d54a91dc608e 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.12.1
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.12.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby21] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby22] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby24] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby24] ) ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] dev-ruby/yajl-ruby[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/yajl-ruby[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] dev-ruby/yajl-ruby[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/json[ruby_targets_ruby24] dev-ruby/yajl-ruby[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby22] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby24] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/yajl-ruby[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] dev-ruby/yajl-ruby[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/json[ruby_targets_ruby24] dev-ruby/yajl-ruby[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A gem to provide swappable JSON backends
 EAPI=5
 HOMEPAGE=https://github.com/intridea/multi_json
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby21] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby22] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby24] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby22] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby24] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/intridea/multi_json/archive/v1.12.1.tar.gz -> multi_json-1.12.1.tar.gz
 _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_=f58b244561cd4a8f1a12e793c9a04e84
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.9.3 b/metadata/md5-cache/dev-ruby/multi_json-1.9.3
index 52b80016208c..8a273e4f0dd9 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.9.3
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.9.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby21] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby22] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby22] ) ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rspec:2[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rspec:2[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] dev-ruby/yajl-ruby[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/yajl-ruby[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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_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? ( ruby_targets_ruby22? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby22] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby22] ) ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rspec:2[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/yajl-ruby[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A gem to provide swappable JSON backends
 EAPI=5
 HOMEPAGE=https://github.com/intridea/multi_json
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby21] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby22] >=dev-ruby/yajl-ruby-0.7[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/json-1.4[ruby_targets_ruby22] >=dev-ruby/yajl-ruby-0.7[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/multi_json-1.9.3.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_=3589b37f439829b8bdab12149257dfef
diff --git a/metadata/md5-cache/dev-ruby/multi_test-0.1.2 b/metadata/md5-cache/dev-ruby/multi_test-0.1.2
index fa19ec8110db..aadacb9e8f80 100644
--- a/metadata/md5-cache/dev-ruby/multi_test-0.1.2
+++ b/metadata/md5-cache/dev-ruby/multi_test-0.1.2
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A uniform interface for Ruby testing libraries
 EAPI=5
 HOMEPAGE=http://cukes.info/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/multi_test-0.1.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_=fab3cdc34e59cf5f73ddf754bd632da2
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r2 b/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r2
index 1a660c539be2..4a5904c59163 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r2
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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_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? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A generic swappable back-end for XML parsing
 EAPI=5
 HOMEPAGE=http://rdoc.info/gems/multi_xml
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/multi_xml-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_=f9a2918df6f79bfa1d85c08c4c0ef23b
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.5.5 b/metadata/md5-cache/dev-ruby/multi_xml-0.5.5
index 4232829ab796..08bd5504b8b6 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.5.5
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.5.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/ox[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/ox[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ox[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/ox[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ox[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A generic swappable back-end for XML parsing
 EAPI=5
 HOMEPAGE=http://rdoc.info/gems/multi_xml
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
-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/multi_xml-0.5.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_=35be36ac0c97c984099641fa61dc6f67
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0 b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0
index f59e8c35768c..9afdd2d0be16 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/ox[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/ox[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ox[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/ox[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/ox[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ox[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/ox[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A generic swappable back-end for XML parsing
 EAPI=5
 HOMEPAGE=http://rdoc.info/gems/multi_xml
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/sferik/multi_xml/archive/v0.6.0.tar.gz -> multi_xml-0.6.0.tar.gz
 _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_=782f14d760587bd9e80719c6f3313c4f
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-2.0.0-r1 b/metadata/md5-cache/dev-ruby/multipart-post-2.0.0-r1
index 108285faa8d6..44087380bf55 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-2.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/multipart-post-2.0.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Adds a streamy multipart form post capability to Net::HTTP
 EAPI=5
 HOMEPAGE=https://github.com/nicksieger/multipart-post
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/multipart-post-2.0.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_=cae679ccaac8f4638ac5711d907b5ce6
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.0.2 b/metadata/md5-cache/dev-ruby/mustache-1.0.2
index 972122c95431..0cb3627573f1 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.0.2
+++ b/metadata/md5-cache/dev-ruby/mustache-1.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( app-text/ronn[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( 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? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( 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=Mustache is a framework-agnostic way to render logic-free views
 EAPI=5
 HOMEPAGE=https://mustache.github.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=MIT
-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/mustache-1.0.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_=4b0a9fe43eec82ebec2147e576590dfe
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.0.3 b/metadata/md5-cache/dev-ruby/mustache-1.0.3
index f81afd11eddc..2d2dc45359b9 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.0.3
+++ b/metadata/md5-cache/dev-ruby/mustache-1.0.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( app-text/ronn[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( app-text/ronn[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( app-text/ronn[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Mustache is a framework-agnostic way to render logic-free views
 EAPI=5
 HOMEPAGE=https://mustache.github.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos ~x64-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/mustache-1.0.3.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_=e3f1e63e35082f0130f7034b6a55d15d
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.0.4 b/metadata/md5-cache/dev-ruby/mustache-1.0.4
index 08a694076d76..ca43368b2a3d 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.0.4
+++ b/metadata/md5-cache/dev-ruby/mustache-1.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( app-text/ronn[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( app-text/ronn[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( app-text/ronn[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Mustache is a framework-agnostic way to render logic-free views
 EAPI=5
 HOMEPAGE=https://mustache.github.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos ~x64-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/mustache-1.0.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_=9795c93691817456aaa8314195f74055
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.0.5 b/metadata/md5-cache/dev-ruby/mustache-1.0.5
index 4c4cb45a2234..96db8daea62d 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.0.5
+++ b/metadata/md5-cache/dev-ruby/mustache-1.0.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( app-text/ronn[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( app-text/ronn[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( app-text/ronn[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( app-text/ronn[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Mustache is a framework-agnostic way to render logic-free views
 EAPI=5
 HOMEPAGE=https://mustache.github.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos ~x64-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/mustache-1.0.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_=6491f6c49e9a08e9a2a709f2906fe199
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.3.21 b/metadata/md5-cache/dev-ruby/mysql2-0.3.21
index d1a2a373dff0..01a148ec1004 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.3.21
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.3.21
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libmysqlclient 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=virtual/libmysqlclient ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A modern, simple and very fast Mysql library for Ruby - binding to libmysql
 EAPI=6
 HOMEPAGE=https://github.com/brianmario/mysql2
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=virtual/libmysqlclient:= 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=virtual/libmysqlclient:= ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.3
 SRC_URI=mirror://rubygems/mysql2-0.3.21.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_=d09b2759c2d19131a7f5e9831c7f85c1
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.4.6 b/metadata/md5-cache/dev-ruby/mysql2-0.4.6
index 95586b2ec7ab..218446b5beef 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.4.6
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.4.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libmysqlclient 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=virtual/libmysqlclient ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A modern, simple and very fast Mysql library for Ruby - binding to libmysql
 EAPI=6
 HOMEPAGE=https://github.com/brianmario/mysql2
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=virtual/libmysqlclient:= 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=virtual/libmysqlclient:= ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.4
 SRC_URI=mirror://rubygems/mysql2-0.4.6.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_=48e023479a932fb5e44311c9664128c9
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.4.7 b/metadata/md5-cache/dev-ruby/mysql2-0.4.7
index 69893b851bce..494778b3eb8d 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.4.7
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.4.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libmysqlclient 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=virtual/libmysqlclient ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A modern, simple and very fast Mysql library for Ruby - binding to libmysql
 EAPI=6
 HOMEPAGE=https://github.com/brianmario/mysql2
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=virtual/libmysqlclient:= 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=virtual/libmysqlclient:= ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.4
 SRC_URI=mirror://rubygems/mysql2-0.4.7.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_=48e023479a932fb5e44311c9664128c9
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.4.8 b/metadata/md5-cache/dev-ruby/mysql2-0.4.8
index 460f503d1543..75fb695ad056 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.4.8
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.4.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libmysqlclient 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=virtual/libmysqlclient ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A modern, simple and very fast Mysql library for Ruby - binding to libmysql
 EAPI=6
 HOMEPAGE=https://github.com/brianmario/mysql2
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=virtual/libmysqlclient:= 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=virtual/libmysqlclient:= ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.4
 SRC_URI=mirror://rubygems/mysql2-0.4.8.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_=48e023479a932fb5e44311c9664128c9
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.4.9 b/metadata/md5-cache/dev-ruby/mysql2-0.4.9
index 2e66f3015099..90ec2db7c7fa 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.4.9
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.4.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libmysqlclient 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=virtual/libmysqlclient ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A modern, simple and very fast Mysql library for Ruby - binding to libmysql
 EAPI=6
 HOMEPAGE=https://github.com/brianmario/mysql2
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=virtual/libmysqlclient:= 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=virtual/libmysqlclient:= ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.4
 SRC_URI=mirror://rubygems/mysql2-0.4.9.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_=48e023479a932fb5e44311c9664128c9
diff --git a/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1 b/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1
index 929d513ca660..b5975bc4d511 100644
--- a/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) 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? ( 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Nagios-rb is a compact framework for writing Nagios plugins
 EAPI=5
 HOMEPAGE=https://github.com/jcsalterego/nagios-rb
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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/nagios-0.0.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_=3001a75c4d9d8d3a0fad66f6f6e85675
diff --git a/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1 b/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
index eca86384bcd8..ec1b5172bf5b 100644
--- a/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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: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=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: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=A simple parser for Nagios status files
 EAPI=5
 HOMEPAGE=https://github.com/jbbarth/nagios_analyzer
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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/nagios_analyzer-0.0.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_=4eb0069f600956db3de556dae72eaadd
diff --git a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1 b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
index 26486a94f437..2ba2e202b32a 100644
--- a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
+++ b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Extremely mynymal test framework
 EAPI=5
 HOMEPAGE=https://github.com/mynyml/nanotest
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 arm ~arm64 ppc ppc64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/nanotest-0.9.4.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_=f27d7af9cec2a9658dd41a53a79bf4c2
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.1.1 b/metadata/md5-cache/dev-ruby/narray-0.6.1.1
index 0465546338bd..15caf78edc25 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.1.1
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Numerical N-dimensional Array class
 EAPI=5
 HOMEPAGE=http://www.ir.isas.ac.jp/~masa/ruby/index-e.html
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=amd64 hppa ~mips ppc ~ppc64 x86
 LICENSE=Ruby
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/masa16/narray/archive/0.6.1.1.tar.gz -> narray-0.6.1.1.tar.gz
 _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_=f73ee3ac3c0348aebbb1f9e8ff776251
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.1.2 b/metadata/md5-cache/dev-ruby/narray-0.6.1.2
index 1504980aa3bf..f45f6812df5c 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.1.2
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Numerical N-dimensional Array class
 EAPI=5
 HOMEPAGE=http://www.ir.isas.ac.jp/~masa/ruby/index-e.html
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86
 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/masa16/narray/archive/0.6.1.2.tar.gz -> narray-0.6.1.2.tar.gz
 _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_=894f2ed217501214b171de3a1a2289fd
diff --git a/metadata/md5-cache/dev-ruby/naught-1.1.0 b/metadata/md5-cache/dev-ruby/naught-1.1.0
index 285c0e246d78..ef9af85d44d0 100644
--- a/metadata/md5-cache/dev-ruby/naught-1.1.0
+++ b/metadata/md5-cache/dev-ruby/naught-1.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=A toolkit for building Null Objects in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/avdi/naught
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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=5
 SRC_URI=mirror://rubygems/naught-1.1.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_=116d03f2b20bc7c7428dd66c151b29fc
diff --git a/metadata/md5-cache/dev-ruby/nenv-0.3.0 b/metadata/md5-cache/dev-ruby/nenv-0.3.0
index c9567653d152..96acf789f938 100644
--- a/metadata/md5-cache/dev-ruby/nenv-0.3.0
+++ b/metadata/md5-cache/dev-ruby/nenv-0.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Convenient wrapper for Ruby's ENV
 EAPI=5
 HOMEPAGE=https://github.com/e2/nenv
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/e2/nenv/archive/v0.3.0.tar.gz -> nenv-0.3.0.tar.gz
 _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_=02f7eacafd22b912789ad65f7c1f359d
diff --git a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.0 b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.0
index 3b25e70057b5..c037b8248043 100644
--- a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.0
+++ b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Ruby bindings for Neovim
 EAPI=5
 HOMEPAGE=https://github.com/alexgenco/neovim-ruby
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[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/msgpack-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[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/neovim-0.3.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_=6bc2a755e4f5adcee3a2f48df7389935
diff --git a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.1 b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.1
index aa2f41d8ae79..32b9cca918ca 100644
--- a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.1
+++ b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Ruby bindings for Neovim
 EAPI=5
 HOMEPAGE=https://github.com/alexgenco/neovim-ruby
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[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/msgpack-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[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/neovim-0.3.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_=6bc2a755e4f5adcee3a2f48df7389935
diff --git a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.2 b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.2
index 284e63df05a7..d8af3fc45eb5 100644
--- a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.2
+++ b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Ruby bindings for Neovim
 EAPI=5
 HOMEPAGE=https://github.com/alexgenco/neovim-ruby
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[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/msgpack-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[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/neovim-0.3.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_=2f06b56dc10b36261e6f73ebb4b03316
diff --git a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.4.0 b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.4.0
index eb78c3b978fb..5534e660861e 100644
--- a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.4.0
+++ b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Ruby bindings for Neovim
 EAPI=5
 HOMEPAGE=https://github.com/alexgenco/neovim-ruby
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[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/msgpack-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[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/neovim-0.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_=2f06b56dc10b36261e6f73ebb4b03316
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2
index e86ea8b818b5..00af5f341a93 100644
--- a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/minitest[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/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/hoe[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/minitest[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/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=An implementation of RFC 2617 - Digest Access Authentication
 EAPI=5
 HOMEPAGE=https://github.com/drbrain/net-http-digest_auth
-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 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
-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/net-http-digest_auth-1.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_=0132e2324d395c17aa5b75963595f199
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
index b999ba46fbdb..5957b00b52ea 100644
--- a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/hoe[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/hoe[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An implementation of RFC 2617 - Digest Access Authentication
 EAPI=5
 HOMEPAGE=https://github.com/drbrain/net-http-digest_auth
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-http-digest_auth-1.4.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_=87f65bb0e6c8fd083be5df6e6f5d26cb
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r2 b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r2
index 20ff395c6a2c..0de7ba250938 100644
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r2
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/hoe[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/hoe[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8
 EAPI=5
 HOMEPAGE=https://github.com/drbrain/net-http-persistent
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-http-persistent-2.9.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_=38367377e5c3d2a7789a74b8730add42
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-3.0.0 b/metadata/md5-cache/dev-ruby/net-http-persistent-3.0.0
index 3fcf83debd35..0d701b687902 100644
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-3.0.0
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-3.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/hoe[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/hoe[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8
 EAPI=6
 HOMEPAGE=https://github.com/drbrain/net-http-persistent
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/net-http-persistent-3.0.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_=dfba29a59733c9757bf7609c33fc8338
diff --git a/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1 b/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
index c90ad2536897..6f26aaf18300 100644
--- a/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
+++ b/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/hoe[ruby_targets_ruby21] test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/hoe[ruby_targets_ruby22] test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/hoe[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/hoe[ruby_targets_ruby24] test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-ruby/hoe[ruby_targets_ruby22] test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/hoe[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/hoe[ruby_targets_ruby24] test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An HTTP/1.1 pipelining implementation atop Net::HTTP
 EAPI=5
 HOMEPAGE=http://docs.seattlerb.org/net-http-pipeline/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/net-http-pipeline-1.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_=fae03571d251cac3a40a90a2c9fe2d7b
diff --git a/metadata/md5-cache/dev-ruby/net-scp-1.1.2-r1 b/metadata/md5-cache/dev-ruby/net-scp-1.1.2-r1
index a80a48aaeef8..1d4278fb04cb 100644
--- a/metadata/md5-cache/dev-ruby/net-scp-1.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/net-scp-1.1.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby21] ) test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby22] ) test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( 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? ( doc? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby22] ) test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( 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=A pure Ruby implementation of the SCP client protocol
 EAPI=5
 HOMEPAGE=http://net-ssh.rubyforge.org/scp
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5[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/net-ssh-2.6.5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5[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=2
 SRC_URI=mirror://rubygems/net-scp-1.1.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_=4238183e6e2966cf091defd2b59bdace
diff --git a/metadata/md5-cache/dev-ruby/net-scp-1.2.1 b/metadata/md5-cache/dev-ruby/net-scp-1.2.1
index 8dc828a29b7d..a1593f742a43 100644
--- a/metadata/md5-cache/dev-ruby/net-scp-1.2.1
+++ b/metadata/md5-cache/dev-ruby/net-scp-1.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby21] ) test? ( >=dev-ruby/net-ssh-2.9.0:2.6[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby22] ) test? ( >=dev-ruby/net-ssh-2.9.0:2.6[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby23] ) test? ( >=dev-ruby/net-ssh-2.9.0:2.6[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5:2.6[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( 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? ( doc? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby22] ) test? ( >=dev-ruby/net-ssh-2.9.0:2.6[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby23] ) test? ( >=dev-ruby/net-ssh-2.9.0:2.6[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5:2.6[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( 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=A pure Ruby implementation of the SCP client protocol
 EAPI=5
 HOMEPAGE=https://github.com/net-ssh/net-scp
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5:2.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5:2.6[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/net-ssh-2.6.5:2.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5:2.6[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=2
 SRC_URI=mirror://rubygems/net-scp-1.2.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_=0cf8e5e579608ae89c1fa5e2226250a7
diff --git a/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2 b/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2
index e019ad3d946a..357ec432bb79 100644
--- a/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2
+++ b/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.13[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.13[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=SFTP in pure Ruby
 EAPI=5
 HOMEPAGE=https://github.com/net-ssh/net-sftp
-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 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5[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/net-ssh-2.6.5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5[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=2
 SRC_URI=mirror://rubygems/net-sftp-2.1.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_=00751fba48bf6444849fa37e85c890ba
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-2.10.0 b/metadata/md5-cache/dev-ruby/net-ssh-2.10.0
index 9bb1177cd3ac..4b87bc9209fd 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-2.10.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-2.10.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] >=dev-ruby/mocha-0.13[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( 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=test? ( ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( 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=Non-interactive SSH processing in pure Ruby
 EAPI=5
 HOMEPAGE=https://github.com/net-ssh/net-ssh
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[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? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[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=2.6
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v2.10.0.tar.gz -> net-ssh-git-2.10.0.tgz
 _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_=51be7af97b28904ff0ffe41e5335bfc3
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-3.2.0 b/metadata/md5-cache/dev-ruby/net-ssh-3.2.0
index 985574b7711d..80fe2ee30f04 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-3.2.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-3.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] >=dev-ruby/mocha-0.13[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( 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=test? ( ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( 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=Non-interactive SSH processing in pure Ruby
 EAPI=5
 HOMEPAGE=https://github.com/net-ssh/net-ssh
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[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? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[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=3
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v3.2.0.tar.gz -> net-ssh-git-3.2.0.tgz
 _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_=7574fc2895a53c22cf729861c675f84f
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-4.1.0 b/metadata/md5-cache/dev-ruby/net-ssh-4.1.0
index 2e27733fc8d9..7c6e2a9a2149 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-4.1.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-4.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v4.1.0.tar.gz -> net-ssh-git-4.1.0.tgz
 _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_=af8be1c1278fa2b2e5bd5b7404c0c912
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0-r1 b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0-r1
index acb046f4175c..196c021aabd1 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/test-unit:2[ruby_targets_ruby21] <dev-ruby/mocha-1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/test-unit:2[ruby_targets_ruby22] <dev-ruby/mocha-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/test-unit:2[ruby_targets_ruby23] <dev-ruby/mocha-1[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5[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/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? ( dev-ruby/test-unit:2[ruby_targets_ruby22] <dev-ruby/mocha-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/test-unit:2[ruby_targets_ruby23] <dev-ruby/mocha-1[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5[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/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=A simple library to assist in enabling tunneled Net::SSH connections
 EAPI=5
 HOMEPAGE=https://github.com/net-ssh/net-scp
-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 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5[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/net-ssh-2.6.5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5[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=2
 SRC_URI=mirror://rubygems/net-ssh-gateway-1.2.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_=c8cb77da2c6b87b74338a7fe61640a18
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.3.0 b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.3.0
index f72c6035ae09..ad4a191a6945 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.3.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/mocha:1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/mocha:1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/mocha:1.0[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5:*[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/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? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/mocha:1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/mocha:1.0[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5:*[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/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=A simple library to assist in enabling tunneled Net::SSH connections
 EAPI=5
 HOMEPAGE=https://github.com/net-ssh/net-ssh-gateway
-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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5:*[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/net-ssh-2.6.5:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.6.5:*[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=2
 SRC_URI=https://github.com/net-ssh/net-ssh-gateway/archive/1.3.0.tar.gz -> net-ssh-gateway-1.3.0.tar.gz
 _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_=6ec8c7afdb846aa5560ce6578d602916
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0 b/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0
index 44950e7137af..e6360c298195 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2.0
 SRC_URI=https://github.com/net-ssh/net-ssh-gateway/archive/2.0.0.tar.gz -> net-ssh-gateway-2.0.0.tar.gz
 _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_=b6e14d18f29b444e1ec8e0ce5d0a5ebb
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.1 b/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.1
index ea8f48e78f4d..b137ed4f4aac 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby21] >=dev-ruby/net-ssh-gateway-1.2.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby22] >=dev-ruby/net-ssh-gateway-1.2.0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby22] >=dev-ruby/net-ssh-gateway-1.2.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=A library for controlling multiple Net::SSH connections via a single interface
 EAPI=5
 HOMEPAGE=https://net-ssh.github.com/net-ssh-multi
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby21] >=dev-ruby/net-ssh-gateway-1.2.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby22] >=dev-ruby/net-ssh-gateway-1.2.0[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/net-ssh-2.6.5[ruby_targets_ruby22] >=dev-ruby/net-ssh-gateway-1.2.0[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=2
 SRC_URI=https://github.com/net-ssh/net-ssh-multi/archive/v1.2.1.tar.gz -> net-ssh-multi-1.2.1-git.tgz
 _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_=0df1b057ae50c8f45cd1b39b2616c398
diff --git a/metadata/md5-cache/dev-ruby/net-telnet-0.1.1-r1 b/metadata/md5-cache/dev-ruby/net-telnet-0.1.1-r1
index f1db6b93e155..57fc5c842840 100644
--- a/metadata/md5-cache/dev-ruby/net-telnet-0.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/net-telnet-0.1.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Provides telnet client functionality
 EAPI=5
 HOMEPAGE=https://github.com/ruby/net-telnet
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby-BSD BSD-2 )
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=https://github.com/ruby/net-telnet/archive/v0.1.1.tar.gz -> net-telnet-0.1.1.tar.gz
 _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_=8169b019763466ce16d427f0a14f522d
diff --git a/metadata/md5-cache/dev-ruby/netrc-0.11.0 b/metadata/md5-cache/dev-ruby/netrc-0.11.0
index 524eca16f613..6c640e328f5a 100644
--- a/metadata/md5-cache/dev-ruby/netrc-0.11.0
+++ b/metadata/md5-cache/dev-ruby/netrc-0.11.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/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? ( 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/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=This library reads and writes .netrc files
 EAPI=5
 HOMEPAGE=https://github.com/geemus/netrc
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
-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/netrc-0.11.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_=092fd606ce161b92dda6c6f669c43429
diff --git a/metadata/md5-cache/dev-ruby/network_interface-0.0.1-r1 b/metadata/md5-cache/dev-ruby/network_interface-0.0.1-r1
index 6cef688ea99c..73657b685245 100644
--- a/metadata/md5-cache/dev-ruby/network_interface-0.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/network_interface-0.0.1-r1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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=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=network_interface layer from metasploit pcaprub
 EAPI=5
 HOMEPAGE=https://github.com/rapid7/network_interface
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/network_interface-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_=53ecbc348ac561e8306e3a6bd9b3edec
diff --git a/metadata/md5-cache/dev-ruby/nexpose-5.3.1 b/metadata/md5-cache/dev-ruby/nexpose-5.3.1
index 7aa860d2c374..8f50d748ef1f 100644
--- a/metadata/md5-cache/dev-ruby/nexpose-5.3.1
+++ b/metadata/md5-cache/dev-ruby/nexpose-5.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) 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? ( 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=API client for Nexpose vulnerability managment product
 EAPI=5
 HOMEPAGE=https://github.com/rapid7/nexpose-client https://rubygems.org/gems/nexpose
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64
 LICENSE=BSD
-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/nexpose-5.3.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_=413df39e485860fc6a9cf0fa83ee44e0
diff --git a/metadata/md5-cache/dev-ruby/nexpose-5.3.2 b/metadata/md5-cache/dev-ruby/nexpose-5.3.2
index 2bd06ff69ccb..939c0c84fe91 100644
--- a/metadata/md5-cache/dev-ruby/nexpose-5.3.2
+++ b/metadata/md5-cache/dev-ruby/nexpose-5.3.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/vcr:2[ruby_targets_ruby21] dev-ruby/webmock:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/vcr:2[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/vcr:2[ruby_targets_ruby23] dev-ruby/webmock:0[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/vcr:2[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/vcr:2[ruby_targets_ruby23] dev-ruby/webmock:0[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=API client for Nexpose vulnerability managment product
 EAPI=5
 HOMEPAGE=https://github.com/rapid7/nexpose-client https://rubygems.org/gems/nexpose
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=BSD
-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=https://github.com/rapid7/nexpose-client/archive/v5.3.2.tar.gz -> nexpose-5.3.2.tar.gz
 _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_=7cc40cef015cf2103f34fe08ca7aa5d3
diff --git a/metadata/md5-cache/dev-ruby/niceogiri-1.1.2 b/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
index 36d8c3128448..5151445cecdb 100644
--- a/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
+++ b/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/nokogiri[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/nokogiri[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/nokogiri[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/nokogiri[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Some wrappers around and helpers for XML manipulation using Nokogiri
 EAPI=5
 HOMEPAGE=https://github.com/benlangfeld/Niceogiri
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/nokogiri[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/nokogiri[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/nokogiri[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/nokogiri[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/niceogiri-1.1.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_=c3fd84eda8ae651c480bc236a5a72207
diff --git a/metadata/md5-cache/dev-ruby/nio4r-1.2.1 b/metadata/md5-cache/dev-ruby/nio4r-1.2.1
index b9879cf41b5e..7225cf7e9634 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-1.2.1
+++ b/metadata/md5-cache/dev-ruby/nio4r-1.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A high performance selector API for monitoring IO objects
 EAPI=5
 HOMEPAGE=https://github.com/celluloid/nio4r
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/nio4r-1.2.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_=5b4496452b3defd7789373d03d75be45
diff --git a/metadata/md5-cache/dev-ruby/nio4r-1.2.1-r1 b/metadata/md5-cache/dev-ruby/nio4r-1.2.1-r1
index 1aabfe20c242..47302a439ba7 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-1.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/nio4r-1.2.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A high performance selector API for monitoring IO objects
 EAPI=5
 HOMEPAGE=https://github.com/celluloid/nio4r
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/nio4r-1.2.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_=cdd98b13de485a2fdab201b5883b9935
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.0.0 b/metadata/md5-cache/dev-ruby/nio4r-2.0.0
index a3a6b6e9e2f6..e4681100d366 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-2.0.0
+++ b/metadata/md5-cache/dev-ruby/nio4r-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/nio4r-2.0.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_=1c903db896402c86df60b6a266531886
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.1.0 b/metadata/md5-cache/dev-ruby/nio4r-2.1.0
index 5544ab99e6b6..8c1379795d04 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-2.1.0
+++ b/metadata/md5-cache/dev-ruby/nio4r-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/nio4r-2.1.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_=0664cb693f5c40aeb23b52ed03a0c0be
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.6.8.1 b/metadata/md5-cache/dev-ruby/nokogiri-1.6.8.1
index f859eae51dc4..e51e33eb6f3a 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.6.8.1
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.6.8.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/libxml2-2.9.2 dev-libs/libxslt virtual/libiconv ruby_targets_ruby21? ( dev-ruby/hoe[ruby_targets_ruby21] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby21] dev-ruby/rexical[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] dev-ruby/racc[ruby_targets_ruby21] test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/hoe[ruby_targets_ruby22] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby22] dev-ruby/rexical[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/hoe[ruby_targets_ruby23] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby23] dev-ruby/rexical[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] test? ( dev-ruby/minitest[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/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=>=dev-libs/libxml2-2.9.2 dev-libs/libxslt virtual/libiconv ruby_targets_ruby22? ( dev-ruby/hoe[ruby_targets_ruby22] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby22] dev-ruby/rexical[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/hoe[ruby_targets_ruby23] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby23] dev-ruby/rexical[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] test? ( dev-ruby/minitest[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/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=Nokogiri is an HTML, XML, SAX, and Reader parser
 EAPI=5
 HOMEPAGE=http://nokogiri.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv 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=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv 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=https://github.com/sparklemotion/nokogiri/archive/v1.6.8.1.tar.gz -> nokogiri-1.6.8.1-git.tgz
 _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_=8582c2f1b34a3352ea7711e9b9dec211
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.7.1 b/metadata/md5-cache/dev-ruby/nokogiri-1.7.1
index 2e1f902df273..2665bb33d7ff 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.7.1
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.7.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/libxml2-2.9.2 dev-libs/libxslt virtual/libiconv ruby_targets_ruby21? ( dev-ruby/hoe[ruby_targets_ruby21] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby21] dev-ruby/rexical[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] dev-ruby/racc[ruby_targets_ruby21] test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/hoe[ruby_targets_ruby22] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby22] dev-ruby/rexical[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/hoe[ruby_targets_ruby23] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby23] dev-ruby/rexical[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/hoe[ruby_targets_ruby24] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby24] dev-ruby/rexical[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=>=dev-libs/libxml2-2.9.2 dev-libs/libxslt virtual/libiconv ruby_targets_ruby22? ( dev-ruby/hoe[ruby_targets_ruby22] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby22] dev-ruby/rexical[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/hoe[ruby_targets_ruby23] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby23] dev-ruby/rexical[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/hoe[ruby_targets_ruby24] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby24] dev-ruby/rexical[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Nokogiri is an HTML, XML, SAX, and Reader parser
 EAPI=5
 HOMEPAGE=http://nokogiri.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.7.1.tar.gz -> nokogiri-1.7.1-git.tgz
 _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_=67428b476cd3fc0f0878999a717655ed
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.7.2 b/metadata/md5-cache/dev-ruby/nokogiri-1.7.2
index ab00b4f181d1..5061c68da66f 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.7.2
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.7.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/libxml2-2.9.2 dev-libs/libxslt virtual/libiconv ruby_targets_ruby21? ( dev-ruby/hoe[ruby_targets_ruby21] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby21] dev-ruby/rexical[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] dev-ruby/racc[ruby_targets_ruby21] test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/hoe[ruby_targets_ruby22] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby22] dev-ruby/rexical[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/hoe[ruby_targets_ruby23] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby23] dev-ruby/rexical[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/hoe[ruby_targets_ruby24] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby24] dev-ruby/rexical[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=>=dev-libs/libxml2-2.9.2 dev-libs/libxslt virtual/libiconv ruby_targets_ruby22? ( dev-ruby/hoe[ruby_targets_ruby22] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby22] dev-ruby/rexical[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/hoe[ruby_targets_ruby23] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby23] dev-ruby/rexical[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/hoe[ruby_targets_ruby24] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby24] dev-ruby/rexical[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Nokogiri is an HTML, XML, SAX, and Reader parser
 EAPI=6
 HOMEPAGE=http://nokogiri.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.7.2.tar.gz -> nokogiri-1.7.2-git.tgz
 _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_=2bdb4707705ff007a999669b9cf20567
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.8.0 b/metadata/md5-cache/dev-ruby/nokogiri-1.8.0
index 8cb8e9d8f94f..4ca9381d44bd 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.8.0
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.8.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/libxml2-2.9.2 dev-libs/libxslt virtual/libiconv ruby_targets_ruby21? ( dev-ruby/hoe[ruby_targets_ruby21] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby21] dev-ruby/rexical[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] dev-ruby/racc[ruby_targets_ruby21] test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/hoe[ruby_targets_ruby22] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby22] dev-ruby/rexical[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/hoe[ruby_targets_ruby23] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby23] dev-ruby/rexical[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/hoe[ruby_targets_ruby24] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby24] dev-ruby/rexical[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=>=dev-libs/libxml2-2.9.2 dev-libs/libxslt virtual/libiconv ruby_targets_ruby22? ( dev-ruby/hoe[ruby_targets_ruby22] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby22] dev-ruby/rexical[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/hoe[ruby_targets_ruby23] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby23] dev-ruby/rexical[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/hoe[ruby_targets_ruby24] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby24] dev-ruby/rexical[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Nokogiri is an HTML, XML, SAX, and Reader parser
 EAPI=6
 HOMEPAGE=http://nokogiri.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.8.0.tar.gz -> nokogiri-1.8.0-git.tgz
 _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_=812fe09e654851d93a220f871630214d
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2 b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
index 3845a97445b2..441d9b29ed74 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby21] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby22] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby23] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby24] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby22] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby23] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby24] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Calculate the differences between two XML/HTML documents
 EAPI=5
 HOMEPAGE=https://github.com/postmodern/nokogiri-diff
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby21] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby22] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby23] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby24] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby22] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby23] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby24] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/nokogiri-diff-0.2.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_=c0874134171e1d43649759156403454d
diff --git a/metadata/md5-cache/dev-ruby/nokogumbo-1.4.13 b/metadata/md5-cache/dev-ruby/nokogumbo-1.4.13
index f3208fc91e52..d3bc8d47102d 100644
--- a/metadata/md5-cache/dev-ruby/nokogumbo-1.4.13
+++ b/metadata/md5-cache/dev-ruby/nokogumbo-1.4.13
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Nokogiri interface to the Gumbo HTML5 parser
 EAPI=6
 HOMEPAGE=https://github.com/rubys/nokogumbo
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/gumbo-0.10 ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=dev-libs/gumbo-0.10 ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/nokogumbo-1.4.13.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_=0b2b4337aac3dbfa22c4bba75e915bac
diff --git a/metadata/md5-cache/dev-ruby/nokogumbo-1.4.7 b/metadata/md5-cache/dev-ruby/nokogumbo-1.4.7
index 9b7f704bfe21..fbfbcca8afda 100644
--- a/metadata/md5-cache/dev-ruby/nokogumbo-1.4.7
+++ b/metadata/md5-cache/dev-ruby/nokogumbo-1.4.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.5-r1[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? ( 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-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.5-r1[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? ( 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=A Nokogiri interface to the Gumbo HTML5 parser
 EAPI=5
 HOMEPAGE=https://github.com/rubys/nokogumbo
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/gumbo-0.10 ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.5-r1[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=>=dev-libs/gumbo-0.10 ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.5-r1[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/nokogumbo-1.4.7.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_=664836a2ef60cc9ac921df1cc8cc58b7
diff --git a/metadata/md5-cache/dev-ruby/nokogumbo-1.4.9 b/metadata/md5-cache/dev-ruby/nokogumbo-1.4.9
index b7ef1bdc2f73..4c829ba890a8 100644
--- a/metadata/md5-cache/dev-ruby/nokogumbo-1.4.9
+++ b/metadata/md5-cache/dev-ruby/nokogumbo-1.4.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.5-r1[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? ( 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-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.5-r1[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? ( 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=A Nokogiri interface to the Gumbo HTML5 parser
 EAPI=5
 HOMEPAGE=https://github.com/rubys/nokogumbo
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/gumbo-0.10 ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.5-r1[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=>=dev-libs/gumbo-0.10 ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.5-r1[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/nokogumbo-1.4.9.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_=664836a2ef60cc9ac921df1cc8cc58b7
diff --git a/metadata/md5-cache/dev-ruby/notify-0.5.2-r1 b/metadata/md5-cache/dev-ruby/notify-0.5.2-r1
index 392fbbf04da4..f2af80e644d2 100644
--- a/metadata/md5-cache/dev-ruby/notify-0.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/notify-0.5.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) 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? ( 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A function to notify on cross platform
 EAPI=5
 HOMEPAGE=https://github.com/jugyo/notify
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=x11-libs/libnotify 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=x11-libs/libnotify 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/notify-0.5.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_=9428cdb1e117e693c64080e3979e1c68
diff --git a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2 b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
index d32618c55c92..ad4ebef59be5 100644
--- a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby/NTLM HTTP provides NTLM authentication over http
 EAPI=5
 HOMEPAGE=http://www.mindflowsolutions.net/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ntlm-http-0.1.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_=a3afb7c6a903474477e9999ef3f0cc8d
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2 b/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2
index 0eaf9f3fd217..28815c1af91d 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2
+++ b/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/mocha:0.14[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] dev-ruby/rack[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/test-unit:2[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] dev-ruby/rack[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=A RubyGem for implementing both OAuth clients and servers
 EAPI=5
 HOMEPAGE=http://oauth.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/oauth-0.4.7.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_=473f9ba2651920df9515b88b3ac509c8
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.5.1 b/metadata/md5-cache/dev-ruby/oauth-0.5.1
index 75a3d74aa81c..e364ca109d1a 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.5.1
+++ b/metadata/md5-cache/dev-ruby/oauth-0.5.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/mocha:1.0[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/mocha:1.0[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/mocha:1.0[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] dev-ruby/rack[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/test-unit:2[ruby_targets_ruby22] dev-ruby/mocha:1.0[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/mocha:1.0[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] dev-ruby/rack[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=A RubyGem for implementing both OAuth clients and servers
 EAPI=5
 HOMEPAGE=https://github.com/oauth-xx/oauth-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~x86-macos
 LICENSE=MIT
-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=https://github.com/oauth-xx/oauth-ruby/archive/v0.5.1.tar.gz -> oauth-0.5.1.tar.gz
 _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_=4a77d3e82012b87b525bdf858df6c9e8
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.5.3 b/metadata/md5-cache/dev-ruby/oauth-0.5.3
index 76495a5748d3..90d2a01bc1eb 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.5.3
+++ b/metadata/md5-cache/dev-ruby/oauth-0.5.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/mocha:1.0[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] dev-ruby/actionpack:4.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/mocha:1.0[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/actionpack:4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/mocha:1.0[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/actionpack:4.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? ( 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/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/test-unit:2[ruby_targets_ruby22] dev-ruby/mocha:1.0[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/actionpack:4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/mocha:1.0[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/actionpack:4.2[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/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=A RubyGem for implementing both OAuth clients and servers
 EAPI=6
 HOMEPAGE=https://github.com/oauth-xx/oauth-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86-macos
 LICENSE=MIT
-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=https://github.com/oauth-xx/oauth-ruby/archive/v0.5.3.tar.gz -> oauth-0.5.3.tar.gz
 _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_=b38e038bf7eec92369e12417e35a56d2
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.2.0 b/metadata/md5-cache/dev-ruby/oauth2-1.2.0
index 2318e5a88637..d7e224e3c7ae 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.2.0
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby21] >=dev-ruby/jwt-1.0[ruby_targets_ruby21] =dev-ruby/jwt-1*[ruby_targets_ruby21] >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] =dev-ruby/multi_json-1*[ruby_targets_ruby21] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby21] >=dev-ruby/rack-1.2:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-2.5.0:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.5.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.5.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem
 EAPI=5
 HOMEPAGE=https://github.com/intridea/oauth2
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby21] >=dev-ruby/jwt-1.0[ruby_targets_ruby21] =dev-ruby/jwt-1*[ruby_targets_ruby21] >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] =dev-ruby/multi_json-1*[ruby_targets_ruby21] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby21] >=dev-ruby/rack-1.2:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[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/faraday-0.8[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[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=https://github.com/intridea/oauth2/archive/v1.2.0.tar.gz -> oauth2-1.2.0.tar.gz
 _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_=2ee443f3779b3352d2794b290be96b3c
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.2.0-r1 b/metadata/md5-cache/dev-ruby/oauth2-1.2.0-r1
index 46113101b776..555ceb1a1589 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.2.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby21] >=dev-ruby/jwt-1.0[ruby_targets_ruby21] =dev-ruby/jwt-1*[ruby_targets_ruby21] >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] =dev-ruby/multi_json-1*[ruby_targets_ruby21] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby21] >=dev-ruby/rack-1.2:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] >=dev-ruby/jwt-1.0[ruby_targets_ruby23] =dev-ruby/jwt-1*[ruby_targets_ruby23] >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-2.5.0:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.5.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-2.5.0: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? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] >=dev-ruby/jwt-1.0[ruby_targets_ruby23] =dev-ruby/jwt-1*[ruby_targets_ruby23] >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.5.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-2.5.0:2[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem
 EAPI=5
 HOMEPAGE=https://github.com/intridea/oauth2
-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 ~ppc64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby21] >=dev-ruby/jwt-1.0[ruby_targets_ruby21] =dev-ruby/jwt-1*[ruby_targets_ruby21] >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] =dev-ruby/multi_json-1*[ruby_targets_ruby21] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby21] >=dev-ruby/rack-1.2:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] >=dev-ruby/jwt-1.0[ruby_targets_ruby23] =dev-ruby/jwt-1*[ruby_targets_ruby23] >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[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/faraday-0.8[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] >=dev-ruby/jwt-1.0[ruby_targets_ruby23] =dev-ruby/jwt-1*[ruby_targets_ruby23] >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[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=https://github.com/intridea/oauth2/archive/v1.2.0.tar.gz -> oauth2-1.2.0.tar.gz
 _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_=080e79f514d972a567f1d92df1584f75
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.3.0 b/metadata/md5-cache/dev-ruby/oauth2-1.3.0
index f21d4e7d414e..bdef82ffb66c 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.3.0
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby21] >=dev-ruby/jwt-1.0[ruby_targets_ruby21] =dev-ruby/jwt-1*[ruby_targets_ruby21] >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] =dev-ruby/multi_json-1*[ruby_targets_ruby21] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby21] >=dev-ruby/rack-1.2:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] >=dev-ruby/jwt-1.0[ruby_targets_ruby23] =dev-ruby/jwt-1*[ruby_targets_ruby23] >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-2.5.0:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.5.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-2.5.0: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? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] >=dev-ruby/jwt-1.0[ruby_targets_ruby23] =dev-ruby/jwt-1*[ruby_targets_ruby23] >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.5.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-2.5.0:2[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem
 EAPI=5
 HOMEPAGE=https://github.com/intridea/oauth2
-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 ~ppc64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby21] >=dev-ruby/jwt-1.0[ruby_targets_ruby21] =dev-ruby/jwt-1*[ruby_targets_ruby21] >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] =dev-ruby/multi_json-1*[ruby_targets_ruby21] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby21] >=dev-ruby/rack-1.2:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] >=dev-ruby/jwt-1.0[ruby_targets_ruby23] =dev-ruby/jwt-1*[ruby_targets_ruby23] >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[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/faraday-0.8[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] >=dev-ruby/jwt-1.0[ruby_targets_ruby23] =dev-ruby/jwt-1*[ruby_targets_ruby23] >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[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=https://github.com/intridea/oauth2/archive/v1.3.0.tar.gz -> oauth2-1.3.0.tar.gz
 _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_=080e79f514d972a567f1d92df1584f75
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.3.1 b/metadata/md5-cache/dev-ruby/oauth2-1.3.1
index 8e10bba2b8cc..33a6deafe5e6 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.3.1
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby21] >=dev-ruby/jwt-1.0[ruby_targets_ruby21] =dev-ruby/jwt-1*[ruby_targets_ruby21] >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] =dev-ruby/multi_json-1*[ruby_targets_ruby21] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby21] >=dev-ruby/rack-1.2:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] >=dev-ruby/jwt-1.0[ruby_targets_ruby23] =dev-ruby/jwt-1*[ruby_targets_ruby23] >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-2.5.0:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.5.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-2.5.0: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? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] >=dev-ruby/jwt-1.0[ruby_targets_ruby23] =dev-ruby/jwt-1*[ruby_targets_ruby23] >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-2.5.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-2.5.0:2[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem
 EAPI=5
 HOMEPAGE=https://github.com/intridea/oauth2
-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 ~ppc64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby21] >=dev-ruby/jwt-1.0[ruby_targets_ruby21] =dev-ruby/jwt-1*[ruby_targets_ruby21] >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] =dev-ruby/multi_json-1*[ruby_targets_ruby21] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby21] >=dev-ruby/rack-1.2:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] >=dev-ruby/jwt-1.0[ruby_targets_ruby23] =dev-ruby/jwt-1*[ruby_targets_ruby23] >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[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/faraday-0.8[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] >=dev-ruby/jwt-1.0[ruby_targets_ruby23] =dev-ruby/jwt-1*[ruby_targets_ruby23] >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[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=https://github.com/intridea/oauth2/archive/v1.3.1.tar.gz -> oauth2-1.3.1.tar.gz
 _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_=6aba53939873c96b9e6315b0761365a6
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.4.0 b/metadata/md5-cache/dev-ruby/oauth2-1.4.0
index 87d7a4fe3d19..93f51407d830 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.4.0
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby21] <dev-ruby/faraday-0.13[ruby_targets_ruby21] >=dev-ruby/jwt-1.0[ruby_targets_ruby21] =dev-ruby/jwt-1*[ruby_targets_ruby21] >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] =dev-ruby/multi_json-1*[ruby_targets_ruby21] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby21] >=dev-ruby/rack-1.2:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby22] <dev-ruby/faraday-0.13[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] <dev-ruby/faraday-0.13[ruby_targets_ruby23] >=dev-ruby/jwt-1.0[ruby_targets_ruby23] =dev-ruby/jwt-1*[ruby_targets_ruby23] >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[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? ( 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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby22] <dev-ruby/faraday-0.13[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] <dev-ruby/faraday-0.13[ruby_targets_ruby23] >=dev-ruby/jwt-1.0[ruby_targets_ruby23] =dev-ruby/jwt-1*[ruby_targets_ruby23] >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem
 EAPI=5
 HOMEPAGE=https://github.com/intridea/oauth2
-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 ~ppc64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby21] <dev-ruby/faraday-0.13[ruby_targets_ruby21] >=dev-ruby/jwt-1.0[ruby_targets_ruby21] =dev-ruby/jwt-1*[ruby_targets_ruby21] >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] =dev-ruby/multi_json-1*[ruby_targets_ruby21] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby21] >=dev-ruby/rack-1.2:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby22] <dev-ruby/faraday-0.13[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] <dev-ruby/faraday-0.13[ruby_targets_ruby23] >=dev-ruby/jwt-1.0[ruby_targets_ruby23] =dev-ruby/jwt-1*[ruby_targets_ruby23] >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[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/faraday-0.8[ruby_targets_ruby22] <dev-ruby/faraday-0.13[ruby_targets_ruby22] >=dev-ruby/jwt-1.0[ruby_targets_ruby22] =dev-ruby/jwt-1*[ruby_targets_ruby22] >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby22] >=dev-ruby/rack-1.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby23] <dev-ruby/faraday-0.13[ruby_targets_ruby23] >=dev-ruby/jwt-1.0[ruby_targets_ruby23] =dev-ruby/jwt-1*[ruby_targets_ruby23] >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] =dev-ruby/multi_json-1*[ruby_targets_ruby23] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby23] >=dev-ruby/rack-1.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[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=https://github.com/intridea/oauth2/archive/v1.4.0.tar.gz -> oauth2-1.4.0.tar.gz
 _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_=070c76a7bed7f25eebb4fa38b2a1a6d3
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.4.1 b/metadata/md5-cache/dev-ruby/octokit-4.4.1
index 7f02497a523c..29f01428ba16 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.4.1
+++ b/metadata/md5-cache/dev-ruby/octokit-4.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sawyer-0.5.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sawyer-0.5.3[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mime-types[ruby_targets_ruby21] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby21] dev-ruby/vcr:2[ruby_targets_ruby21] >=dev-ruby/webmock-1.9:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mime-types[ruby_targets_ruby22] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby22] dev-ruby/vcr:2[ruby_targets_ruby22] >=dev-ruby/webmock-1.9:0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( >=dev-ruby/sawyer-0.5.3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mime-types[ruby_targets_ruby22] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby22] dev-ruby/vcr:2[ruby_targets_ruby22] >=dev-ruby/webmock-1.9:0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Ruby toolkit for the Github API
 EAPI=5
 HOMEPAGE=https://github.com/octokit/octokit.rb
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sawyer-0.5.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sawyer-0.5.3[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/sawyer-0.5.3[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=https://github.com/octokit/octokit.rb/archive/v4.4.1.tar.gz -> octokit-4.4.1.tar.gz
 _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_=dcfa00d707ad2a41ae7ecaf0e1eeaaf0
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.6.2 b/metadata/md5-cache/dev-ruby/octokit-4.6.2
index 9ef60a8a52f6..3b2b7fd34827 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.6.2
+++ b/metadata/md5-cache/dev-ruby/octokit-4.6.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sawyer-0.8.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sawyer-0.8.0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mime-types[ruby_targets_ruby21] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby21] dev-ruby/vcr:2[ruby_targets_ruby21] >=dev-ruby/webmock-1.9:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mime-types[ruby_targets_ruby22] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby22] dev-ruby/vcr:2[ruby_targets_ruby22] >=dev-ruby/webmock-1.9:0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( >=dev-ruby/sawyer-0.8.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mime-types[ruby_targets_ruby22] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby22] dev-ruby/vcr:2[ruby_targets_ruby22] >=dev-ruby/webmock-1.9:0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Ruby toolkit for the Github API
 EAPI=5
 HOMEPAGE=https://github.com/octokit/octokit.rb
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sawyer-0.8.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sawyer-0.8.0[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/sawyer-0.8.0[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=https://github.com/octokit/octokit.rb/archive/v4.6.2.tar.gz -> octokit-4.6.2.tar.gz
 _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_=6caaa478bf2b95e568cd5b9cf1c5faad
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.7.0 b/metadata/md5-cache/dev-ruby/octokit-4.7.0
index 186dcdaf0b63..79714790654b 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.7.0
+++ b/metadata/md5-cache/dev-ruby/octokit-4.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sawyer-0.8.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sawyer-0.8.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sawyer-0.8.0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mime-types[ruby_targets_ruby21] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby21] dev-ruby/vcr:2[ruby_targets_ruby21] >=dev-ruby/webmock-1.9:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mime-types[ruby_targets_ruby22] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby22] dev-ruby/vcr:2[ruby_targets_ruby22] >=dev-ruby/webmock-1.9:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mime-types[ruby_targets_ruby23] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby23] dev-ruby/vcr:2[ruby_targets_ruby23] >=dev-ruby/webmock-1.9:0[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/sawyer-0.8.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sawyer-0.8.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mime-types[ruby_targets_ruby22] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby22] dev-ruby/vcr:2[ruby_targets_ruby22] >=dev-ruby/webmock-1.9:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mime-types[ruby_targets_ruby23] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby23] dev-ruby/vcr:2[ruby_targets_ruby23] >=dev-ruby/webmock-1.9:0[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=Ruby toolkit for the Github API
 EAPI=6
 HOMEPAGE=https://github.com/octokit/octokit.rb
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sawyer-0.8.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sawyer-0.8.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sawyer-0.8.0[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/sawyer-0.8.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sawyer-0.8.0[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=https://github.com/octokit/octokit.rb/archive/v4.7.0.tar.gz -> octokit-4.7.0.tar.gz
 _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_=d3783c2a9dd8fcf085d6a0d3c2acc499
diff --git a/metadata/md5-cache/dev-ruby/omniauth-1.3.1 b/metadata/md5-cache/dev-ruby/omniauth-1.3.1
index f35fdda2f73e..e6c5a54fdf4f 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-1.3.1
+++ b/metadata/md5-cache/dev-ruby/omniauth-1.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby21] <dev-ruby/hashie-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] <dev-ruby/hashie-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] <dev-ruby/hashie-4:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) test? ( dev-ruby/rack-test[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/rack-test[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-ruby/rack:*[ruby_targets_ruby22] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] <dev-ruby/hashie-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] <dev-ruby/hashie-4:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/rack-test[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=A generalized Rack framework for multiple-provider authentication
 EAPI=5
 HOMEPAGE=https://github.com/intridea/omniauth
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby21] <dev-ruby/hashie-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] <dev-ruby/hashie-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] <dev-ruby/hashie-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/rack:*[ruby_targets_ruby22] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] <dev-ruby/hashie-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] <dev-ruby/hashie-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=https://github.com/intridea/omniauth/archive/v1.3.1.tar.gz -> omniauth-1.3.1.tar.gz
 _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_=ae35e42be6bc048a96ef01aa9d81f993
diff --git a/metadata/md5-cache/dev-ruby/omniauth-1.3.2 b/metadata/md5-cache/dev-ruby/omniauth-1.3.2
index f06bf2acd9c9..49eb37cf4347 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-1.3.2
+++ b/metadata/md5-cache/dev-ruby/omniauth-1.3.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby21] <dev-ruby/hashie-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] <dev-ruby/hashie-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] <dev-ruby/hashie-4:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) test? ( dev-ruby/rack-test[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/rack-test[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-ruby/rack-1.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] <dev-ruby/hashie-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] <dev-ruby/hashie-4:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/rack-test[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=A generalized Rack framework for multiple-provider authentication
 EAPI=5
 HOMEPAGE=https://github.com/intridea/omniauth
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby21] <dev-ruby/hashie-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] <dev-ruby/hashie-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] <dev-ruby/hashie-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/rack-1.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] <dev-ruby/hashie-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] <dev-ruby/hashie-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=https://github.com/intridea/omniauth/archive/v1.3.2.tar.gz -> omniauth-1.3.2.tar.gz
 _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_=8afa93739458a7df1b96d78e2077263a
diff --git a/metadata/md5-cache/dev-ruby/omniauth-1.4.0 b/metadata/md5-cache/dev-ruby/omniauth-1.4.0
index 05918022269c..f3105328b2aa 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-1.4.0
+++ b/metadata/md5-cache/dev-ruby/omniauth-1.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby21] <dev-ruby/hashie-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] <dev-ruby/hashie-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] <dev-ruby/hashie-4:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) test? ( dev-ruby/rack-test[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/rack-test[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] <dev-ruby/hashie-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] <dev-ruby/hashie-4:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/rack-test[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: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=A generalized Rack framework for multiple-provider authentication
 EAPI=5
 HOMEPAGE=https://github.com/intridea/omniauth
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby21] <dev-ruby/hashie-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] <dev-ruby/hashie-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] <dev-ruby/hashie-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/rack-1.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby22] <dev-ruby/hashie-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/hashie-1.2:*[ruby_targets_ruby23] <dev-ruby/hashie-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=https://github.com/intridea/omniauth/archive/v1.4.0.tar.gz -> omniauth-1.4.0.tar.gz
 _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_=78a907ea2608379d987cfde8cf2ad9a7
diff --git a/metadata/md5-cache/dev-ruby/omniauth-1.6.0 b/metadata/md5-cache/dev-ruby/omniauth-1.6.0
index 2829b3728aa1..2cfbf16d6546 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-1.6.0
+++ b/metadata/md5-cache/dev-ruby/omniauth-1.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) test? ( dev-ruby/rack-test[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/rack-test[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/rack-test[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: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=A generalized Rack framework for multiple-provider authentication
 EAPI=5
 HOMEPAGE=https://github.com/intridea/omniauth
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/hashie-3.4.6:3[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/rack-1.6.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/hashie-3.4.6:3[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=https://github.com/intridea/omniauth/archive/v1.6.0.tar.gz -> omniauth-1.6.0.tar.gz
 _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_=22c0074bff5f5257786174dfd5f351d9
diff --git a/metadata/md5-cache/dev-ruby/omniauth-1.6.1 b/metadata/md5-cache/dev-ruby/omniauth-1.6.1
index 059044158183..52c6f93920a1 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-1.6.1
+++ b/metadata/md5-cache/dev-ruby/omniauth-1.6.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby21] <dev-ruby/hashie-3.6.0:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby22] <dev-ruby/hashie-3.6.0:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby23] <dev-ruby/hashie-3.6.0:3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) test? ( dev-ruby/rack-test[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/rack-test[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby22] <dev-ruby/hashie-3.6.0:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby23] <dev-ruby/hashie-3.6.0:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/rack-test[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: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=A generalized Rack framework for multiple-provider authentication
 EAPI=5
 HOMEPAGE=https://github.com/intridea/omniauth
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby21] <dev-ruby/hashie-3.6.0:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby22] <dev-ruby/hashie-3.6.0:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby23] <dev-ruby/hashie-3.6.0:3[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/rack-1.6.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby22] <dev-ruby/hashie-3.6.0:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby23] <dev-ruby/hashie-3.6.0:3[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=https://github.com/intridea/omniauth/archive/v1.6.1.tar.gz -> omniauth-1.6.1.tar.gz
 _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_=3e4d356a3ddb451221d19f43a3b6e9be
diff --git a/metadata/md5-cache/dev-ruby/open4-1.3.4 b/metadata/md5-cache/dev-ruby/open4-1.3.4
index 55616519b2cf..42dbbacd214d 100644
--- a/metadata/md5-cache/dev-ruby/open4-1.3.4
+++ b/metadata/md5-cache/dev-ruby/open4-1.3.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Open3::popen3 with exit status
 EAPI=5
 HOMEPAGE=https://github.com/ahoward/open4
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/open4-1.3.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_=3b0017613a9cd87adfaa540dc0c5be6e
diff --git a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.1 b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.1
index 1abfa3a601fc..ee22dafe1aed 100644
--- a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.1
+++ b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/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? ( 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/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=OpenSSL CBC-MAC (CCM) ruby gem
 EAPI=5
 HOMEPAGE=https://github.com/SmallLars/openssl-ccm
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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=1.2.1
 SRC_URI=mirror://rubygems/openssl-ccm-1.2.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_=22c5751ebb492b85beb10f9c5ff56987
diff --git a/metadata/md5-cache/dev-ruby/openvas-omp-0.0.4 b/metadata/md5-cache/dev-ruby/openvas-omp-0.0.4
index 98196eaf6409..ea0536ac9f60 100644
--- a/metadata/md5-cache/dev-ruby/openvas-omp-0.0.4
+++ b/metadata/md5-cache/dev-ruby/openvas-omp-0.0.4
@@ -1,17 +1,17 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Communicate with OpenVAS manager through OMP
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/openvas-omp
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 PDEPEND=net-analyzer/openvas
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/openvas-omp-0.0.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_=3feae5328e96dfa780e54141dae94290
diff --git a/metadata/md5-cache/dev-ruby/optionable-0.2.0 b/metadata/md5-cache/dev-ruby/optionable-0.2.0
index 2125afb88c1a..e4c758e21de6 100644
--- a/metadata/md5-cache/dev-ruby/optionable-0.2.0
+++ b/metadata/md5-cache/dev-ruby/optionable-0.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Robust options validation for Ruby methods
 EAPI=5
 HOMEPAGE=https://github.com/durran/optionable
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/optionable-0.2.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_=a63f38d3b2a6823d88b384145e5ab73d
diff --git a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12 b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
index 697fc2449d94..b9cbfaa264b6 100644
--- a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
+++ b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/rubypants-0.2*:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rubypants-0.2*:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rubypants-0.2*:0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/tilt[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/tilt[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/tilt[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-ruby/rubypants-0.2*:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rubypants-0.2*:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/tilt[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/tilt[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=Ruby routines for parsing org-mode files
 EAPI=5
 HOMEPAGE=https://github.com/wallyqs/org-ruby
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rubypants-0.2*:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rubypants-0.2*:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rubypants-0.2*:0[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/rubypants-0.2*:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rubypants-0.2*:0[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=https://github.com/wallyqs/org-ruby/archive/version-0.9.12.tar.gz -> org-ruby-0.9.12.tar.gz
 _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_=f97fc7ee59b3c4e00dd2bb1fee3f5093
diff --git a/metadata/md5-cache/dev-ruby/origin-2.2.2 b/metadata/md5-cache/dev-ruby/origin-2.2.2
index 8c9595643367..e845e8cb314e 100644
--- a/metadata/md5-cache/dev-ruby/origin-2.2.2
+++ b/metadata/md5-cache/dev-ruby/origin-2.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( =dev-ruby/activesupport-4*[ruby_targets_ruby21] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby21] dev-ruby/tzinfo[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( =dev-ruby/activesupport-4*[ruby_targets_ruby22] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby22] dev-ruby/tzinfo[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( =dev-ruby/activesupport-4*[ruby_targets_ruby23] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby23] dev-ruby/tzinfo[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: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/activesupport-4*[ruby_targets_ruby22] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby22] dev-ruby/tzinfo[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( =dev-ruby/activesupport-4*[ruby_targets_ruby23] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby23] dev-ruby/tzinfo[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: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=Origin is a simple DSL for generating MongoDB selectors and options
 EAPI=5
 HOMEPAGE=http://mongoid.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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=https://github.com/mongoid/origin/archive/v2.2.2.tar.gz -> origin-2.2.2.tar.gz
 _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_=4f768027e7d8beb1b3c7c2f7e4d01f15
diff --git a/metadata/md5-cache/dev-ruby/origin-2.3.0 b/metadata/md5-cache/dev-ruby/origin-2.3.0
index 5f2646b726e5..e908fa08dd1d 100644
--- a/metadata/md5-cache/dev-ruby/origin-2.3.0
+++ b/metadata/md5-cache/dev-ruby/origin-2.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( =dev-ruby/activesupport-4*[ruby_targets_ruby21] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby21] dev-ruby/tzinfo[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( =dev-ruby/activesupport-4*[ruby_targets_ruby22] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby22] dev-ruby/tzinfo[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( =dev-ruby/activesupport-4*[ruby_targets_ruby23] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby23] dev-ruby/tzinfo[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: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/activesupport-4*[ruby_targets_ruby22] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby22] dev-ruby/tzinfo[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( =dev-ruby/activesupport-4*[ruby_targets_ruby23] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby23] dev-ruby/tzinfo[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: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=Origin is a simple DSL for generating MongoDB selectors and options
 EAPI=5
 HOMEPAGE=http://mongoid.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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=https://github.com/mongoid/origin/archive/v2.3.0.tar.gz -> origin-2.3.0.tar.gz
 _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_=4f768027e7d8beb1b3c7c2f7e4d01f15
diff --git a/metadata/md5-cache/dev-ruby/origin-2.3.1 b/metadata/md5-cache/dev-ruby/origin-2.3.1
index 3f2bd5a3d7a7..016af119c50b 100644
--- a/metadata/md5-cache/dev-ruby/origin-2.3.1
+++ b/metadata/md5-cache/dev-ruby/origin-2.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( =dev-ruby/activesupport-4*[ruby_targets_ruby21] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby21] dev-ruby/tzinfo[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( =dev-ruby/activesupport-4*[ruby_targets_ruby22] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby22] dev-ruby/tzinfo[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( =dev-ruby/activesupport-4*[ruby_targets_ruby23] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby23] dev-ruby/tzinfo[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: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/activesupport-4*[ruby_targets_ruby22] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby22] dev-ruby/tzinfo[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( =dev-ruby/activesupport-4*[ruby_targets_ruby23] >=dev-ruby/i18n-0.6:0.6[ruby_targets_ruby23] dev-ruby/tzinfo[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: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=Origin is a simple DSL for generating MongoDB selectors and options
 EAPI=6
 HOMEPAGE=http://mongoid.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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=https://github.com/mongoid/origin/archive/v2.3.1.tar.gz -> origin-2.3.1.tar.gz
 _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_=69621f358f4ad31643d578f91bc67f09
diff --git a/metadata/md5-cache/dev-ruby/ox-2.4.11 b/metadata/md5-cache/dev-ruby/ox-2.4.11
index 687591ad0e53..716d99b77b9c 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.4.11
+++ b/metadata/md5-cache/dev-ruby/ox-2.4.11
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A fast XML parser and Object marshaller
 EAPI=5
 HOMEPAGE=http://www.ohler.com/ox/ https://github.com/ohler55/ox
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.4.11.tar.gz -> ox-2.4.11.tar.gz
 _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_=b8cf680dff74bf1017e05c984e0774e9
diff --git a/metadata/md5-cache/dev-ruby/ox-2.4.13 b/metadata/md5-cache/dev-ruby/ox-2.4.13
index e5f1855821f2..45c958d46e28 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.4.13
+++ b/metadata/md5-cache/dev-ruby/ox-2.4.13
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A fast XML parser and Object marshaller
 EAPI=6
 HOMEPAGE=http://www.ohler.com/ox/ https://github.com/ohler55/ox
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.4.13.tar.gz -> ox-2.4.13.tar.gz
 _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_=bc51b9cd273d846550aaa3b7a315be6c
diff --git a/metadata/md5-cache/dev-ruby/ox-2.5.0 b/metadata/md5-cache/dev-ruby/ox-2.5.0
index fc0bffa2b755..da5a553262c8 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.5.0
+++ b/metadata/md5-cache/dev-ruby/ox-2.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A fast XML parser and Object marshaller
 EAPI=6
 HOMEPAGE=http://www.ohler.com/ox/ https://github.com/ohler55/ox
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.5.0.tar.gz -> ox-2.5.0.tar.gz
 _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_=bc51b9cd273d846550aaa3b7a315be6c
diff --git a/metadata/md5-cache/dev-ruby/ox-2.6.0 b/metadata/md5-cache/dev-ruby/ox-2.6.0
index 4f56399f99c0..35a625d6f6e3 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.6.0
+++ b/metadata/md5-cache/dev-ruby/ox-2.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A fast XML parser and Object marshaller
 EAPI=6
 HOMEPAGE=http://www.ohler.com/ox/ https://github.com/ohler55/ox
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.6.0.tar.gz -> ox-2.6.0.tar.gz
 _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_=bc51b9cd273d846550aaa3b7a315be6c
diff --git a/metadata/md5-cache/dev-ruby/packetfu-1.1.11-r1 b/metadata/md5-cache/dev-ruby/packetfu-1.1.11-r1
index 97f6c06fbe0a..2f9d32f6388b 100644
--- a/metadata/md5-cache/dev-ruby/packetfu-1.1.11-r1
+++ b/metadata/md5-cache/dev-ruby/packetfu-1.1.11-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/network_interface:0[ruby_targets_ruby21] dev-ruby/pcaprub:0.12[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/network_interface:0[ruby_targets_ruby22] dev-ruby/pcaprub:0.12[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby21] ) dev-ruby/bundler[ruby_targets_ruby21] ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby22] ) dev-ruby/bundler[ruby_targets_ruby22] ) !dev-ruby/packetfu:0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( dev-ruby/network_interface:0[ruby_targets_ruby22] dev-ruby/pcaprub:0.12[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby22] ) dev-ruby/bundler[ruby_targets_ruby22] ) !dev-ruby/packetfu:0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A mid-level packet manipulation library
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/packetfu
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/network_interface:0[ruby_targets_ruby21] dev-ruby/pcaprub:0.12[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/network_interface:0[ruby_targets_ruby22] dev-ruby/pcaprub:0.12[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/network_interface:0[ruby_targets_ruby22] dev-ruby/pcaprub:0.12[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=1.1.11
 SRC_URI=mirror://rubygems/packetfu-1.1.11.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_=129bf54bba2baff7d7a639af63f82341
diff --git a/metadata/md5-cache/dev-ruby/packetfu-1.1.13 b/metadata/md5-cache/dev-ruby/packetfu-1.1.13
index e87441e1c8b9..633b3f225e3f 100644
--- a/metadata/md5-cache/dev-ruby/packetfu-1.1.13
+++ b/metadata/md5-cache/dev-ruby/packetfu-1.1.13
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/network_interface:0[ruby_targets_ruby21] dev-ruby/pcaprub:0.12[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/network_interface:0[ruby_targets_ruby22] dev-ruby/pcaprub:0.12[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/network_interface:0[ruby_targets_ruby23] dev-ruby/pcaprub:0.12[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby21] ) dev-ruby/bundler[ruby_targets_ruby21] ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby22] ) dev-ruby/bundler[ruby_targets_ruby22] ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby23] ) dev-ruby/bundler[ruby_targets_ruby23] ) !dev-ruby/packetfu:0 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=test? ( ruby_targets_ruby22? ( dev-ruby/network_interface:0[ruby_targets_ruby22] dev-ruby/pcaprub:0.12[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/network_interface:0[ruby_targets_ruby23] dev-ruby/pcaprub:0.12[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby22] ) dev-ruby/bundler[ruby_targets_ruby22] ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby23] ) dev-ruby/bundler[ruby_targets_ruby23] ) !dev-ruby/packetfu:0 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=A mid-level packet manipulation library
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/packetfu
-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 ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/network_interface:0[ruby_targets_ruby21] dev-ruby/pcaprub:0.12[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/network_interface:0[ruby_targets_ruby22] dev-ruby/pcaprub:0.12[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/network_interface:0[ruby_targets_ruby23] dev-ruby/pcaprub:0.12[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/network_interface:0[ruby_targets_ruby22] dev-ruby/pcaprub:0.12[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/network_interface:0[ruby_targets_ruby23] dev-ruby/pcaprub:0.12[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=1.1.13
 SRC_URI=mirror://rubygems/packetfu-1.1.13.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_=82c587d75782e6872dca5f79228c233a
diff --git a/metadata/md5-cache/dev-ruby/paint-1.0.1 b/metadata/md5-cache/dev-ruby/paint-1.0.1
index 5e7c48fb145e..595f3aebb9fa 100644
--- a/metadata/md5-cache/dev-ruby/paint-1.0.1
+++ b/metadata/md5-cache/dev-ruby/paint-1.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Terminal painter
 EAPI=5
 HOMEPAGE=https://github.com/janlelis/paint
-IUSE=test doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test doc elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/janlelis/paint/archive/v1.0.1.tar.gz -> paint-1.0.1.tar.gz
 _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_=d9470a487fab33b65d55deb9ab273ec1
diff --git a/metadata/md5-cache/dev-ruby/paint-2.0.0 b/metadata/md5-cache/dev-ruby/paint-2.0.0
index deecbf437e72..2f8824d5d069 100644
--- a/metadata/md5-cache/dev-ruby/paint-2.0.0
+++ b/metadata/md5-cache/dev-ruby/paint-2.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Terminal painter
 EAPI=5
 HOMEPAGE=https://github.com/janlelis/paint
-IUSE=test doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/janlelis/paint/archive/v2.0.0.tar.gz -> paint-2.0.0.tar.gz
 _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_=196288783b89fb8a322a9bbd1f5b2ea5
diff --git a/metadata/md5-cache/dev-ruby/parallel-1.11.2 b/metadata/md5-cache/dev-ruby/parallel-1.11.2
index eca40a1dd052..8747a575c0fc 100644
--- a/metadata/md5-cache/dev-ruby/parallel-1.11.2
+++ b/metadata/md5-cache/dev-ruby/parallel-1.11.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-process/lsof ) ruby_targets_ruby21? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby21] dev-ruby/activerecord:4.2[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] dev-ruby/sqlite3[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=test? ( sys-process/lsof ) ruby_targets_ruby22? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] dev-ruby/sqlite3[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=Run any code in parallel Processes or Threads
 EAPI=5
 HOMEPAGE=https://github.com/grosser/parallel
-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
 LICENSE=MIT
-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=1
 SRC_URI=https://github.com/grosser/parallel/archive/v1.11.2.tar.gz -> parallel-1.11.2.tar.gz
 _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_=6e8846154fe4a983c986eec4a587f231
diff --git a/metadata/md5-cache/dev-ruby/parallel-1.12.0 b/metadata/md5-cache/dev-ruby/parallel-1.12.0
index 9f7c52f03459..a25384e826b9 100644
--- a/metadata/md5-cache/dev-ruby/parallel-1.12.0
+++ b/metadata/md5-cache/dev-ruby/parallel-1.12.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-process/lsof ) ruby_targets_ruby21? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby21] dev-ruby/activerecord:4.2[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] dev-ruby/sqlite3[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=test? ( sys-process/lsof ) ruby_targets_ruby22? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] dev-ruby/sqlite3[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=Run any code in parallel Processes or Threads
 EAPI=6
 HOMEPAGE=https://github.com/grosser/parallel
-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
 LICENSE=MIT
-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=1
 SRC_URI=https://github.com/grosser/parallel/archive/v1.12.0.tar.gz -> parallel-1.12.0.tar.gz
 _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_=a6c6deca2af22783ecb28a4ebc7db649
diff --git a/metadata/md5-cache/dev-ruby/parser-2.3.3.0 b/metadata/md5-cache/dev-ruby/parser-2.3.3.0
index 4b25aa81b7fa..25f2d13887b3 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.3.3.0
+++ b/metadata/md5-cache/dev-ruby/parser-2.3.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/racc[ruby_targets_ruby21] dev-ruby/cliver[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] dev-ruby/cliver[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] dev-ruby/cliver[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ast-2.2:0[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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/minitest:5[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] dev-ruby/cliver[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] dev-ruby/cliver[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ast-2.2:0[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=A production-ready Ruby parser written in pure Ruby
 EAPI=5
 HOMEPAGE=https://github.com/whitequark/parser
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ast-2.2:0[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/ast-2.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ast-2.2:0[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/parser-2.3.3.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_=194570a5445e2e0430364d8f29f21628
diff --git a/metadata/md5-cache/dev-ruby/parser-2.3.3.1 b/metadata/md5-cache/dev-ruby/parser-2.3.3.1
index 15e1806daead..43f7c904ecfc 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.3.3.1
+++ b/metadata/md5-cache/dev-ruby/parser-2.3.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/racc[ruby_targets_ruby21] dev-ruby/cliver[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] dev-ruby/cliver[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] dev-ruby/cliver[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ast-2.2:0[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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/minitest:5[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] dev-ruby/cliver[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] dev-ruby/cliver[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ast-2.2:0[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=A production-ready Ruby parser written in pure Ruby
 EAPI=5
 HOMEPAGE=https://github.com/whitequark/parser
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ast-2.2:0[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/ast-2.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ast-2.2:0[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/parser-2.3.3.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_=194570a5445e2e0430364d8f29f21628
diff --git a/metadata/md5-cache/dev-ruby/parser-2.4.0.0 b/metadata/md5-cache/dev-ruby/parser-2.4.0.0
index f8a06fd3c3d1..fb9a2df76826 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.4.0.0
+++ b/metadata/md5-cache/dev-ruby/parser-2.4.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/racc[ruby_targets_ruby21] dev-ruby/cliver[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] dev-ruby/cliver[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] dev-ruby/cliver[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] dev-ruby/cliver[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] dev-ruby/cliver[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] dev-ruby/cliver[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] dev-ruby/cliver[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A production-ready Ruby parser written in pure Ruby
 EAPI=5
 HOMEPAGE=https://github.com/whitequark/parser
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/parser-2.4.0.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_=d957574e717209a7b87ed50c0725ac02
diff --git a/metadata/md5-cache/dev-ruby/parslet-1.7.1 b/metadata/md5-cache/dev-ruby/parslet-1.7.1
index 015d21654e23..2b1b041ebc62 100644
--- a/metadata/md5-cache/dev-ruby/parslet-1.7.1
+++ b/metadata/md5-cache/dev-ruby/parslet-1.7.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/blankslate-2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/blankslate-2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/blankslate-2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/flexmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/flexmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/flexmock[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/blankslate-2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/blankslate-2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/flexmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/flexmock[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=A small PEG based parser library
 EAPI=5
 HOMEPAGE=https://github.com/kschiess/parslet
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/blankslate-2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/blankslate-2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/blankslate-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/blankslate-2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/blankslate-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=https://github.com/kschiess/parslet/archive/1.7.1.tar.gz -> parslet-1.7.1.tar.gz
 _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_=c216745721fc7d7e3c2432ae1377359e
diff --git a/metadata/md5-cache/dev-ruby/parslet-1.8.0 b/metadata/md5-cache/dev-ruby/parslet-1.8.0
index aff075212d23..ee9a1b33c1d6 100644
--- a/metadata/md5-cache/dev-ruby/parslet-1.8.0
+++ b/metadata/md5-cache/dev-ruby/parslet-1.8.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/ae[ruby_targets_ruby21] dev-ruby/flexmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/ae[ruby_targets_ruby22] dev-ruby/flexmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ae[ruby_targets_ruby23] dev-ruby/flexmock[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/ae[ruby_targets_ruby22] dev-ruby/flexmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ae[ruby_targets_ruby23] dev-ruby/flexmock[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=A small PEG based parser library
 EAPI=5
 HOMEPAGE=https://github.com/kschiess/parslet
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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=https://github.com/kschiess/parslet/archive/1.8.0.tar.gz -> parslet-1.8.0.tar.gz
 _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_=5159ab04c4eb4b326743a268dffe2062
diff --git a/metadata/md5-cache/dev-ruby/patch_finder-1.0.2 b/metadata/md5-cache/dev-ruby/patch_finder-1.0.2
index 038f07c2a541..181055bf798f 100644
--- a/metadata/md5-cache/dev-ruby/patch_finder-1.0.2
+++ b/metadata/md5-cache/dev-ruby/patch_finder-1.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) 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? ( 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Generic Patch Finder
 EAPI=6
 HOMEPAGE=https://github.com/wchen-r7/patch-finder
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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/patch_finder-1.0.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_=6f5ea28a47e74d5f385994aac5316010
diff --git a/metadata/md5-cache/dev-ruby/path_expander-1.0.1 b/metadata/md5-cache/dev-ruby/path_expander-1.0.1
index e4e5c8c3f24e..39ea7f84c534 100644
--- a/metadata/md5-cache/dev-ruby/path_expander-1.0.1
+++ b/metadata/md5-cache/dev-ruby/path_expander-1.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Helps pre-process command-line arguments expanding directories into their constituent files.
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/path_expander
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/path_expander-1.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_=63d2dffcf4f22dd3a60b747e16271149
diff --git a/metadata/md5-cache/dev-ruby/path_expander-1.0.2 b/metadata/md5-cache/dev-ruby/path_expander-1.0.2
index 39948a2761e8..b7b363778bf2 100644
--- a/metadata/md5-cache/dev-ruby/path_expander-1.0.2
+++ b/metadata/md5-cache/dev-ruby/path_expander-1.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Pre-process CLI arguments expanding directories into their constituent files
 EAPI=6
 HOMEPAGE=https://github.com/seattlerb/path_expander
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/path_expander-1.0.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_=e03172f0b9183e8e815b42ec0813025f
diff --git a/metadata/md5-cache/dev-ruby/pathutil-0.14.0 b/metadata/md5-cache/dev-ruby/pathutil-0.14.0
index 910d14ff9b91..8410a6e39ffb 100644
--- a/metadata/md5-cache/dev-ruby/pathutil-0.14.0
+++ b/metadata/md5-cache/dev-ruby/pathutil-0.14.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby21] <dev-ruby/forwardable-extended-3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby22] <dev-ruby/forwardable-extended-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby23] <dev-ruby/forwardable-extended-3[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] ) 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-ruby/forwardable-extended-2.6[ruby_targets_ruby22] <dev-ruby/forwardable-extended-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby23] <dev-ruby/forwardable-extended-3[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Like Pathname but a little less insane
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/pathutil https://github.com/envygeeks/pathutils
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby21] <dev-ruby/forwardable-extended-3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby22] <dev-ruby/forwardable-extended-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby23] <dev-ruby/forwardable-extended-3[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/forwardable-extended-2.6[ruby_targets_ruby22] <dev-ruby/forwardable-extended-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby23] <dev-ruby/forwardable-extended-3[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/pathutil-0.14.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_=b04862c31e32bb0c95df17c27a3a901c
diff --git a/metadata/md5-cache/dev-ruby/pathutil-0.14.0-r1 b/metadata/md5-cache/dev-ruby/pathutil-0.14.0-r1
index f9e10712541b..1d1609e022d3 100644
--- a/metadata/md5-cache/dev-ruby/pathutil-0.14.0-r1
+++ b/metadata/md5-cache/dev-ruby/pathutil-0.14.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby21] <dev-ruby/forwardable-extended-3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby22] <dev-ruby/forwardable-extended-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby23] <dev-ruby/forwardable-extended-3[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby22] <dev-ruby/forwardable-extended-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby23] <dev-ruby/forwardable-extended-3[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=Like Pathname but a little less insane
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/pathutil https://github.com/envygeeks/pathutils
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby21] <dev-ruby/forwardable-extended-3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby22] <dev-ruby/forwardable-extended-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby23] <dev-ruby/forwardable-extended-3[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/forwardable-extended-2.6[ruby_targets_ruby22] <dev-ruby/forwardable-extended-3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby23] <dev-ruby/forwardable-extended-3[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=https://github.com/envygeeks/pathutil/archive/v0.14.0.tar.gz -> pathutil-0.14.0.tar.gz
 _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_=f3bec89ff0371db50ba83bcea02013cb
diff --git a/metadata/md5-cache/dev-ruby/patron-0.4.18-r2 b/metadata/md5-cache/dev-ruby/patron-0.4.18-r2
index 4c8aafa49c58..44a4866d1465 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.4.18-r2
+++ b/metadata/md5-cache/dev-ruby/patron-0.4.18-r2
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-misc/curl ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=net-misc/curl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=Patron is a Ruby HTTP client library based on libcurl
 EAPI=5
 HOMEPAGE=https://toland.github.com/patron/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=net-misc/curl 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=net-misc/curl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/patron-0.4.18.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_=de5d6f09605518e5c37001ea71d2c0a7
diff --git a/metadata/md5-cache/dev-ruby/patron-0.5.0-r1 b/metadata/md5-cache/dev-ruby/patron-0.5.0-r1
index 2785be194fe5..d409b22a05c4 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/patron-0.5.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-misc/curl ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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=net-misc/curl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Patron is a Ruby HTTP client library based on libcurl
 EAPI=5
 HOMEPAGE=https://toland.github.com/patron/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=net-misc/curl 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=net-misc/curl 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/patron-0.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_=41cfc2bf7c74788358d5f8471b72982c
diff --git a/metadata/md5-cache/dev-ruby/patron-0.8.0 b/metadata/md5-cache/dev-ruby/patron-0.8.0
index ce5a74c76bbf..8c09d0c2700d 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.8.0
+++ b/metadata/md5-cache/dev-ruby/patron-0.8.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-misc/curl 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=net-misc/curl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Patron is a Ruby HTTP client library based on libcurl
 EAPI=5
 HOMEPAGE=https://toland.github.com/patron/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=net-misc/curl 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=net-misc/curl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/patron-0.8.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_=8e62d3e2b3381adb5a2d82e34c041074
diff --git a/metadata/md5-cache/dev-ruby/patron-0.9.1 b/metadata/md5-cache/dev-ruby/patron-0.9.1
index e22883728938..35ea07b39abb 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.9.1
+++ b/metadata/md5-cache/dev-ruby/patron-0.9.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-misc/curl 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=net-misc/curl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Patron is a Ruby HTTP client library based on libcurl
 EAPI=6
 HOMEPAGE=https://toland.github.com/patron/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=net-misc/curl 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=net-misc/curl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/patron-0.9.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_=6c06046f762b9e44d634a17a16ad399f
diff --git a/metadata/md5-cache/dev-ruby/pcaprub-0.11.3-r2 b/metadata/md5-cache/dev-ruby/pcaprub-0.11.3-r2
index 34ea9277be39..860bfb4baa68 100644
--- a/metadata/md5-cache/dev-ruby/pcaprub-0.11.3-r2
+++ b/metadata/md5-cache/dev-ruby/pcaprub-0.11.3-r2
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-libs/libpcap ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=net-libs/libpcap ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Libpcap bindings for ruby compat
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/pcaprub
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1
-RDEPEND=net-libs/libpcap 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=net-libs/libpcap ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0.11
 SRC_URI=mirror://rubygems/pcaprub-0.11.3.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_=c965de986d863a327cfec1412ad8197d
diff --git a/metadata/md5-cache/dev-ruby/pcaprub-0.12.1 b/metadata/md5-cache/dev-ruby/pcaprub-0.12.1
index f6eb7453eae8..73856530acf1 100644
--- a/metadata/md5-cache/dev-ruby/pcaprub-0.12.1
+++ b/metadata/md5-cache/dev-ruby/pcaprub-0.12.1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-libs/libpcap 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/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=net-libs/libpcap 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/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=Libpcap bindings for ruby compat
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/pcaprub
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1
-RDEPEND=net-libs/libpcap 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=net-libs/libpcap 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=0.12
 SRC_URI=mirror://rubygems/pcaprub-0.12.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_=ab25b48d8f0a568ef2bfa1f92d9e1438
diff --git a/metadata/md5-cache/dev-ruby/pcaprub-0.12.4 b/metadata/md5-cache/dev-ruby/pcaprub-0.12.4
index 86f9007302d8..1514f1a36607 100644
--- a/metadata/md5-cache/dev-ruby/pcaprub-0.12.4
+++ b/metadata/md5-cache/dev-ruby/pcaprub-0.12.4
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-libs/libpcap 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/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=net-libs/libpcap 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/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=Libpcap bindings for ruby compat
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/pcaprub
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1
-RDEPEND=net-libs/libpcap 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=net-libs/libpcap 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=0.12
 SRC_URI=mirror://rubygems/pcaprub-0.12.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_=ab25b48d8f0a568ef2bfa1f92d9e1438
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.6.1 b/metadata/md5-cache/dev-ruby/pdf-core-0.6.1
index e80be518fa66..daa673740397 100644
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.6.1
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.6.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( =dev-ruby/pdf-inspector-1.1*[ruby_targets_ruby21] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby21] =dev-ruby/pdf-reader-1*[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( =dev-ruby/pdf-inspector-1.1*[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] =dev-ruby/pdf-reader-1*[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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/pdf-inspector-1.1*[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] =dev-ruby/pdf-reader-1*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Implements low level PDF features for Prawn
 EAPI=5
 HOMEPAGE=https://github.com/prawnpdf/pdf-core/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Ruby GPL-2 GPL-3 )
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/pdf-core-0.6.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_=ef755f34f0b4e8ad01f96a5aab40594b
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.6.1-r1 b/metadata/md5-cache/dev-ruby/pdf-core-0.6.1-r1
index 6998b930823d..59b96a2153c6 100644
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.6.1-r1
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.6.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( =dev-ruby/pdf-inspector-1*[ruby_targets_ruby21] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby21] =dev-ruby/pdf-reader-1*[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( =dev-ruby/pdf-inspector-1*[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] =dev-ruby/pdf-reader-1*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( =dev-ruby/pdf-inspector-1*[ruby_targets_ruby23] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby23] =dev-ruby/pdf-reader-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? ( 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/pdf-inspector-1*[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] =dev-ruby/pdf-reader-1*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( =dev-ruby/pdf-inspector-1*[ruby_targets_ruby23] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby23] =dev-ruby/pdf-reader-1*[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=Implements low level PDF features for Prawn
 EAPI=5
 HOMEPAGE=https://github.com/prawnpdf/pdf-core/
-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=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( Ruby GPL-2 GPL-3 )
-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/pdf-core-0.6.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_=7143a3821a919b152f860ea4ec1be58b
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.7.0 b/metadata/md5-cache/dev-ruby/pdf-core-0.7.0
index faaacd0a8290..e90b7bffabdd 100644
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.7.0
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( =dev-ruby/pdf-inspector-1*[ruby_targets_ruby21] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby21] =dev-ruby/pdf-reader-1*[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( =dev-ruby/pdf-inspector-1*[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] =dev-ruby/pdf-reader-1*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( =dev-ruby/pdf-inspector-1*[ruby_targets_ruby23] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby23] =dev-ruby/pdf-reader-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? ( 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/pdf-inspector-1*[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] =dev-ruby/pdf-reader-1*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( =dev-ruby/pdf-inspector-1*[ruby_targets_ruby23] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby23] =dev-ruby/pdf-reader-1*[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=Implements low level PDF features for Prawn
 EAPI=5
 HOMEPAGE=https://github.com/prawnpdf/pdf-core/
-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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( Ruby GPL-2 GPL-3 )
-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=https://github.com/prawnpdf/pdf-core/archive/0.7.0.tar.gz -> pdf-core-0.7.0.tar.gz
 _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_=ca9c403b41d677d1d67d1016fdaa004a
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0-r1 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0-r1
index 1761358019ab..48a54bfa9cb0 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0[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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A tool for analyzing PDF output
 EAPI=5
 HOMEPAGE=https://github.com/prawnpdf/pdf-inspector
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Ruby GPL-2 GPL-3 )
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0[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/pdf-reader-1.0[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/pdf-inspector-1.1.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_=1cda05f0496d1d8eac1786384ffa97ce
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.0 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.0
index fcb3f5f9a434..68e74af4fcf5 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.0
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0[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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A tool for analyzing PDF output
 EAPI=5
 HOMEPAGE=https://github.com/prawnpdf/pdf-inspector
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Ruby GPL-2 GPL-3 )
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0[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/pdf-reader-1.0[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/pdf-inspector-1.2.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_=0f1e874dfef6fb83757bb2ea4da59ecb
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1
index 3e65a6b83980..ea4dbfc5db58 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0[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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A tool for analyzing PDF output
 EAPI=5
 HOMEPAGE=https://github.com/prawnpdf/pdf-inspector
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Ruby GPL-2 GPL-3 )
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0[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/pdf-reader-1.0[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/pdf-inspector-1.2.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_=7a77eaf67922491d5cba90252fed1414
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1-r1 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1-r1
index 9f1cbd331499..56c5ca6eaa1f 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/pdf-reader-1.0[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] ) 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-ruby/pdf-reader-1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/pdf-reader-1.0[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A tool for analyzing PDF output
 EAPI=5
 HOMEPAGE=https://github.com/prawnpdf/pdf-inspector
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( Ruby GPL-2 GPL-3 )
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/pdf-reader-1.0[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/pdf-reader-1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/pdf-reader-1.0[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/pdf-inspector-1.2.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_=0b4a82d022cc791a603b74f4051d6308
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0
index 153066c3c7d0..8b46a2b96a55 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/pdf-reader-1.0:*[ruby_targets_ruby21] <dev-ruby/pdf-reader-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0:*[ruby_targets_ruby22] <dev-ruby/pdf-reader-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/pdf-reader-1.0:*[ruby_targets_ruby23] <dev-ruby/pdf-reader-3:*[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? ( 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-ruby/pdf-reader-1.0:*[ruby_targets_ruby22] <dev-ruby/pdf-reader-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/pdf-reader-1.0:*[ruby_targets_ruby23] <dev-ruby/pdf-reader-3:*[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? ( 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=A tool for analyzing PDF output
 EAPI=6
 HOMEPAGE=https://github.com/prawnpdf/pdf-inspector
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( Ruby GPL-2 GPL-3 )
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/pdf-reader-1.0:*[ruby_targets_ruby21] <dev-ruby/pdf-reader-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pdf-reader-1.0:*[ruby_targets_ruby22] <dev-ruby/pdf-reader-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/pdf-reader-1.0:*[ruby_targets_ruby23] <dev-ruby/pdf-reader-3:*[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/pdf-reader-1.0:*[ruby_targets_ruby22] <dev-ruby/pdf-reader-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/pdf-reader-1.0:*[ruby_targets_ruby23] <dev-ruby/pdf-reader-3:*[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/pdf-inspector-1.3.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_=979325be71a30d7e57bb80395167dd2c
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1 b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1
index 78871003e5f2..74586e8deec8 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby21] =dev-ruby/ascii85-1*[ruby_targets_ruby21] =dev-ruby/hashery-2*[ruby_targets_ruby21] dev-ruby/ttfunk:*[ruby_targets_ruby21] dev-ruby/ruby-rc4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby22] =dev-ruby/ascii85-1*[ruby_targets_ruby22] =dev-ruby/hashery-2*[ruby_targets_ruby22] dev-ruby/ttfunk:*[ruby_targets_ruby22] dev-ruby/ruby-rc4[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby22] =dev-ruby/ascii85-1*[ruby_targets_ruby22] =dev-ruby/hashery-2*[ruby_targets_ruby22] dev-ruby/ttfunk:*[ruby_targets_ruby22] dev-ruby/ruby-rc4[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=PDF parser conforming as much as possible to the PDF specification from Adobe
 EAPI=5
 HOMEPAGE=https://github.com/yob/pdf-reader/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby21] =dev-ruby/ascii85-1*[ruby_targets_ruby21] =dev-ruby/hashery-2*[ruby_targets_ruby21] dev-ruby/ttfunk:*[ruby_targets_ruby21] dev-ruby/ruby-rc4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby22] =dev-ruby/ascii85-1*[ruby_targets_ruby22] =dev-ruby/hashery-2*[ruby_targets_ruby22] dev-ruby/ttfunk:*[ruby_targets_ruby22] dev-ruby/ruby-rc4[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/afm-0.2.1[ruby_targets_ruby22] =dev-ruby/ascii85-1*[ruby_targets_ruby22] =dev-ruby/hashery-2*[ruby_targets_ruby22] dev-ruby/ttfunk:*[ruby_targets_ruby22] dev-ruby/ruby-rc4[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=https://github.com/yob/pdf-reader/archive/v1.4.1.tar.gz -> pdf-reader-1.4.1.tar.gz
 _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_=8941d7f2bf0f2e6a1c0722043717a5f2
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r1 b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r1
index 1e17f3d63d03..c4b5637e5eb9 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby21] =dev-ruby/ascii85-1*[ruby_targets_ruby21] =dev-ruby/hashery-2*[ruby_targets_ruby21] dev-ruby/ttfunk:*[ruby_targets_ruby21] dev-ruby/ruby-rc4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby22] =dev-ruby/ascii85-1*[ruby_targets_ruby22] =dev-ruby/hashery-2*[ruby_targets_ruby22] dev-ruby/ttfunk:*[ruby_targets_ruby22] dev-ruby/ruby-rc4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby23] =dev-ruby/ascii85-1*[ruby_targets_ruby23] =dev-ruby/hashery-2*[ruby_targets_ruby23] dev-ruby/ttfunk:*[ruby_targets_ruby23] dev-ruby/ruby-rc4[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby22] =dev-ruby/ascii85-1*[ruby_targets_ruby22] =dev-ruby/hashery-2*[ruby_targets_ruby22] dev-ruby/ttfunk:*[ruby_targets_ruby22] dev-ruby/ruby-rc4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby23] =dev-ruby/ascii85-1*[ruby_targets_ruby23] =dev-ruby/hashery-2*[ruby_targets_ruby23] dev-ruby/ttfunk:*[ruby_targets_ruby23] dev-ruby/ruby-rc4[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=PDF parser conforming as much as possible to the PDF specification from Adobe
 EAPI=5
 HOMEPAGE=https://github.com/yob/pdf-reader/
-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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby21] =dev-ruby/ascii85-1*[ruby_targets_ruby21] =dev-ruby/hashery-2*[ruby_targets_ruby21] dev-ruby/ttfunk:*[ruby_targets_ruby21] dev-ruby/ruby-rc4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby22] =dev-ruby/ascii85-1*[ruby_targets_ruby22] =dev-ruby/hashery-2*[ruby_targets_ruby22] dev-ruby/ttfunk:*[ruby_targets_ruby22] dev-ruby/ruby-rc4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby23] =dev-ruby/ascii85-1*[ruby_targets_ruby23] =dev-ruby/hashery-2*[ruby_targets_ruby23] dev-ruby/ttfunk:*[ruby_targets_ruby23] dev-ruby/ruby-rc4[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/afm-0.2.1[ruby_targets_ruby22] =dev-ruby/ascii85-1*[ruby_targets_ruby22] =dev-ruby/hashery-2*[ruby_targets_ruby22] dev-ruby/ttfunk:*[ruby_targets_ruby22] dev-ruby/ruby-rc4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby23] =dev-ruby/ascii85-1*[ruby_targets_ruby23] =dev-ruby/hashery-2*[ruby_targets_ruby23] dev-ruby/ttfunk:*[ruby_targets_ruby23] dev-ruby/ruby-rc4[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=https://github.com/yob/pdf-reader/archive/v1.4.1.tar.gz -> pdf-reader-1.4.1.tar.gz
 _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_=a9228ec4a496691a8a123235f33e6ee1
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-2.0.0 b/metadata/md5-cache/dev-ruby/pdf-reader-2.0.0
index 4fae5bc0af44..54c7bcd2396d 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-2.0.0
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-2.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby21] =dev-ruby/ascii85-1*[ruby_targets_ruby21] =dev-ruby/hashery-2*[ruby_targets_ruby21] dev-ruby/ttfunk:*[ruby_targets_ruby21] dev-ruby/ruby-rc4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby22] =dev-ruby/ascii85-1*[ruby_targets_ruby22] =dev-ruby/hashery-2*[ruby_targets_ruby22] dev-ruby/ttfunk:*[ruby_targets_ruby22] dev-ruby/ruby-rc4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby23] =dev-ruby/ascii85-1*[ruby_targets_ruby23] =dev-ruby/hashery-2*[ruby_targets_ruby23] dev-ruby/ttfunk:*[ruby_targets_ruby23] dev-ruby/ruby-rc4[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby22] =dev-ruby/ascii85-1*[ruby_targets_ruby22] =dev-ruby/hashery-2*[ruby_targets_ruby22] dev-ruby/ttfunk:*[ruby_targets_ruby22] dev-ruby/ruby-rc4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby23] =dev-ruby/ascii85-1*[ruby_targets_ruby23] =dev-ruby/hashery-2*[ruby_targets_ruby23] dev-ruby/ttfunk:*[ruby_targets_ruby23] dev-ruby/ruby-rc4[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=PDF parser conforming as much as possible to the PDF specification from Adobe
 EAPI=5
 HOMEPAGE=https://github.com/yob/pdf-reader/
-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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby21] =dev-ruby/ascii85-1*[ruby_targets_ruby21] =dev-ruby/hashery-2*[ruby_targets_ruby21] dev-ruby/ttfunk:*[ruby_targets_ruby21] dev-ruby/ruby-rc4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby22] =dev-ruby/ascii85-1*[ruby_targets_ruby22] =dev-ruby/hashery-2*[ruby_targets_ruby22] dev-ruby/ttfunk:*[ruby_targets_ruby22] dev-ruby/ruby-rc4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby23] =dev-ruby/ascii85-1*[ruby_targets_ruby23] =dev-ruby/hashery-2*[ruby_targets_ruby23] dev-ruby/ttfunk:*[ruby_targets_ruby23] dev-ruby/ruby-rc4[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/afm-0.2.1[ruby_targets_ruby22] =dev-ruby/ascii85-1*[ruby_targets_ruby22] =dev-ruby/hashery-2*[ruby_targets_ruby22] dev-ruby/ttfunk:*[ruby_targets_ruby22] dev-ruby/ruby-rc4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby23] =dev-ruby/ascii85-1*[ruby_targets_ruby23] =dev-ruby/hashery-2*[ruby_targets_ruby23] dev-ruby/ttfunk:*[ruby_targets_ruby23] dev-ruby/ruby-rc4[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=2
 SRC_URI=https://github.com/yob/pdf-reader/archive/v2.0.0.tar.gz -> pdf-reader-2.0.0.tar.gz
 _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_=3a6fc1605d4d64fcb555ed79598fd5ae
diff --git a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1 b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
index 49bf37e42441..ffe9f34a4e47 100644
--- a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
+++ b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Library performing operations with permutations of sequences (strings, arrays)
 EAPI=5
 HOMEPAGE=https://flori.github.com/permutation
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=|| ( Ruby-BSD BSD-2 )
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/permutation-0.1.8.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_=7d353d640205f14ac4cffa861c4f3c42
diff --git a/metadata/md5-cache/dev-ruby/pg-0.17.1-r1 b/metadata/md5-cache/dev-ruby/pg-0.17.1-r1
index 18a20e556de3..a5532d9e458d 100644
--- a/metadata/md5-cache/dev-ruby/pg-0.17.1-r1
+++ b/metadata/md5-cache/dev-ruby/pg-0.17.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-db/postgresql test? ( dev-db/postgresql[server,threads] ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] ) ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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_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=dev-db/postgresql test? ( dev-db/postgresql[server,threads] ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Ruby extension library providing an API to PostgreSQL
 EAPI=5
 HOMEPAGE=https://bitbucket.org/ged/ruby-pg/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=dev-db/postgresql:* 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=dev-db/postgresql:* 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/pg-0.17.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_=4b21b79ff5f07170f22a55339741af41
diff --git a/metadata/md5-cache/dev-ruby/pg-0.18.4 b/metadata/md5-cache/dev-ruby/pg-0.18.4
index 130d80503823..43ee698a303a 100644
--- a/metadata/md5-cache/dev-ruby/pg-0.18.4
+++ b/metadata/md5-cache/dev-ruby/pg-0.18.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-db/postgresql test? ( >=dev-db/postgresql-9.4[server,threads] ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] ) ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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=dev-db/postgresql test? ( >=dev-db/postgresql-9.4[server,threads] ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Ruby extension library providing an API to PostgreSQL
 EAPI=5
 HOMEPAGE=https://bitbucket.org/ged/ruby-pg/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=dev-db/postgresql:* 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=dev-db/postgresql:* 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/pg-0.18.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_=70bce4a59914500480f9a7c5c8979346
diff --git a/metadata/md5-cache/dev-ruby/pg-0.18.4-r1 b/metadata/md5-cache/dev-ruby/pg-0.18.4-r1
index 92297d0ff196..1fdaaf520c27 100644
--- a/metadata/md5-cache/dev-ruby/pg-0.18.4-r1
+++ b/metadata/md5-cache/dev-ruby/pg-0.18.4-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-db/postgresql test? ( >=dev-db/postgresql-9.4[server,threads] ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] ) ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/hoe[ruby_targets_ruby23] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby23] dev-ruby/rdoc[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=dev-db/postgresql test? ( >=dev-db/postgresql-9.4[server,threads] ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/hoe[ruby_targets_ruby23] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby23] dev-ruby/rdoc[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=Ruby extension library providing an API to PostgreSQL
 EAPI=5
 HOMEPAGE=https://bitbucket.org/ged/ruby-pg/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=dev-db/postgresql:* 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=dev-db/postgresql:* 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/pg-0.18.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_=bf6c2be33c38ae99acc5668b11ad5327
diff --git a/metadata/md5-cache/dev-ruby/pg-0.21.0 b/metadata/md5-cache/dev-ruby/pg-0.21.0
index b8c96a3c09f3..c3f1ce77a72d 100644
--- a/metadata/md5-cache/dev-ruby/pg-0.21.0
+++ b/metadata/md5-cache/dev-ruby/pg-0.21.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-db/postgresql test? ( >=dev-db/postgresql-9.4[server,threads] ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=dev-db/postgresql test? ( >=dev-db/postgresql-9.4[server,threads] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby extension library providing an API to PostgreSQL
 EAPI=6
 HOMEPAGE=https://bitbucket.org/ged/ruby-pg/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=dev-db/postgresql:* 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=dev-db/postgresql:* ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/pg-0.21.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_=529bde5d103cf9c599ced086f1682f7e
diff --git a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r1 b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r1
index 7e2ba9ff9c8a..869fa749fc86 100644
--- a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r1
+++ b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/bundler[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/bundler[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( dev-ruby/bundler[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Simple library to parse PostgreSQL arrays into a array of strings
 EAPI=5
 HOMEPAGE=https://github.com/dockyard/pg_array_parser
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0.0.9
 SRC_URI=mirror://rubygems/pg_array_parser-0.0.9.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_=ddbf420f7374fd9d8d5ae9acda356f25
diff --git a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2 b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2
index ddc2586e0989..fe1ac67ddaa9 100644
--- a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2
+++ b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/bundler[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/bundler[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/bundler[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? ( dev-ruby/bundler[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/bundler[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=Simple library to parse PostgreSQL arrays into a array of strings
 EAPI=5
 HOMEPAGE=https://github.com/dockyard/pg_array_parser
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm
 LICENSE=MIT
-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.0.9
 SRC_URI=mirror://rubygems/pg_array_parser-0.0.9.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_=f9117e3ca5f3d72d212e5869d38c1542
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.1.7 b/metadata/md5-cache/dev-ruby/pkg-config-1.1.7
index 6d1ba3c4b92b..af24eb606dad 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.1.7
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.1.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) test? ( x11-libs/cairo ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) test? ( x11-libs/cairo ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A pkg-config implementation by Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rcairo/pkg-config
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=|| ( LGPL-2 LGPL-2.1 LGPL-3 )
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/pkg-config-1.1.7.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_=77f46ccbf3aba3421f9b520286ce3d35
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.2.3 b/metadata/md5-cache/dev-ruby/pkg-config-1.2.3
index 00ee9f721c89..51c95404f72f 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.2.3
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.2.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) test? ( x11-libs/cairo ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) test? ( x11-libs/cairo ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A pkg-config implementation by Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rcairo/pkg-config
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( LGPL-2 LGPL-2.1 LGPL-3 )
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/pkg-config-1.2.3.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_=e0f624c1ac70c6c78dc67c931fd53a70
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.2.4 b/metadata/md5-cache/dev-ruby/pkg-config-1.2.4
index e8aff494721e..a7270430e1a8 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.2.4
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.2.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) test? ( x11-libs/cairo ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) test? ( x11-libs/cairo ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A pkg-config implementation by Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rcairo/pkg-config
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( LGPL-2 LGPL-2.1 LGPL-3 )
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/pkg-config-1.2.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_=e0f624c1ac70c6c78dc67c931fd53a70
diff --git a/metadata/md5-cache/dev-ruby/plist-3.2.0 b/metadata/md5-cache/dev-ruby/plist-3.2.0
index 7b0814af3fb2..5933156f6e2b 100644
--- a/metadata/md5-cache/dev-ruby/plist-3.2.0
+++ b/metadata/md5-cache/dev-ruby/plist-3.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A library to manipulate Property List files, also known as plists
 EAPI=5
 HOMEPAGE=http://plist.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
-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/plist-3.2.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_=24de9005038baf329a8ceb77d4455f17
diff --git a/metadata/md5-cache/dev-ruby/plist-3.3.0 b/metadata/md5-cache/dev-ruby/plist-3.3.0
index 849b0c4a89f2..475453ea0621 100644
--- a/metadata/md5-cache/dev-ruby/plist-3.3.0
+++ b/metadata/md5-cache/dev-ruby/plist-3.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A library to manipulate Property List files, also known as plists
 EAPI=6
 HOMEPAGE=https://github.com/patsplat/plist
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/patsplat/plist/archive/v3.3.0.tar.gz -> plist-3.3.0.tar.gz
 _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_=9db69d5d67ab6c6bb1c1dac55b05dfdc
diff --git a/metadata/md5-cache/dev-ruby/pluggaloid-1.0.2 b/metadata/md5-cache/dev-ruby/pluggaloid-1.0.2
index ff10357be165..769bca91e88e 100644
--- a/metadata/md5-cache/dev-ruby/pluggaloid-1.0.2
+++ b/metadata/md5-cache/dev-ruby/pluggaloid-1.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/delayer[ruby_targets_ruby21] dev-ruby/instance_storage:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/delayer[ruby_targets_ruby22] dev-ruby/instance_storage:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/delayer[ruby_targets_ruby23] dev-ruby/instance_storage:0[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=test? ( ruby_targets_ruby22? ( dev-ruby/delayer[ruby_targets_ruby22] dev-ruby/instance_storage:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/delayer[ruby_targets_ruby23] dev-ruby/instance_storage:0[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=Pluggaloid is extensible plugin system for mikutter
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/pluggaloid/
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/delayer[ruby_targets_ruby21] dev-ruby/instance_storage:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/delayer[ruby_targets_ruby22] dev-ruby/instance_storage:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/delayer[ruby_targets_ruby23] dev-ruby/instance_storage:0[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/delayer[ruby_targets_ruby22] dev-ruby/instance_storage:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/delayer[ruby_targets_ruby23] dev-ruby/instance_storage:0[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/pluggaloid-1.0.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_=2a1cf65b43586814ec99fdd577c3dd68
diff --git a/metadata/md5-cache/dev-ruby/pluggaloid-1.1.1 b/metadata/md5-cache/dev-ruby/pluggaloid-1.1.1
index 78282612950a..312ea3e05c27 100644
--- a/metadata/md5-cache/dev-ruby/pluggaloid-1.1.1
+++ b/metadata/md5-cache/dev-ruby/pluggaloid-1.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/delayer[ruby_targets_ruby21] dev-ruby/instance_storage:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/delayer[ruby_targets_ruby22] dev-ruby/instance_storage:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/delayer[ruby_targets_ruby23] dev-ruby/instance_storage:0[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=test? ( ruby_targets_ruby22? ( dev-ruby/delayer[ruby_targets_ruby22] dev-ruby/instance_storage:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/delayer[ruby_targets_ruby23] dev-ruby/instance_storage:0[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=Pluggaloid is extensible plugin system for mikutter
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/pluggaloid/
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/delayer[ruby_targets_ruby21] dev-ruby/instance_storage:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/delayer[ruby_targets_ruby22] dev-ruby/instance_storage:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/delayer[ruby_targets_ruby23] dev-ruby/instance_storage:0[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/delayer[ruby_targets_ruby22] dev-ruby/instance_storage:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/delayer[ruby_targets_ruby23] dev-ruby/instance_storage:0[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/pluggaloid-1.1.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_=2af6a4b1a1b20c0b4f4ab522f53d8a84
diff --git a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2 b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
index 246a0d593557..331d6ecda81a 100644
--- a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
+++ b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/ruby-mp3info[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ruby-mp3info[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ruby-mp3info[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] ) 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-ruby/ruby-mp3info[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ruby-mp3info[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A pure Ruby library for generating podcasts from mp3 files
 EAPI=5
 HOMEPAGE=http://podcast.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/ruby-mp3info[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ruby-mp3info[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ruby-mp3info[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/ruby-mp3info[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ruby-mp3info[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/podcast-0.0.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_=f6bffaf570f7e2d6cad4ab8e2a027e6e
diff --git a/metadata/md5-cache/dev-ruby/poltergeist-1.10.0 b/metadata/md5-cache/dev-ruby/poltergeist-1.10.0
index 087bb5a9a8ee..a29d8a2b723e 100644
--- a/metadata/md5-cache/dev-ruby/poltergeist-1.10.0
+++ b/metadata/md5-cache/dev-ruby/poltergeist-1.10.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby21] >=dev-ruby/capybara-2.1[ruby_targets_ruby21] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby22] >=dev-ruby/capybara-2.1[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby23] >=dev-ruby/capybara-2.1[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/sinatra:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sinatra:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sinatra:0[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby22] >=dev-ruby/capybara-2.1[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby23] >=dev-ruby/capybara-2.1[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sinatra:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sinatra:0[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: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=A PhantomJS driver for Capybara
 EAPI=5
 HOMEPAGE=https://github.com/jonleighton/poltergeist
-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=MIT
-RDEPEND=www-client/phantomjs ruby_targets_ruby21? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby21] >=dev-ruby/capybara-2.1[ruby_targets_ruby21] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby22] >=dev-ruby/capybara-2.1[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby23] >=dev-ruby/capybara-2.1[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.2.0[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=www-client/phantomjs ruby_targets_ruby22? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby22] >=dev-ruby/capybara-2.1[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby23] >=dev-ruby/capybara-2.1[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.2.0[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=https://github.com/jonleighton/poltergeist/archive/v1.10.0.tar.gz -> poltergeist-1.10.0.tar.gz
 _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_=6e13e2c8548d4db11eb3c4afee85f09a
diff --git a/metadata/md5-cache/dev-ruby/poltergeist-1.14.0 b/metadata/md5-cache/dev-ruby/poltergeist-1.14.0
index 7434f8711a9f..3370199e3b22 100644
--- a/metadata/md5-cache/dev-ruby/poltergeist-1.14.0
+++ b/metadata/md5-cache/dev-ruby/poltergeist-1.14.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby21] >=dev-ruby/capybara-2.1[ruby_targets_ruby21] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby22] >=dev-ruby/capybara-2.1[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby23] >=dev-ruby/capybara-2.1[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/sinatra:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sinatra:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sinatra:0[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby22] >=dev-ruby/capybara-2.1[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby23] >=dev-ruby/capybara-2.1[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sinatra:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sinatra:0[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: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=A PhantomJS driver for Capybara
 EAPI=5
 HOMEPAGE=https://github.com/jonleighton/poltergeist
-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=MIT
-RDEPEND=www-client/phantomjs ruby_targets_ruby21? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby21] >=dev-ruby/capybara-2.1[ruby_targets_ruby21] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby22] >=dev-ruby/capybara-2.1[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby23] >=dev-ruby/capybara-2.1[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.2.0[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=www-client/phantomjs ruby_targets_ruby22? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby22] >=dev-ruby/capybara-2.1[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby23] >=dev-ruby/capybara-2.1[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.2.0[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=https://github.com/jonleighton/poltergeist/archive/v1.14.0.tar.gz -> poltergeist-1.14.0.tar.gz
 _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_=6e13e2c8548d4db11eb3c4afee85f09a
diff --git a/metadata/md5-cache/dev-ruby/poltergeist-1.9.0 b/metadata/md5-cache/dev-ruby/poltergeist-1.9.0
index 603d7447855e..3cfb7a9a0c92 100644
--- a/metadata/md5-cache/dev-ruby/poltergeist-1.9.0
+++ b/metadata/md5-cache/dev-ruby/poltergeist-1.9.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby21] dev-ruby/multi_json[ruby_targets_ruby21] >=dev-ruby/capybara-2.1[ruby_targets_ruby21] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby22] dev-ruby/multi_json[ruby_targets_ruby22] >=dev-ruby/capybara-2.1[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.2.0[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/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby22] dev-ruby/multi_json[ruby_targets_ruby22] >=dev-ruby/capybara-2.1[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A PhantomJS driver for Capybara
 EAPI=5
 HOMEPAGE=https://github.com/jonleighton/poltergeist
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=www-client/phantomjs ruby_targets_ruby21? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby21] dev-ruby/multi_json[ruby_targets_ruby21] >=dev-ruby/capybara-2.1[ruby_targets_ruby21] >=dev-ruby/websocket-driver-0.2.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby22] dev-ruby/multi_json[ruby_targets_ruby22] >=dev-ruby/capybara-2.1[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.2.0[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=www-client/phantomjs ruby_targets_ruby22? ( >=dev-ruby/cliver-0.3.1[ruby_targets_ruby22] dev-ruby/multi_json[ruby_targets_ruby22] >=dev-ruby/capybara-2.1[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.2.0[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=https://github.com/jonleighton/poltergeist/archive/v1.9.0.tar.gz -> poltergeist-1.9.0.tar.gz
 _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_=3f26de21fe749c475de84b856e7118f4
diff --git a/metadata/md5-cache/dev-ruby/polyglot-0.3.5 b/metadata/md5-cache/dev-ruby/polyglot-0.3.5
index faebd4a3126d..5cbcb302017c 100644
--- a/metadata/md5-cache/dev-ruby/polyglot-0.3.5
+++ b/metadata/md5-cache/dev-ruby/polyglot-0.3.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) 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? ( 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Polyglot provides support for fully-custom DSLs
 EAPI=5
 HOMEPAGE=http://polyglot.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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/polyglot-0.3.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_=bb6f3b1b33bf6219e693c605d450590e
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.11 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.11
index 76253c3be9b2..b7834ecbca37 100644
--- a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.11
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.11
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Library that implements a subset of the Ruby 1.9 Process::spawn
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/posix-spawn/
-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=MIT LGPL-2.1
-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/posix-spawn-0.3.11.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_=f3f3f7e1c2b6f157249a31018c26df89
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.12 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.12
index b1fdacd6e6c9..3531dd588e38 100644
--- a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.12
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.12
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Library that implements a subset of the Ruby 1.9 Process::spawn
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/posix-spawn/
-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=MIT LGPL-2.1
-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/posix-spawn-0.3.12.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_=f3f3f7e1c2b6f157249a31018c26df89
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13
index 183f19d6443f..86be1f827df0 100644
--- a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Library that implements a subset of the Ruby 1.9 Process::spawn
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/posix-spawn/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=MIT LGPL-2.1
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/posix-spawn-0.3.13.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_=347d77d07340cc91ef5ecc29335cb735
diff --git a/metadata/md5-cache/dev-ruby/postgres_ext-2.4.1 b/metadata/md5-cache/dev-ruby/postgres_ext-2.4.1
index a3d60056d09d..be4d806eab5a 100644
--- a/metadata/md5-cache/dev-ruby/postgres_ext-2.4.1
+++ b/metadata/md5-cache/dev-ruby/postgres_ext-2.4.1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( || ( dev-ruby/activerecord:4.2[ruby_targets_ruby21] ) >=dev-ruby/arel-4.0.1:*[ruby_targets_ruby21] dev-ruby/pg_array_parser:0.0.9[ruby_targets_ruby21] ) ruby_targets_ruby22? ( || ( dev-ruby/activerecord:4.2[ruby_targets_ruby22] ) >=dev-ruby/arel-4.0.1:*[ruby_targets_ruby22] dev-ruby/pg_array_parser:0.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-ruby/bundler[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/bundler[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( || ( dev-ruby/activerecord:4.2[ruby_targets_ruby22] ) >=dev-ruby/arel-4.0.1:*[ruby_targets_ruby22] dev-ruby/pg_array_parser:0.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-ruby/bundler[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Native PostgreSQL data types and querying extensions for ActiveRecord and Arel
 EAPI=5
 HOMEPAGE=https://github.com/dockyard/postgres_ext
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( || ( dev-ruby/activerecord:4.2[ruby_targets_ruby21] ) >=dev-ruby/arel-4.0.1:*[ruby_targets_ruby21] dev-ruby/pg_array_parser:0.0.9[ruby_targets_ruby21] ) ruby_targets_ruby22? ( || ( dev-ruby/activerecord:4.2[ruby_targets_ruby22] ) >=dev-ruby/arel-4.0.1:*[ruby_targets_ruby22] dev-ruby/pg_array_parser:0.0.9[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/activerecord:4.2[ruby_targets_ruby22] ) >=dev-ruby/arel-4.0.1:*[ruby_targets_ruby22] dev-ruby/pg_array_parser:0.0.9[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=2.4
 SRC_URI=mirror://rubygems/postgres_ext-2.4.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_=7cffa2fd85bce8ff3338ccac55498089
diff --git a/metadata/md5-cache/dev-ruby/postgres_ext-3.0.0 b/metadata/md5-cache/dev-ruby/postgres_ext-3.0.0
index e6d08559220f..80f50362d5b5 100644
--- a/metadata/md5-cache/dev-ruby/postgres_ext-3.0.0
+++ b/metadata/md5-cache/dev-ruby/postgres_ext-3.0.0
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( || ( dev-ruby/activerecord:5.0[ruby_targets_ruby21] dev-ruby/activerecord:4.2[ruby_targets_ruby21] ) >=dev-ruby/arel-4.0.1:*[ruby_targets_ruby21] dev-ruby/pg_array_parser:0.0.9[ruby_targets_ruby21] ) ruby_targets_ruby22? ( || ( dev-ruby/activerecord:5.0[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22] ) >=dev-ruby/arel-4.0.1:*[ruby_targets_ruby22] dev-ruby/pg_array_parser:0.0.9[ruby_targets_ruby22] ) ruby_targets_ruby23? ( || ( dev-ruby/activerecord:5.0[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] ) >=dev-ruby/arel-4.0.1:*[ruby_targets_ruby23] dev-ruby/pg_array_parser:0.0.9[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-ruby/bundler[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/bundler[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/bundler[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/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=test? ( ruby_targets_ruby22? ( || ( dev-ruby/activerecord:5.0[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22] ) >=dev-ruby/arel-4.0.1:*[ruby_targets_ruby22] dev-ruby/pg_array_parser:0.0.9[ruby_targets_ruby22] ) ruby_targets_ruby23? ( || ( dev-ruby/activerecord:5.0[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] ) >=dev-ruby/arel-4.0.1:*[ruby_targets_ruby23] dev-ruby/pg_array_parser:0.0.9[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-ruby/bundler[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/bundler[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/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=Native PostgreSQL data types and querying extensions for ActiveRecord and Arel
 EAPI=5
 HOMEPAGE=https://github.com/dockyard/postgres_ext
-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
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( || ( dev-ruby/activerecord:5.0[ruby_targets_ruby21] dev-ruby/activerecord:4.2[ruby_targets_ruby21] ) >=dev-ruby/arel-4.0.1:*[ruby_targets_ruby21] dev-ruby/pg_array_parser:0.0.9[ruby_targets_ruby21] ) ruby_targets_ruby22? ( || ( dev-ruby/activerecord:5.0[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22] ) >=dev-ruby/arel-4.0.1:*[ruby_targets_ruby22] dev-ruby/pg_array_parser:0.0.9[ruby_targets_ruby22] ) ruby_targets_ruby23? ( || ( dev-ruby/activerecord:5.0[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] ) >=dev-ruby/arel-4.0.1:*[ruby_targets_ruby23] dev-ruby/pg_array_parser:0.0.9[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/activerecord:5.0[ruby_targets_ruby22] dev-ruby/activerecord:4.2[ruby_targets_ruby22] ) >=dev-ruby/arel-4.0.1:*[ruby_targets_ruby22] dev-ruby/pg_array_parser:0.0.9[ruby_targets_ruby22] ) ruby_targets_ruby23? ( || ( dev-ruby/activerecord:5.0[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] ) >=dev-ruby/arel-4.0.1:*[ruby_targets_ruby23] dev-ruby/pg_array_parser:0.0.9[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=3
 SRC_URI=mirror://rubygems/postgres_ext-3.0.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_=2c0afad81eafc32fd345f7d299bdde75
diff --git a/metadata/md5-cache/dev-ruby/power_assert-0.3.1 b/metadata/md5-cache/dev-ruby/power_assert-0.3.1
index f86ced1bfdf5..f404528ac607 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-0.3.1
+++ b/metadata/md5-cache/dev-ruby/power_assert-0.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit[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/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/test-unit[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit[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/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=Shows each value of variables and method calls in the expression
 EAPI=5
 HOMEPAGE=https://github.com/k-tsj/power_assert
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby BSD-2 )
-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/power_assert-0.3.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_=563cdcad5959e9b6298bfd9140175aa5
diff --git a/metadata/md5-cache/dev-ruby/power_assert-0.4.1 b/metadata/md5-cache/dev-ruby/power_assert-0.4.1
index b4f7531ade0a..fdc2c562db8e 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-0.4.1
+++ b/metadata/md5-cache/dev-ruby/power_assert-0.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/test-unit[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Shows each value of variables and method calls in the expression
 EAPI=5
 HOMEPAGE=https://github.com/k-tsj/power_assert
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby BSD-2 )
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/power_assert-0.4.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_=6a8ecf7ed34c83db1b40afd071c6f74e
diff --git a/metadata/md5-cache/dev-ruby/power_assert-1.0.1-r1 b/metadata/md5-cache/dev-ruby/power_assert-1.0.1-r1
index 21972036c121..2d0f48f1f179 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/power_assert-1.0.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/test-unit[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Shows each value of variables and method calls in the expression
 EAPI=5
 HOMEPAGE=https://github.com/k-tsj/power_assert
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby BSD-2 )
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/k-tsj/power_assert/archive/v1.0.1.tar.gz -> power_assert-1.0.1.tar.gz
 _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_=890ebe9e80b0a98429f78e032ad584f2
diff --git a/metadata/md5-cache/dev-ruby/power_assert-1.0.2 b/metadata/md5-cache/dev-ruby/power_assert-1.0.2
index 1d381a981601..d53760d609e4 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-1.0.2
+++ b/metadata/md5-cache/dev-ruby/power_assert-1.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/test-unit[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Shows each value of variables and method calls in the expression
 EAPI=6
 HOMEPAGE=https://github.com/k-tsj/power_assert
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby BSD-2 )
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/k-tsj/power_assert/archive/v1.0.2.tar.gz -> power_assert-1.0.2.tar.gz
 _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_=03b2072f62b7f4c9bfbaafa727c55362
diff --git a/metadata/md5-cache/dev-ruby/power_assert-1.1.0 b/metadata/md5-cache/dev-ruby/power_assert-1.1.0
index 51b1274c6de6..7f8f00b8951c 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-1.1.0
+++ b/metadata/md5-cache/dev-ruby/power_assert-1.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/test-unit[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Shows each value of variables and method calls in the expression
 EAPI=6
 HOMEPAGE=https://github.com/k-tsj/power_assert
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby BSD-2 )
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/k-tsj/power_assert/archive/v1.1.0.tar.gz -> power_assert-1.1.0.tar.gz
 _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_=03b2072f62b7f4c9bfbaafa727c55362
diff --git a/metadata/md5-cache/dev-ruby/prawn-2.1.0 b/metadata/md5-cache/dev-ruby/prawn-2.1.0
index 184937950976..f521b6855d77 100644
--- a/metadata/md5-cache/dev-ruby/prawn-2.1.0
+++ b/metadata/md5-cache/dev-ruby/prawn-2.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/pdf-core-0.6.1[ruby_targets_ruby21] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pdf-core-0.6.1[ruby_targets_ruby22] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/coderay[ruby_targets_ruby21] >=dev-ruby/pdf-inspector-1.2.1[ruby_targets_ruby21] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/coderay[ruby_targets_ruby22] >=dev-ruby/pdf-inspector-1.2.1[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( >=dev-ruby/pdf-core-0.6.1[ruby_targets_ruby22] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/coderay[ruby_targets_ruby22] >=dev-ruby/pdf-inspector-1.2.1[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Fast, Nimble PDF Generation For Ruby
 EAPI=5
 HOMEPAGE=http://prawn.majesticseacreature.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/pdf-core-0.6.1[ruby_targets_ruby21] >=dev-ruby/ttfunk-1.4.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pdf-core-0.6.1[ruby_targets_ruby22] >=dev-ruby/ttfunk-1.4.0[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/pdf-core-0.6.1[ruby_targets_ruby22] >=dev-ruby/ttfunk-1.4.0[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=2
 SRC_URI=https://github.com/prawnpdf/prawn/archive/2.1.0.tar.gz -> prawn-2.1.0.tar.gz
 _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_=a598bbfb02b0da9c3e6b9de863b82db9
diff --git a/metadata/md5-cache/dev-ruby/prawn-2.2.0 b/metadata/md5-cache/dev-ruby/prawn-2.2.0
index d92288a3cc56..d39bcc494982 100644
--- a/metadata/md5-cache/dev-ruby/prawn-2.2.0
+++ b/metadata/md5-cache/dev-ruby/prawn-2.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/pdf-core-0.7.0[ruby_targets_ruby21] >=dev-ruby/ttfunk-1.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pdf-core-0.7.0[ruby_targets_ruby22] >=dev-ruby/ttfunk-1.5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/pdf-core-0.7.0[ruby_targets_ruby23] >=dev-ruby/ttfunk-1.5[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/coderay[ruby_targets_ruby21] >=dev-ruby/pdf-inspector-1.2.1[ruby_targets_ruby21] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/coderay[ruby_targets_ruby22] >=dev-ruby/pdf-inspector-1.2.1[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/coderay[ruby_targets_ruby23] >=dev-ruby/pdf-inspector-1.2.1[ruby_targets_ruby23] >=dev-ruby/pdf-reader-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? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/pdf-core-0.7.0[ruby_targets_ruby22] >=dev-ruby/ttfunk-1.5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/pdf-core-0.7.0[ruby_targets_ruby23] >=dev-ruby/ttfunk-1.5[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/coderay[ruby_targets_ruby22] >=dev-ruby/pdf-inspector-1.2.1[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/coderay[ruby_targets_ruby23] >=dev-ruby/pdf-inspector-1.2.1[ruby_targets_ruby23] >=dev-ruby/pdf-reader-1.2[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=Fast, Nimble PDF Generation For Ruby
 EAPI=6
 HOMEPAGE=http://prawn.majesticseacreature.com/
-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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/pdf-core-0.7.0[ruby_targets_ruby21] >=dev-ruby/ttfunk-1.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pdf-core-0.7.0[ruby_targets_ruby22] >=dev-ruby/ttfunk-1.5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/pdf-core-0.7.0[ruby_targets_ruby23] >=dev-ruby/ttfunk-1.5[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/pdf-core-0.7.0[ruby_targets_ruby22] >=dev-ruby/ttfunk-1.5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/pdf-core-0.7.0[ruby_targets_ruby23] >=dev-ruby/ttfunk-1.5[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=2
 SRC_URI=https://github.com/prawnpdf/prawn/archive/2.2.0.tar.gz -> prawn-2.2.0.tar.gz
 _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_=8e6f9387956f0ee892480fc21d649a19
diff --git a/metadata/md5-cache/dev-ruby/prawn-table-0.2.2 b/metadata/md5-cache/dev-ruby/prawn-table-0.2.2
index b8ab089b424a..739ff0fbb181 100644
--- a/metadata/md5-cache/dev-ruby/prawn-table-0.2.2
+++ b/metadata/md5-cache/dev-ruby/prawn-table-0.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] >=dev-ruby/pdf-inspector-1.1.0[ruby_targets_ruby21] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby21] >=dev-ruby/prawn-1.3.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] >=dev-ruby/pdf-inspector-1.1.0[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] >=dev-ruby/prawn-1.3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) 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_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/mocha[ruby_targets_ruby22] >=dev-ruby/pdf-inspector-1.1.0[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] >=dev-ruby/prawn-1.3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Provides support for tables in Prawn
 EAPI=5
 HOMEPAGE=http://prawn.majesticseacreature.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-2+ Ruby )
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/prawn-table-0.2.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_=ed9466cc0df6eccfae3e642f50fd0dda
diff --git a/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1 b/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1
index 6867c7ce509c..a1bbc715a8b7 100644
--- a/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] >=dev-ruby/pdf-inspector-1.1.0[ruby_targets_ruby21] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby21] >=dev-ruby/prawn-1.3.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] >=dev-ruby/pdf-inspector-1.1.0[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] >=dev-ruby/prawn-1.3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] >=dev-ruby/pdf-inspector-1.1.0[ruby_targets_ruby23] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby23] >=dev-ruby/prawn-1.3.0[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] >=dev-ruby/pdf-inspector-1.1.0[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] >=dev-ruby/prawn-1.3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] >=dev-ruby/pdf-inspector-1.1.0[ruby_targets_ruby23] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby23] >=dev-ruby/prawn-1.3.0[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=Provides support for tables in Prawn
 EAPI=5
 HOMEPAGE=http://prawn.majesticseacreature.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-2+ 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/prawn-table-0.2.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_=4befb35d3bf17feb3ce27bd983fc7c89
diff --git a/metadata/md5-cache/dev-ruby/priorityqueue-0.1.2 b/metadata/md5-cache/dev-ruby/priorityqueue-0.1.2
index 4497cfcb30ab..33d1a2af94d2 100644
--- a/metadata/md5-cache/dev-ruby/priorityqueue-0.1.2
+++ b/metadata/md5-cache/dev-ruby/priorityqueue-0.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=A fibonacci-heap priority-queue implementation
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/PriorityQueue
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 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/PriorityQueue-0.1.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_=b05b4485aedbc6738dfcbeb216835868
diff --git a/metadata/md5-cache/dev-ruby/protected_attributes-1.1.4 b/metadata/md5-cache/dev-ruby/protected_attributes-1.1.4
index 2777cf06e90c..9a448c9f4240 100644
--- a/metadata/md5-cache/dev-ruby/protected_attributes-1.1.4
+++ b/metadata/md5-cache/dev-ruby/protected_attributes-1.1.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/activemodel-4*:*[ruby_targets_ruby21] >=dev-ruby/activemodel-4.0.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/activemodel-4*:*[ruby_targets_ruby22] >=dev-ruby/activemodel-4.0.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/activemodel-4*:*[ruby_targets_ruby23] >=dev-ruby/activemodel-4.0.1:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] =dev-ruby/actionpack-4*[ruby_targets_ruby21] =dev-ruby/activerecord-4*[ruby_targets_ruby21] =dev-ruby/rails-4*[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] =dev-ruby/actionpack-4*[ruby_targets_ruby22] =dev-ruby/activerecord-4*[ruby_targets_ruby22] =dev-ruby/rails-4*[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] =dev-ruby/actionpack-4*[ruby_targets_ruby23] =dev-ruby/activerecord-4*[ruby_targets_ruby23] =dev-ruby/rails-4*[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/sqlite3[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=test? ( ruby_targets_ruby22? ( =dev-ruby/activemodel-4*:*[ruby_targets_ruby22] >=dev-ruby/activemodel-4.0.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/activemodel-4*:*[ruby_targets_ruby23] >=dev-ruby/activemodel-4.0.1:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] =dev-ruby/actionpack-4*[ruby_targets_ruby22] =dev-ruby/activerecord-4*[ruby_targets_ruby22] =dev-ruby/rails-4*[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] =dev-ruby/actionpack-4*[ruby_targets_ruby23] =dev-ruby/activerecord-4*[ruby_targets_ruby23] =dev-ruby/rails-4*[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/sqlite3[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=Protect attributes from mass-assignment in ActiveRecord models
 EAPI=6
 HOMEPAGE=https://github.com/rails/protected_attributes
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/activemodel-4*:*[ruby_targets_ruby21] >=dev-ruby/activemodel-4.0.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/activemodel-4*:*[ruby_targets_ruby22] >=dev-ruby/activemodel-4.0.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/activemodel-4*:*[ruby_targets_ruby23] >=dev-ruby/activemodel-4.0.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/activemodel-4*:*[ruby_targets_ruby22] >=dev-ruby/activemodel-4.0.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/activemodel-4*:*[ruby_targets_ruby23] >=dev-ruby/activemodel-4.0.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=1
 SRC_URI=https://github.com/rails/protected_attributes/archive/v1.1.4.tar.gz -> protected_attributes-1.1.4.tar.gz
 _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_=215bac1d24842bd77a82fab242e945de
diff --git a/metadata/md5-cache/dev-ruby/pry-0.10.4 b/metadata/md5-cache/dev-ruby/pry-0.10.4
index 46ef6e8af2a6..b34510004a58 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.10.4
+++ b/metadata/md5-cache/dev-ruby/pry-0.10.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby21] =dev-ruby/coderay-1.1*[ruby_targets_ruby21] >=dev-ruby/slop-3.4.1:3[ruby_targets_ruby21] >=dev-ruby/method_source-0.8.1[ruby_targets_ruby21] =dev-ruby/method_source-0.8*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] =dev-ruby/coderay-1.1*[ruby_targets_ruby22] >=dev-ruby/slop-3.4.1:3[ruby_targets_ruby22] >=dev-ruby/method_source-0.8.1[ruby_targets_ruby22] =dev-ruby/method_source-0.8*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] =dev-ruby/coderay-1.1*[ruby_targets_ruby23] >=dev-ruby/slop-3.4.1:3[ruby_targets_ruby23] >=dev-ruby/method_source-0.8.1[ruby_targets_ruby23] =dev-ruby/method_source-0.8*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/open4-1.3[ruby_targets_ruby21] >=dev-ruby/rake-0.9[ruby_targets_ruby21] >=dev-ruby/mocha-1.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/open4-1.3[ruby_targets_ruby22] >=dev-ruby/rake-0.9[ruby_targets_ruby22] >=dev-ruby/mocha-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/open4-1.3[ruby_targets_ruby23] >=dev-ruby/rake-0.9[ruby_targets_ruby23] >=dev-ruby/mocha-1.0[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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-ruby/coderay-1.1.0[ruby_targets_ruby22] =dev-ruby/coderay-1.1*[ruby_targets_ruby22] >=dev-ruby/slop-3.4.1:3[ruby_targets_ruby22] >=dev-ruby/method_source-0.8.1[ruby_targets_ruby22] =dev-ruby/method_source-0.8*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] =dev-ruby/coderay-1.1*[ruby_targets_ruby23] >=dev-ruby/slop-3.4.1:3[ruby_targets_ruby23] >=dev-ruby/method_source-0.8.1[ruby_targets_ruby23] =dev-ruby/method_source-0.8*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/open4-1.3[ruby_targets_ruby22] >=dev-ruby/rake-0.9[ruby_targets_ruby22] >=dev-ruby/mocha-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/open4-1.3[ruby_targets_ruby23] >=dev-ruby/rake-0.9[ruby_targets_ruby23] >=dev-ruby/mocha-1.0[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=Pry is a powerful alternative to the standard IRB shell for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/pry/pry/wiki
-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 ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby21] =dev-ruby/coderay-1.1*[ruby_targets_ruby21] >=dev-ruby/slop-3.4.1:3[ruby_targets_ruby21] >=dev-ruby/method_source-0.8.1[ruby_targets_ruby21] =dev-ruby/method_source-0.8*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] =dev-ruby/coderay-1.1*[ruby_targets_ruby22] >=dev-ruby/slop-3.4.1:3[ruby_targets_ruby22] >=dev-ruby/method_source-0.8.1[ruby_targets_ruby22] =dev-ruby/method_source-0.8*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] =dev-ruby/coderay-1.1*[ruby_targets_ruby23] >=dev-ruby/slop-3.4.1:3[ruby_targets_ruby23] >=dev-ruby/method_source-0.8.1[ruby_targets_ruby23] =dev-ruby/method_source-0.8*[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/coderay-1.1.0[ruby_targets_ruby22] =dev-ruby/coderay-1.1*[ruby_targets_ruby22] >=dev-ruby/slop-3.4.1:3[ruby_targets_ruby22] >=dev-ruby/method_source-0.8.1[ruby_targets_ruby22] =dev-ruby/method_source-0.8*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] =dev-ruby/coderay-1.1*[ruby_targets_ruby23] >=dev-ruby/slop-3.4.1:3[ruby_targets_ruby23] >=dev-ruby/method_source-0.8.1[ruby_targets_ruby23] =dev-ruby/method_source-0.8*[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=ruby19
 SRC_URI=https://github.com/pry/pry/archive/v0.10.4.tar.gz -> pry-0.10.4.tar.gz
 _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_=565b0b601bb651fd81c630f2cb1c02ad
diff --git a/metadata/md5-cache/dev-ruby/psych-2.2.4 b/metadata/md5-cache/dev-ruby/psych-2.2.4
index e36ac8c67d3b..159f220459ee 100644
--- a/metadata/md5-cache/dev-ruby/psych-2.2.4
+++ b/metadata/md5-cache/dev-ruby/psych-2.2.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/libyaml-0.1.7 ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=>=dev-libs/libyaml-0.1.7 ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A libyaml wrapper for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/tenderlove/psych
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/psych/archive/v2.2.4.tar.gz -> psych-2.2.4.tar.gz
 _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_=fa22ea9e1151ff140a52ea6a6682b455
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-2.0.5 b/metadata/md5-cache/dev-ruby/public_suffix-2.0.5
index 5c552eb1ddfb..b2673061d323 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-2.0.5
+++ b/metadata/md5-cache/dev-ruby/public_suffix-2.0.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Parse and decompose a domain name into top level domain, domain and subdomains
 EAPI=5
 HOMEPAGE=https://simonecarletti.com/code/publicsuffix-ruby/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/public_suffix-2.0.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_=3db5715d47125be4619453602ca699c2
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-3.0.0-r1 b/metadata/md5-cache/dev-ruby/public_suffix-3.0.0-r1
index 6dcbae98258d..dd80bca49418 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-3.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/public_suffix-3.0.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Parse and decompose a domain name into top level domain, domain and subdomains
 EAPI=6
 HOMEPAGE=https://simonecarletti.com/code/publicsuffix-ruby/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/public_suffix-3.0.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_=cc880aeca67af81b661766f21b273bd0
diff --git a/metadata/md5-cache/dev-ruby/pundit-1.1.0 b/metadata/md5-cache/dev-ruby/pundit-1.1.0
index 710758698d37..393dfec1de2a 100644
--- a/metadata/md5-cache/dev-ruby/pundit-1.1.0
+++ b/metadata/md5-cache/dev-ruby/pundit-1.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/actionpack-3.0.0[ruby_targets_ruby21] >=dev-ruby/activemodel-3.0.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionpack-3.0.0[ruby_targets_ruby22] >=dev-ruby/activemodel-3.0.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/actionpack-3.0.0[ruby_targets_ruby23] >=dev-ruby/activemodel-3.0.0[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-ruby/activesupport-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionpack-3.0.0[ruby_targets_ruby22] >=dev-ruby/activemodel-3.0.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/actionpack-3.0.0[ruby_targets_ruby23] >=dev-ruby/activemodel-3.0.0[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=Object oriented authorization for Rails applications
 EAPI=5
 HOMEPAGE=https://github.com/elabs/pundit https://rubygems.org/gems/pundit
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0[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/activesupport-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0[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/pundit-1.1.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_=45782d68378c4f3e4110eed5a35eae1b
diff --git a/metadata/md5-cache/dev-ruby/pusher-client-0.6.2 b/metadata/md5-cache/dev-ruby/pusher-client-0.6.2
index 4ba744768fcf..9d5e48a74faf 100644
--- a/metadata/md5-cache/dev-ruby/pusher-client-0.6.2
+++ b/metadata/md5-cache/dev-ruby/pusher-client-0.6.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby21] dev-ruby/json:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby22] dev-ruby/json:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby23] dev-ruby/json:*[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: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-ruby/websocket-1:0[ruby_targets_ruby22] dev-ruby/json:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby23] dev-ruby/json:*[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: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=Client for consuming WebSockets from http://pusher.com
 EAPI=5
 HOMEPAGE=https://github.com/pusher-community/pusher-websocket-ruby
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby21] dev-ruby/json:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby22] dev-ruby/json:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby23] dev-ruby/json:*[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/websocket-1:0[ruby_targets_ruby22] dev-ruby/json:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby23] dev-ruby/json:*[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/pusher-client-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_=bcecf1d78b79ba48ab46ac7647d64cf9
diff --git a/metadata/md5-cache/dev-ruby/pygments_rb-0.6.3 b/metadata/md5-cache/dev-ruby/pygments_rb-0.6.3
index a89fb3705e38..a359918212d7 100644
--- a/metadata/md5-cache/dev-ruby/pygments_rb-0.6.3
+++ b/metadata/md5-cache/dev-ruby/pygments_rb-0.6.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/yajl-ruby-1.2[ruby_targets_ruby21] dev-ruby/posix-spawn[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/yajl-ruby-1.2[ruby_targets_ruby22] dev-ruby/posix-spawn[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-ruby/rake-compiler[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake-compiler[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=test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/yajl-ruby-1.2[ruby_targets_ruby22] dev-ruby/posix-spawn[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-ruby/rake-compiler[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=Pygments syntax highlighting in ruby
 EAPI=5
 HOMEPAGE=https://github.com/tmm1/pygments.rb
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test python_targets_python2_7
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test python_targets_python2_7
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ruby_targets_ruby21? ( >=dev-ruby/yajl-ruby-1.2[ruby_targets_ruby21] dev-ruby/posix-spawn[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/yajl-ruby-1.2[ruby_targets_ruby22] dev-ruby/posix-spawn[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=python_targets_python2_7 || ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ruby_targets_ruby22? ( >=dev-ruby/yajl-ruby-1.2[ruby_targets_ruby22] dev-ruby/posix-spawn[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=python_targets_python2_7 || ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/pygments.rb-0.6.3.gem
 _eclass_exported_funcs=pkg_setup:- 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	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	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	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c7731afa9c59ac6998d0e73ad7b77881
diff --git a/metadata/md5-cache/dev-ruby/pygments_rb-1.1.2 b/metadata/md5-cache/dev-ruby/pygments_rb-1.1.2
index 4bebd6cb26fb..6123a6143bad 100644
--- a/metadata/md5-cache/dev-ruby/pygments_rb-1.1.2
+++ b/metadata/md5-cache/dev-ruby/pygments_rb-1.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( dev-ruby/rake-compiler[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake-compiler[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake-compiler[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake-compiler[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-ruby/rake-compiler[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake-compiler[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake-compiler[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Pygments syntax highlighting in ruby
 EAPI=6
 HOMEPAGE=https://github.com/tmm1/pygments.rb
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test python_targets_python2_7
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test python_targets_python2_7
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=python_targets_python2_7 || ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=python_targets_python2_7 || ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/pygments.rb-1.1.2.gem
 _eclass_exported_funcs=pkg_setup:- 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	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	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	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dec65442a29a416ed28b18cd42fcec3f
diff --git a/metadata/md5-cache/dev-ruby/qed-2.9.2 b/metadata/md5-cache/dev-ruby/qed-2.9.2
index a8bd91e4e8f6..5dbde61a4edf 100644
--- a/metadata/md5-cache/dev-ruby/qed-2.9.2
+++ b/metadata/md5-cache/dev-ruby/qed-2.9.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/ae[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/ae[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ae[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/ansi[ruby_targets_ruby21] dev-ruby/brass[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ansi[ruby_targets_ruby22] dev-ruby/brass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[ruby_targets_ruby23] dev-ruby/brass[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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/ae[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ae[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/ansi[ruby_targets_ruby22] dev-ruby/brass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[ruby_targets_ruby23] dev-ruby/brass[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=QED (Quality Ensured Demonstrations) is a TDD/BDD framework
 EAPI=5
 HOMEPAGE=https://rubyworks.github.io/qed/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/ansi[ruby_targets_ruby21] dev-ruby/brass[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ansi[ruby_targets_ruby22] dev-ruby/brass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[ruby_targets_ruby23] dev-ruby/brass[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/ansi[ruby_targets_ruby22] dev-ruby/brass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[ruby_targets_ruby23] dev-ruby/brass[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/qed-2.9.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_=c8e47d1628a379161ee848b9a434b699
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.11 b/metadata/md5-cache/dev-ruby/racc-1.4.11
index e65d46672f0f..1691e04cf7f4 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.11
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.11
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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? ( dev-ruby/rake[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=A LALR(1) parser generator for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/tenderlove/racc
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/racc-1.4.11.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_=d2a1116f01c0dee773732b743bf27313
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.14 b/metadata/md5-cache/dev-ruby/racc-1.4.14
index feb020501462..e878a5c31dc9 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.14
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.14
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] test? ( >=dev-ruby/minitest-4.0:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A LALR(1) parser generator for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/tenderlove/racc
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/racc-1.4.14.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_=f2c4c3d71e9b05db2a4cb20c2384e0eb
diff --git a/metadata/md5-cache/dev-ruby/rack-1.4.7 b/metadata/md5-cache/dev-ruby/rack-1.4.7
index 4fe6e7dca7bf..bdb3b27ac011 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.4.7
+++ b/metadata/md5-cache/dev-ruby/rack-1.4.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] dev-ruby/fcgi[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] dev-ruby/fcgi[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] dev-ruby/fcgi[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=A modular Ruby webserver interface
 EAPI=5
 HOMEPAGE=https://rack.github.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) !<dev-ruby/rack-1.1.3-r1:0 !<dev-ruby/rack-1.2.5:1.2 !<dev-ruby/rack-1.3.6-r1:1.3 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? ( virtual/ruby-ssl[ruby_targets_ruby22] ) !<dev-ruby/rack-1.1.3-r1:0 !<dev-ruby/rack-1.2.5:1.2 !<dev-ruby/rack-1.3.6-r1:1.3 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=1.4
 SRC_URI=mirror://rubygems/rack-1.4.7.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_=da9ea5677a9257cc8f8b8c47422df07a
diff --git a/metadata/md5-cache/dev-ruby/rack-1.5.5 b/metadata/md5-cache/dev-ruby/rack-1.5.5
index dec962395ba5..73d48cc09e21 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.5.5
+++ b/metadata/md5-cache/dev-ruby/rack-1.5.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=A modular Ruby webserver interface
 EAPI=5
 HOMEPAGE=https://rack.github.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) !<dev-ruby/rack-1.4.5-r1:1.4 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? ( virtual/ruby-ssl[ruby_targets_ruby22] ) !<dev-ruby/rack-1.4.5-r1:1.4 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=1.5
 SRC_URI=mirror://rubygems/rack-1.5.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_=4ec35cbe15e73705b5a6e585383034a0
diff --git a/metadata/md5-cache/dev-ruby/rack-1.6.4 b/metadata/md5-cache/dev-ruby/rack-1.6.4
index e038ab127d1f..516dcfd3e915 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.6.4
+++ b/metadata/md5-cache/dev-ruby/rack-1.6.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=A modular Ruby webserver interface
 EAPI=5
 HOMEPAGE=https://rack.github.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 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? ( virtual/ruby-ssl[ruby_targets_ruby22] ) !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=1.6
 SRC_URI=mirror://rubygems/rack-1.6.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_=79d0552adb89d6d1a1cb787c2704add6
diff --git a/metadata/md5-cache/dev-ruby/rack-1.6.5 b/metadata/md5-cache/dev-ruby/rack-1.6.5
index a095be6395a0..bb2f57221c09 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.6.5
+++ b/metadata/md5-cache/dev-ruby/rack-1.6.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A modular Ruby webserver interface
 EAPI=5
 HOMEPAGE=https://rack.github.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.6
 SRC_URI=mirror://rubygems/rack-1.6.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_=8059371b46f09664d8f263783473503e
diff --git a/metadata/md5-cache/dev-ruby/rack-1.6.6 b/metadata/md5-cache/dev-ruby/rack-1.6.6
index bda86483e929..b6cd63c69939 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.6.6
+++ b/metadata/md5-cache/dev-ruby/rack-1.6.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A modular Ruby webserver interface
 EAPI=6
 HOMEPAGE=https://rack.github.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.6
 SRC_URI=mirror://rubygems/rack-1.6.6.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_=19cb071261fe4b2cb75b1b284eb80d28
diff --git a/metadata/md5-cache/dev-ruby/rack-1.6.7 b/metadata/md5-cache/dev-ruby/rack-1.6.7
index 56457fd39322..20c71de5ef22 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.6.7
+++ b/metadata/md5-cache/dev-ruby/rack-1.6.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A modular Ruby webserver interface
 EAPI=6
 HOMEPAGE=https://rack.github.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.6
 SRC_URI=mirror://rubygems/rack-1.6.7.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_=38055bba84c062ac1d04cdc4320c128a
diff --git a/metadata/md5-cache/dev-ruby/rack-2.0.1 b/metadata/md5-cache/dev-ruby/rack-2.0.1
index 9c42f47869ad..b716471feb06 100644
--- a/metadata/md5-cache/dev-ruby/rack-2.0.1
+++ b/metadata/md5-cache/dev-ruby/rack-2.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/concurrent-ruby[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/concurrent-ruby[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/concurrent-ruby[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/concurrent-ruby[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/concurrent-ruby[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A modular Ruby webserver interface
 EAPI=5
 HOMEPAGE=https://rack.github.com/
-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=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6 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? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6 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=2.0
 SRC_URI=mirror://rubygems/rack-2.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_=e77335e007e84d75b17649a15cfb5453
diff --git a/metadata/md5-cache/dev-ruby/rack-2.0.2 b/metadata/md5-cache/dev-ruby/rack-2.0.2
index 0aa08f48f060..ef620bff4faa 100644
--- a/metadata/md5-cache/dev-ruby/rack-2.0.2
+++ b/metadata/md5-cache/dev-ruby/rack-2.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/concurrent-ruby[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/concurrent-ruby[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/concurrent-ruby[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/concurrent-ruby[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/concurrent-ruby[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/concurrent-ruby[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/concurrent-ruby[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A modular Ruby webserver interface
 EAPI=6
 HOMEPAGE=https://rack.github.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2.0
 SRC_URI=mirror://rubygems/rack-2.0.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_=e4d4203f6fe7794dec147fe707e38fbd
diff --git a/metadata/md5-cache/dev-ruby/rack-2.0.3 b/metadata/md5-cache/dev-ruby/rack-2.0.3
index be9ab772ed36..015e6f4f3b31 100644
--- a/metadata/md5-cache/dev-ruby/rack-2.0.3
+++ b/metadata/md5-cache/dev-ruby/rack-2.0.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/concurrent-ruby[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/concurrent-ruby[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/concurrent-ruby[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/concurrent-ruby[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/concurrent-ruby[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/concurrent-ruby[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/concurrent-ruby[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A modular Ruby webserver interface
 EAPI=6
 HOMEPAGE=https://rack.github.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2.0
 SRC_URI=mirror://rubygems/rack-2.0.3.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_=ba56ab00608180062cfad242c3cda6a0
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-4.4.1 b/metadata/md5-cache/dev-ruby/rack-attack-4.4.1
index b5da97a8d249..2939704245e2 100644
--- a/metadata/md5-cache/dev-ruby/rack-attack-4.4.1
+++ b/metadata/md5-cache/dev-ruby/rack-attack-4.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/activesupport[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/activesupport[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] dev-ruby/minitest[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=test? ( ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/activesupport[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] dev-ruby/minitest[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=A DSL for blocking & throttling abusive clients
 EAPI=5
 HOMEPAGE=https://github.com/kickstarter/rack-attack
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[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/rack:*[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/rack-attack-4.4.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_=c5f83f51836597763df171f99582f3b4
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-5.0.1 b/metadata/md5-cache/dev-ruby/rack-attack-5.0.1
index 25eb7444a8ff..db18e63c51f5 100644
--- a/metadata/md5-cache/dev-ruby/rack-attack-5.0.1
+++ b/metadata/md5-cache/dev-ruby/rack-attack-5.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/actionpack[ruby_targets_ruby21] dev-ruby/activesupport[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/actionpack[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/actionpack[ruby_targets_ruby23] dev-ruby/activesupport[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/actionpack[ruby_targets_ruby24] dev-ruby/activesupport[ruby_targets_ruby24] dev-ruby/rack-test[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/actionpack[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/actionpack[ruby_targets_ruby23] dev-ruby/activesupport[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/actionpack[ruby_targets_ruby24] dev-ruby/activesupport[ruby_targets_ruby24] dev-ruby/rack-test[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A DSL for blocking & throttling abusive clients
 EAPI=6
 HOMEPAGE=https://github.com/kickstarter/rack-attack
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5
 SRC_URI=mirror://rubygems/rack-attack-5.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_=43f58a4ff418de4a229f6882f3de0378
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.6.1 b/metadata/md5-cache/dev-ruby/rack-cache-1.6.1
index 103666340659..d1ba4e039a58 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.6.1
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.6.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/maxitest[ruby_targets_ruby21] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby21] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/maxitest[ruby_targets_ruby22] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby22] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[ruby_targets_ruby23] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby23] >=dev-ruby/mocha-0.13.0[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=test? ( ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/maxitest[ruby_targets_ruby22] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby22] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[ruby_targets_ruby23] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby23] >=dev-ruby/mocha-0.13.0[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=Enable HTTP caching for Rack-based applications that produce freshness info
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/rack-cache
-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 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[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/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[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=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.6.1.tar.gz -> rack-cache-1.6.1.tar.gz
 _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_=9cf46be6b5d5eda9aa8d5ddcf04227d1
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.7.0 b/metadata/md5-cache/dev-ruby/rack-cache-1.7.0
index 25fe01b18d1b..22632fd28655 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.7.0
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/maxitest[ruby_targets_ruby21] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby21] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/maxitest[ruby_targets_ruby22] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby22] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[ruby_targets_ruby23] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby23] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/maxitest[ruby_targets_ruby24] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby24] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/maxitest[ruby_targets_ruby22] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby22] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[ruby_targets_ruby23] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby23] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/maxitest[ruby_targets_ruby24] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby24] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Enable HTTP caching for Rack-based applications that produce freshness info
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/rack-cache
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.7.0.tar.gz -> rack-cache-1.7.0.tar.gz
 _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_=da8b2ce67c7db61f837dfbacedf58332
diff --git a/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2 b/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2
index 0ec6bb18ac93..a043ea0e0eb2 100644
--- a/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2
+++ b/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[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=A stackable dynamic tree based Rack router
 EAPI=5
 HOMEPAGE=https://github.com/josh/rack-mount
-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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[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/rack-1.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[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.8
 SRC_URI=https://github.com/josh/rack-mount/tarball/v0.8.3 -> rack-mount-0.8.3.tgz
 _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_=16866422ff930e14c3797904509a9dc8
diff --git a/metadata/md5-cache/dev-ruby/rack-openid-1.4.2 b/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
index 51d9c58a3783..cfc5103fb3bb 100644
--- a/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
+++ b/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby21] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby22] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby23] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby24] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby22] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby23] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby24] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Provides a more HTTPish API around the ruby-openid library
 EAPI=5
 HOMEPAGE=https://github.com/grosser/rack-openid
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby21] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby22] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby23] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby24] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby22] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby23] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby24] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/grosser/rack-openid/archive/v1.4.2.tar.gz -> rack-openid-1.4.2.tar.gz
 _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_=eb26faca831c7c0dec68076a1a0cd4cf
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-1.5.3-r1 b/metadata/md5-cache/dev-ruby/rack-protection-1.5.3-r1
index 01e6dd0c15dd..494e4bfa189b 100644
--- a/metadata/md5-cache/dev-ruby/rack-protection-1.5.3-r1
+++ b/metadata/md5-cache/dev-ruby/rack-protection-1.5.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rack-test[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rack-test[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rack-test[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rack-test[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rack-test[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=This gem protects against typical web attacks
 EAPI=5
 HOMEPAGE=https://github.com/rkh/rack-protection
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/rack-protection-1.5.3.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_=da6bbc7463ec69362ce4508f8553169a
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-2.0.0 b/metadata/md5-cache/dev-ruby/rack-protection-2.0.0
index b2b5941503bd..192709e84aee 100644
--- a/metadata/md5-cache/dev-ruby/rack-protection-2.0.0
+++ b/metadata/md5-cache/dev-ruby/rack-protection-2.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=This gem protects against typical web attacks
 EAPI=6
 HOMEPAGE=https://github.com/rkh/rack-protection
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/rack-protection-2.0.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_=5b3984546ee7d81b5cfda207c7d30507
diff --git a/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4 b/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4
index c5427b3d8403..9777905fb322 100644
--- a/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4
+++ b/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rack-test[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rack-test[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=test? ( ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rack-test[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=Force SSL/TLS in your app
 EAPI=5
 HOMEPAGE=https://github.com/josh/rack-ssl/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[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? ( virtual/ruby-ssl[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=1.3
 SRC_URI=https://github.com/josh/rack-ssl/archive/v1.3.4.tar.gz -> rack-ssl-1.3.4-git.tgz
 _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_=3862c9885ae31a710283939bab5fa656
diff --git a/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1 b/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
index 34892da65921..0fc28c4e06b9 100644
--- a/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
+++ b/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rack-test[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rack-test[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=test? ( ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rack-test[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=Force SSL/TLS in your app
 EAPI=5
 HOMEPAGE=https://github.com/josh/rack-ssl/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[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? ( virtual/ruby-ssl[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=1.4
 SRC_URI=https://github.com/josh/rack-ssl/archive/v1.4.1.tar.gz -> rack-ssl-1.4.1-git.tgz
 _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_=3862c9885ae31a710283939bab5fa656
diff --git a/metadata/md5-cache/dev-ruby/rack-test-0.6.3 b/metadata/md5-cache/dev-ruby/rack-test-0.6.3
index 3711626d518f..cff5a3aef9cc 100644
--- a/metadata/md5-cache/dev-ruby/rack-test-0.6.3
+++ b/metadata/md5-cache/dev-ruby/rack-test-0.6.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/sinatra-1.2.6[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/sinatra-1.2.6[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/sinatra-1.2.6[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/sinatra-1.2.6[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/sinatra-1.2.6[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/sinatra-1.2.6[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/sinatra-1.2.6[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Rack::Test is a small, simple testing API for Rack apps
 EAPI=5
 HOMEPAGE=https://github.com/brynary/rack-test
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.6
 SRC_URI=mirror://rubygems/rack-test-0.6.3.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_=ae82adafdad0b56c3147544c9839459b
diff --git a/metadata/md5-cache/dev-ruby/rack-test-0.7.0 b/metadata/md5-cache/dev-ruby/rack-test-0.7.0
index a06833c51d9d..2cf519692e4c 100644
--- a/metadata/md5-cache/dev-ruby/rack-test-0.7.0
+++ b/metadata/md5-cache/dev-ruby/rack-test-0.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby24] <dev-ruby/rack-3:*[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/sinatra-1.2.6[ruby_targets_ruby21] =dev-ruby/rack-1*[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/sinatra-1.2.6[ruby_targets_ruby22] =dev-ruby/rack-1*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/sinatra-1.2.6[ruby_targets_ruby23] =dev-ruby/rack-1*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/sinatra-1.2.6[ruby_targets_ruby24] =dev-ruby/rack-1*[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby24] <dev-ruby/rack-3:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/sinatra-1.2.6[ruby_targets_ruby22] =dev-ruby/rack-1*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/sinatra-1.2.6[ruby_targets_ruby23] =dev-ruby/rack-1*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/sinatra-1.2.6[ruby_targets_ruby24] =dev-ruby/rack-1*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Rack::Test is a small, simple testing API for Rack apps
 EAPI=6
 HOMEPAGE=https://github.com/rack-test/rack-test
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby24] <dev-ruby/rack-3:*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby24] <dev-ruby/rack-3:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.7
 SRC_URI=https://github.com/rack-test/rack-test/archive/v0.7.0.tar.gz -> rack-test-0.7.0.tar.gz
 _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_=87cf2513a42d966ee13a54c364cd9e51
diff --git a/metadata/md5-cache/dev-ruby/radius-0.7.4-r3 b/metadata/md5-cache/dev-ruby/radius-0.7.4-r3
index 1e4ece5fecbf..205c874b76ff 100644
--- a/metadata/md5-cache/dev-ruby/radius-0.7.4-r3
+++ b/metadata/md5-cache/dev-ruby/radius-0.7.4-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/kramdown[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/kramdown[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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/kramdown[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=Powerful tag-based template system
 EAPI=5
 HOMEPAGE=https://github.com/jlong/radius http://radius.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/radius-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_=94f61bde46a32b09746d9b96a642da91
diff --git a/metadata/md5-cache/dev-ruby/ragol-1.0.1-r2 b/metadata/md5-cache/dev-ruby/ragol-1.0.1-r2
index c4751b77d7bf..eb507cd9f51a 100644
--- a/metadata/md5-cache/dev-ruby/ragol-1.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/ragol-1.0.1-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/logue-1.0.0[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: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-ruby/logue-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/logue-1.0.0[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: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=Another implementation of an option processor
 EAPI=5
 HOMEPAGE=https://github.com/jpace/ragol
-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 hppa ~ppc ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/logue-1.0.0[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/logue-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/logue-1.0.0[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=https://github.com/jpace/ragol/archive/v1.0.1.tar.gz -> ragol-git-1.0.1.tgz
 _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_=3ba6a92478bdf5506890dc28e5c71873
diff --git a/metadata/md5-cache/dev-ruby/rails-4.2.8 b/metadata/md5-cache/dev-ruby/rails-4.2.8
index 76c09e393784..f76132bbeca5 100644
--- a/metadata/md5-cache/dev-ruby/rails-4.2.8
+++ b/metadata/md5-cache/dev-ruby/rails-4.2.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/actionmailer-4.2.8[ruby_targets_ruby21] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby21] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby21] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby21] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby21] ~dev-ruby/activerecord-4.2.8[ruby_targets_ruby21] ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby21] ~dev-ruby/railties-4.2.8[ruby_targets_ruby21] >=dev-ruby/bundler-1.3[ruby_targets_ruby21] =dev-ruby/bundler-1*[ruby_targets_ruby21] dev-ruby/sprockets-rails:*[ruby_targets_ruby21] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby21] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby21] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby21] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( ~dev-ruby/actionmailer-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby22] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby22] ~dev-ruby/activerecord-4.2.8[ruby_targets_ruby22] ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] ~dev-ruby/railties-4.2.8[ruby_targets_ruby22] >=dev-ruby/bundler-1.3[ruby_targets_ruby22] =dev-ruby/bundler-1*[ruby_targets_ruby22] dev-ruby/sprockets-rails:*[ruby_targets_ruby22] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby22] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/actionmailer-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby23] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby23] ~dev-ruby/activerecord-4.2.8[ruby_targets_ruby23] ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] ~dev-ruby/railties-4.2.8[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] dev-ruby/sprockets-rails:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[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] ) 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-ruby/actionmailer-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby22] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby22] ~dev-ruby/activerecord-4.2.8[ruby_targets_ruby22] ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] ~dev-ruby/railties-4.2.8[ruby_targets_ruby22] >=dev-ruby/bundler-1.3[ruby_targets_ruby22] =dev-ruby/bundler-1*[ruby_targets_ruby22] dev-ruby/sprockets-rails:*[ruby_targets_ruby22] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby22] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/actionmailer-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby23] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby23] ~dev-ruby/activerecord-4.2.8[ruby_targets_ruby23] ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] ~dev-ruby/railties-4.2.8[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] dev-ruby/sprockets-rails:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=ruby on rails is a web-application and persistance framework
 EAPI=5
 HOMEPAGE=http://www.rubyonrails.org
-IUSE=+asset-pipeline test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=+asset-pipeline test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/actionmailer-4.2.8[ruby_targets_ruby21] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby21] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby21] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby21] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby21] ~dev-ruby/activerecord-4.2.8[ruby_targets_ruby21] ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby21] ~dev-ruby/railties-4.2.8[ruby_targets_ruby21] >=dev-ruby/bundler-1.3[ruby_targets_ruby21] =dev-ruby/bundler-1*[ruby_targets_ruby21] dev-ruby/sprockets-rails:*[ruby_targets_ruby21] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby21] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby21] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby21] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( ~dev-ruby/actionmailer-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby22] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby22] ~dev-ruby/activerecord-4.2.8[ruby_targets_ruby22] ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] ~dev-ruby/railties-4.2.8[ruby_targets_ruby22] >=dev-ruby/bundler-1.3[ruby_targets_ruby22] =dev-ruby/bundler-1*[ruby_targets_ruby22] dev-ruby/sprockets-rails:*[ruby_targets_ruby22] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby22] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/actionmailer-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby23] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby23] ~dev-ruby/activerecord-4.2.8[ruby_targets_ruby23] ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] ~dev-ruby/railties-4.2.8[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] dev-ruby/sprockets-rails:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[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/actionmailer-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby22] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby22] ~dev-ruby/activerecord-4.2.8[ruby_targets_ruby22] ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] ~dev-ruby/railties-4.2.8[ruby_targets_ruby22] >=dev-ruby/bundler-1.3[ruby_targets_ruby22] =dev-ruby/bundler-1*[ruby_targets_ruby22] dev-ruby/sprockets-rails:*[ruby_targets_ruby22] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby22] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/actionmailer-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.8[ruby_targets_ruby23] ~dev-ruby/activejob-4.2.8[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.8[ruby_targets_ruby23] ~dev-ruby/activerecord-4.2.8[ruby_targets_ruby23] ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] ~dev-ruby/railties-4.2.8[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] dev-ruby/sprockets-rails:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[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=4.2
 SRC_URI=mirror://rubygems/rails-4.2.8.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_=eab34ad8f89d47a6b8450774cd473bc1
diff --git a/metadata/md5-cache/dev-ruby/rails-4.2.9 b/metadata/md5-cache/dev-ruby/rails-4.2.9
index 49e476f27d86..5fc9764d08ec 100644
--- a/metadata/md5-cache/dev-ruby/rails-4.2.9
+++ b/metadata/md5-cache/dev-ruby/rails-4.2.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby21] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby21] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby21] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby21] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby21] ~dev-ruby/activerecord-4.2.9[ruby_targets_ruby21] ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby21] ~dev-ruby/railties-4.2.9[ruby_targets_ruby21] >=dev-ruby/bundler-1.3[ruby_targets_ruby21] =dev-ruby/bundler-1*[ruby_targets_ruby21] dev-ruby/sprockets-rails:*[ruby_targets_ruby21] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby21] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby21] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby21] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby22] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby22] ~dev-ruby/activerecord-4.2.9[ruby_targets_ruby22] ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] ~dev-ruby/railties-4.2.9[ruby_targets_ruby22] >=dev-ruby/bundler-1.3[ruby_targets_ruby22] =dev-ruby/bundler-1*[ruby_targets_ruby22] dev-ruby/sprockets-rails:*[ruby_targets_ruby22] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby22] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby23] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby23] ~dev-ruby/activerecord-4.2.9[ruby_targets_ruby23] ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] ~dev-ruby/railties-4.2.9[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] dev-ruby/sprockets-rails:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby24] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby24] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby24] ~dev-ruby/activerecord-4.2.9[ruby_targets_ruby24] ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] ~dev-ruby/railties-4.2.9[ruby_targets_ruby24] >=dev-ruby/bundler-1.3[ruby_targets_ruby24] =dev-ruby/bundler-1*[ruby_targets_ruby24] dev-ruby/sprockets-rails:*[ruby_targets_ruby24] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby24] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby24] ) ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby22] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby22] ~dev-ruby/activerecord-4.2.9[ruby_targets_ruby22] ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] ~dev-ruby/railties-4.2.9[ruby_targets_ruby22] >=dev-ruby/bundler-1.3[ruby_targets_ruby22] =dev-ruby/bundler-1*[ruby_targets_ruby22] dev-ruby/sprockets-rails:*[ruby_targets_ruby22] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby22] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby23] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby23] ~dev-ruby/activerecord-4.2.9[ruby_targets_ruby23] ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] ~dev-ruby/railties-4.2.9[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] dev-ruby/sprockets-rails:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby24] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby24] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby24] ~dev-ruby/activerecord-4.2.9[ruby_targets_ruby24] ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] ~dev-ruby/railties-4.2.9[ruby_targets_ruby24] >=dev-ruby/bundler-1.3[ruby_targets_ruby24] =dev-ruby/bundler-1*[ruby_targets_ruby24] dev-ruby/sprockets-rails:*[ruby_targets_ruby24] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby24] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=ruby on rails is a web-application and persistance framework
 EAPI=6
 HOMEPAGE=http://www.rubyonrails.org
-IUSE=+asset-pipeline test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=+asset-pipeline test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~arm ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby21] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby21] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby21] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby21] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby21] ~dev-ruby/activerecord-4.2.9[ruby_targets_ruby21] ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby21] ~dev-ruby/railties-4.2.9[ruby_targets_ruby21] >=dev-ruby/bundler-1.3[ruby_targets_ruby21] =dev-ruby/bundler-1*[ruby_targets_ruby21] dev-ruby/sprockets-rails:*[ruby_targets_ruby21] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby21] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby21] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby21] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby22] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby22] ~dev-ruby/activerecord-4.2.9[ruby_targets_ruby22] ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] ~dev-ruby/railties-4.2.9[ruby_targets_ruby22] >=dev-ruby/bundler-1.3[ruby_targets_ruby22] =dev-ruby/bundler-1*[ruby_targets_ruby22] dev-ruby/sprockets-rails:*[ruby_targets_ruby22] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby22] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby23] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby23] ~dev-ruby/activerecord-4.2.9[ruby_targets_ruby23] ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] ~dev-ruby/railties-4.2.9[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] dev-ruby/sprockets-rails:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby24] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby24] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby24] ~dev-ruby/activerecord-4.2.9[ruby_targets_ruby24] ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] ~dev-ruby/railties-4.2.9[ruby_targets_ruby24] >=dev-ruby/bundler-1.3[ruby_targets_ruby24] =dev-ruby/bundler-1*[ruby_targets_ruby24] dev-ruby/sprockets-rails:*[ruby_targets_ruby24] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby24] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby22] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby22] ~dev-ruby/activerecord-4.2.9[ruby_targets_ruby22] ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] ~dev-ruby/railties-4.2.9[ruby_targets_ruby22] >=dev-ruby/bundler-1.3[ruby_targets_ruby22] =dev-ruby/bundler-1*[ruby_targets_ruby22] dev-ruby/sprockets-rails:*[ruby_targets_ruby22] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby22] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby23] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby23] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby23] ~dev-ruby/activerecord-4.2.9[ruby_targets_ruby23] ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] ~dev-ruby/railties-4.2.9[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] dev-ruby/sprockets-rails:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/actionmailer-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionview-4.2.9[ruby_targets_ruby24] ~dev-ruby/activejob-4.2.9[ruby_targets_ruby24] ~dev-ruby/activemodel-4.2.9[ruby_targets_ruby24] ~dev-ruby/activerecord-4.2.9[ruby_targets_ruby24] ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] ~dev-ruby/railties-4.2.9[ruby_targets_ruby24] >=dev-ruby/bundler-1.3[ruby_targets_ruby24] =dev-ruby/bundler-1*[ruby_targets_ruby24] dev-ruby/sprockets-rails:*[ruby_targets_ruby24] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby24] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4.2
 SRC_URI=mirror://rubygems/rails-4.2.9.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_=132b4f54ee713452df9a3b63c3039dc2
diff --git a/metadata/md5-cache/dev-ruby/rails-5.0.3 b/metadata/md5-cache/dev-ruby/rails-5.0.3
index 4088637b6122..6c5a70e5a53b 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.0.3
+++ b/metadata/md5-cache/dev-ruby/rails-5.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.0
 SRC_URI=mirror://rubygems/rails-5.0.3.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_=f7e781835ed23e5101317b83585fcea3
diff --git a/metadata/md5-cache/dev-ruby/rails-5.0.4 b/metadata/md5-cache/dev-ruby/rails-5.0.4
index b6220be58ae5..fcf0d9cecae7 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.0.4
+++ b/metadata/md5-cache/dev-ruby/rails-5.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.0
 SRC_URI=mirror://rubygems/rails-5.0.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_=9c8acf90e78602e81a4fb4ce536ea40c
diff --git a/metadata/md5-cache/dev-ruby/rails-5.0.5 b/metadata/md5-cache/dev-ruby/rails-5.0.5
index ee5d4dc73a4e..5f0e55c09e79 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.0.5
+++ b/metadata/md5-cache/dev-ruby/rails-5.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.0
 SRC_URI=mirror://rubygems/rails-5.0.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_=9c8acf90e78602e81a4fb4ce536ea40c
diff --git a/metadata/md5-cache/dev-ruby/rails-5.1.1 b/metadata/md5-cache/dev-ruby/rails-5.1.1
index 414b2913537d..309bef45474d 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.1.1
+++ b/metadata/md5-cache/dev-ruby/rails-5.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5.1
 SRC_URI=mirror://rubygems/rails-5.1.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_=f7e781835ed23e5101317b83585fcea3
diff --git a/metadata/md5-cache/dev-ruby/rails-5.1.2 b/metadata/md5-cache/dev-ruby/rails-5.1.2
index 152f940b279c..ff2fc2144dc1 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.1.2
+++ b/metadata/md5-cache/dev-ruby/rails-5.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=mirror://rubygems/rails-5.1.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_=073677197d3b28363cc2344423976765
diff --git a/metadata/md5-cache/dev-ruby/rails-5.1.3 b/metadata/md5-cache/dev-ruby/rails-5.1.3
index 717509919de8..8a5958fe88f7 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.1.3
+++ b/metadata/md5-cache/dev-ruby/rails-5.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=mirror://rubygems/rails-5.1.3.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_=073677197d3b28363cc2344423976765
diff --git a/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3 b/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3
index 1b336987ab5b..a954bc305228 100644
--- a/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3
+++ b/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/actionview-4.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionview-4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionview-4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Deprecated sanitizer API extracted from Action View
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails-deprecated_sanitizer
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.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/activesupport-4.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/rails-deprecated_sanitizer-1.0.3.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_=875159af1c57993fde21ce74697b9f9b
diff --git a/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3-r1 b/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3-r1
index fa81532cb525..d9c3f9d8cdf6 100644
--- a/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/actionview-4.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionview-4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/actionview-4.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? ( 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/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=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionview-4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/actionview-4.2[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/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=Deprecated sanitizer API extracted from Action View
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails-deprecated_sanitizer
-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 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.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/activesupport-4.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.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/rails-deprecated_sanitizer-1.0.3.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_=1f1e7123001970c76a0bcd6d53f51f25
diff --git a/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3-r2 b/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3-r2
index 9c0ebf871230..855d5074cf54 100644
--- a/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3-r2
+++ b/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/actionview-4.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionview-4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/actionview-4.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/actionview-4.2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionview-4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/actionview-4.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/actionview-4.2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Deprecated sanitizer API extracted from Action View
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails-deprecated_sanitizer
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rails-deprecated_sanitizer-1.0.3.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_=d61907ac983bacdaaf2969f0fe55e685
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.8 b/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.8
index 82796086a398..9ab541249456 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.8
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/activesupport:4.2[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby21] =dev-ruby/nokogiri-1*[ruby_targets_ruby21] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/activesupport:4.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] =dev-ruby/nokogiri-1*[ruby_targets_ruby22] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/activesupport:4.2[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby23] =dev-ruby/nokogiri-1*[ruby_targets_ruby23] >=dev-ruby/rails-deprecated_sanitizer-1.0.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? ( 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/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=test? ( ruby_targets_ruby22? ( dev-ruby/activesupport:4.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] =dev-ruby/nokogiri-1*[ruby_targets_ruby22] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/activesupport:4.2[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby23] =dev-ruby/nokogiri-1*[ruby_targets_ruby23] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[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/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=Compare doms and assert certain elements exists in doms using Nokogiri
 EAPI=5
 HOMEPAGE=https://github.com/kaspth/rails-dom-testing
-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 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/activesupport:4.2[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby21] =dev-ruby/nokogiri-1*[ruby_targets_ruby21] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/activesupport:4.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] =dev-ruby/nokogiri-1*[ruby_targets_ruby22] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/activesupport:4.2[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby23] =dev-ruby/nokogiri-1*[ruby_targets_ruby23] >=dev-ruby/rails-deprecated_sanitizer-1.0.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/activesupport:4.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] =dev-ruby/nokogiri-1*[ruby_targets_ruby22] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/activesupport:4.2[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby23] =dev-ruby/nokogiri-1*[ruby_targets_ruby23] >=dev-ruby/rails-deprecated_sanitizer-1.0.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=1
 SRC_URI=mirror://rubygems/rails-dom-testing-1.0.8.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_=de70ab55f33c0074dae2235e99db4f2e
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.8-r1 b/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.8-r1
index bb1cb2ddb681..c89ad0b176b2 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.8-r1
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.8-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/activesupport:4.2[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby21] =dev-ruby/nokogiri-1*[ruby_targets_ruby21] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/activesupport:4.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] =dev-ruby/nokogiri-1*[ruby_targets_ruby22] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/activesupport:4.2[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby23] =dev-ruby/nokogiri-1*[ruby_targets_ruby23] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/activesupport:4.2[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby24] =dev-ruby/nokogiri-1*[ruby_targets_ruby24] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/activesupport:4.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] =dev-ruby/nokogiri-1*[ruby_targets_ruby22] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/activesupport:4.2[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby23] =dev-ruby/nokogiri-1*[ruby_targets_ruby23] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/activesupport:4.2[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby24] =dev-ruby/nokogiri-1*[ruby_targets_ruby24] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Compare doms and assert certain elements exists in doms using Nokogiri
 EAPI=5
 HOMEPAGE=https://github.com/kaspth/rails-dom-testing
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/activesupport:4.2[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby21] =dev-ruby/nokogiri-1*[ruby_targets_ruby21] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/activesupport:4.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] =dev-ruby/nokogiri-1*[ruby_targets_ruby22] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/activesupport:4.2[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby23] =dev-ruby/nokogiri-1*[ruby_targets_ruby23] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/activesupport:4.2[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby24] =dev-ruby/nokogiri-1*[ruby_targets_ruby24] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/activesupport:4.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] =dev-ruby/nokogiri-1*[ruby_targets_ruby22] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/activesupport:4.2[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby23] =dev-ruby/nokogiri-1*[ruby_targets_ruby23] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/activesupport:4.2[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby24] =dev-ruby/nokogiri-1*[ruby_targets_ruby24] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/rails-dom-testing-1.0.8.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_=388367534b3b90918560c6b9d2f4a448
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.2 b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.2
index dbb67479f03e..2b24e0a0affa 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.2
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby21] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.6.0:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.0:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.0:0[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/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=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.0:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.0:0[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/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=Compare doms and assert certain elements exists in doms using Nokogiri
 EAPI=5
 HOMEPAGE=https://github.com/kaspth/rails-dom-testing
-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 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby21] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.6.0:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.0:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.0:0[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/activesupport-4.2:*[ruby_targets_ruby22] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.0:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.0:0[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=2
 SRC_URI=mirror://rubygems/rails-dom-testing-2.0.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_=059591b5911c1cbc4fdb2438848e861b
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3 b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3
index d996c45f2b98..d7826063ab7a 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Compare doms and assert certain elements exists in doms using Nokogiri
 EAPI=6
 HOMEPAGE=https://github.com/kaspth/rails-dom-testing
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/rails-dom-testing-2.0.3.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_=d596b6432cd4cc772c17ba0731669243
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3
index e56e0ab3e5ec..ad88640503e0 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/loofah:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/loofah:0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rails-dom-testing[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails-dom-testing[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( dev-ruby/loofah:0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails-dom-testing[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Sanitize HTML fragments in Rails applications
 EAPI=5
 HOMEPAGE=https://github.com/rafaelfranca/rails-html-sanitizer
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/loofah:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/loofah:0[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/loofah:0[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=1
 SRC_URI=mirror://rubygems/rails-html-sanitizer-1.0.3.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_=b643e8b7e1a979648f5f4a309666fb8f
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3-r1 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3-r1
index 5f5e1a0d882a..99d62700eb3c 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/loofah:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/loofah:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/loofah:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/loofah:0[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rails-dom-testing[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails-dom-testing[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails-dom-testing[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails-dom-testing[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/loofah:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/loofah:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/loofah:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails-dom-testing[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails-dom-testing[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails-dom-testing[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Sanitize HTML fragments in Rails applications
 EAPI=5
 HOMEPAGE=https://github.com/rafaelfranca/rails-html-sanitizer
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/loofah:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/loofah:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/loofah:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/loofah:0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/loofah:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/loofah:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/loofah:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/rails-html-sanitizer-1.0.3.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_=334e992f355b370a5114dc4af934e827
diff --git a/metadata/md5-cache/dev-ruby/rails-observers-0.1.2 b/metadata/md5-cache/dev-ruby/rails-observers-0.1.2
index b7e4738450d8..dfbb3df61759 100644
--- a/metadata/md5-cache/dev-ruby/rails-observers-0.1.2
+++ b/metadata/md5-cache/dev-ruby/rails-observers-0.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/activemodel-4*[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] >=dev-ruby/minitest-3[ruby_targets_ruby21] =dev-ruby/railties-4*[ruby_targets_ruby21] =dev-ruby/activerecord-4*[ruby_targets_ruby21] =dev-ruby/actionmailer-4*[ruby_targets_ruby21] =dev-ruby/actionpack-4*[ruby_targets_ruby21] >=dev-ruby/sqlite3-1.3[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/activemodel-4*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/minitest-3[ruby_targets_ruby22] =dev-ruby/railties-4*[ruby_targets_ruby22] =dev-ruby/activerecord-4*[ruby_targets_ruby22] =dev-ruby/actionmailer-4*[ruby_targets_ruby22] =dev-ruby/actionpack-4*[ruby_targets_ruby22] >=dev-ruby/sqlite3-1.3[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=Rails Observers
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails-observers
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/activemodel-4*[ruby_targets_ruby21] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby22? ( =dev-ruby/activemodel-4*[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.1
 SRC_URI=https://github.com/rails/rails-observers/archive/v0.1.2.tar.gz -> rails-observers-0.1.2.tgz
 _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
-_md5_=5976165d92c02aff7bc4c4ef70de7b23
+_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_=c463b6bd8528c3f6290a30aa29b7499d
diff --git a/metadata/md5-cache/dev-ruby/railties-4.2.8 b/metadata/md5-cache/dev-ruby/railties-4.2.8
index 38930c863bc8..0cf2e5f9faac 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.2.8
+++ b/metadata/md5-cache/dev-ruby/railties-4.2.8
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby21] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby21] >=dev-ruby/thor-0.18.1[ruby_targets_ruby21] <dev-ruby/thor-2[ruby_targets_ruby21] >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( ~dev-ruby/actionview-4.2.8[ruby_targets_ruby21] dev-ruby/mocha:0.14[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( ~dev-ruby/actionview-4.2.8[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( ~dev-ruby/actionview-4.2.8[ruby_targets_ruby23] dev-ruby/mocha:0.14[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=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( ~dev-ruby/actionview-4.2.8[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( ~dev-ruby/actionview-4.2.8[ruby_targets_ruby23] dev-ruby/mocha:0.14[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=Tools for creating, working with, and running Rails applications
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails
-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 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.21 ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby21] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby21] >=dev-ruby/thor-0.18.1[ruby_targets_ruby21] <dev-ruby/thor-2[ruby_targets_ruby21] >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[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=>=app-eselect/eselect-rails-0.21 ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.8[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.8[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[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=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.8.tar.gz -> rails-4.2.8.tgz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- 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_=0d572703ae8a4425dc3e2e047abb10b2
diff --git a/metadata/md5-cache/dev-ruby/railties-4.2.9 b/metadata/md5-cache/dev-ruby/railties-4.2.9
index a727af6f30cc..ba5ab19374aa 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.2.9
+++ b/metadata/md5-cache/dev-ruby/railties-4.2.9
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby21] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby21] >=dev-ruby/thor-0.18.1[ruby_targets_ruby21] <dev-ruby/thor-2[ruby_targets_ruby21] >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby24] >=dev-ruby/thor-0.18.1[ruby_targets_ruby24] <dev-ruby/thor-2[ruby_targets_ruby24] >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( ~dev-ruby/actionview-4.2.9[ruby_targets_ruby21] dev-ruby/mocha:0.14[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( ~dev-ruby/actionview-4.2.9[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( ~dev-ruby/actionview-4.2.9[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( ~dev-ruby/actionview-4.2.9[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby24] >=dev-ruby/thor-0.18.1[ruby_targets_ruby24] <dev-ruby/thor-2[ruby_targets_ruby24] >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( ~dev-ruby/actionview-4.2.9[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( ~dev-ruby/actionview-4.2.9[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( ~dev-ruby/actionview-4.2.9[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Tools for creating, working with, and running Rails applications
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux
 LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.21 ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby21] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby21] >=dev-ruby/thor-0.18.1[ruby_targets_ruby21] <dev-ruby/thor-2[ruby_targets_ruby21] >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby24] >=dev-ruby/thor-0.18.1[ruby_targets_ruby24] <dev-ruby/thor-2[ruby_targets_ruby24] >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=app-eselect/eselect-rails-0.21 ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] <dev-ruby/thor-2[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby23] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] <dev-ruby/thor-2[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-4.2.9[ruby_targets_ruby24] ~dev-ruby/actionpack-4.2.9[ruby_targets_ruby24] >=dev-ruby/thor-0.18.1[ruby_targets_ruby24] <dev-ruby/thor-2[ruby_targets_ruby24] >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.9.tar.gz -> rails-4.2.9.tgz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- 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_=0f047ea2a0ce431def140a96eaff4ae8
diff --git a/metadata/md5-cache/dev-ruby/railties-5.0.3 b/metadata/md5-cache/dev-ruby/railties-5.0.3
index c69eecb70e27..7b9d1df7e4bd 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.0.3
+++ b/metadata/md5-cache/dev-ruby/railties-5.0.3
@@ -12,5 +12,5 @@ RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.3.tar.gz -> rails-5.0.3.tgz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- 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_=56bd3e7af99fadf851e1a228b99f1539
diff --git a/metadata/md5-cache/dev-ruby/railties-5.0.4 b/metadata/md5-cache/dev-ruby/railties-5.0.4
index 97222e50da83..658a721750b6 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.0.4
+++ b/metadata/md5-cache/dev-ruby/railties-5.0.4
@@ -12,5 +12,5 @@ RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.4.tar.gz -> rails-5.0.4.tgz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- 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_=3b91bf384f7c7d5958a2e3a5a195ebab
diff --git a/metadata/md5-cache/dev-ruby/railties-5.0.5 b/metadata/md5-cache/dev-ruby/railties-5.0.5
index 3b9a147ce4e5..0ab3ce663a12 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.0.5
+++ b/metadata/md5-cache/dev-ruby/railties-5.0.5
@@ -12,5 +12,5 @@ RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.5.tar.gz -> rails-5.0.5.tgz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- 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_=3b91bf384f7c7d5958a2e3a5a195ebab
diff --git a/metadata/md5-cache/dev-ruby/railties-5.1.1 b/metadata/md5-cache/dev-ruby/railties-5.1.1
index 5f2d87178884..b57544b7a713 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.1.1
+++ b/metadata/md5-cache/dev-ruby/railties-5.1.1
@@ -12,5 +12,5 @@ RESTRICT=test
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.1.tar.gz -> rails-5.1.1.tgz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- 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_=5d83564b6f8d38967d1fffb2500a5d09
diff --git a/metadata/md5-cache/dev-ruby/railties-5.1.2 b/metadata/md5-cache/dev-ruby/railties-5.1.2
index 49372f70deab..bda422d49161 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.1.2
+++ b/metadata/md5-cache/dev-ruby/railties-5.1.2
@@ -12,5 +12,5 @@ RESTRICT=test
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- 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_=ea4931cf3dda1de32b77a7c2093bae61
diff --git a/metadata/md5-cache/dev-ruby/railties-5.1.3 b/metadata/md5-cache/dev-ruby/railties-5.1.3
index eb9a07354419..266618d0f0ce 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.1.3
+++ b/metadata/md5-cache/dev-ruby/railties-5.1.3
@@ -12,5 +12,5 @@ RESTRICT=test
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.3.tar.gz -> rails-5.1.3.tgz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- 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_=ea4931cf3dda1de32b77a7c2093bae61
diff --git a/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1 b/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1
index 3d16a99c3b99..84df63c95732 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/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? ( 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/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=Extends ruby's String class with colored text on ANSI terminals
 EAPI=5
 HOMEPAGE=https://github.com/sickill/rainbow
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=amd64 hppa ppc ~sparc x86
 LICENSE=MIT
-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=https://github.com/sickill/rainbow/archive/v1.1.4.tar.gz -> rainbow-git-1.1.4.tgz
 _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_=d4e77c44d5f5c8f1ca3757931ca3529c
diff --git a/metadata/md5-cache/dev-ruby/rainbow-2.0.0-r1 b/metadata/md5-cache/dev-ruby/rainbow-2.0.0-r1
index ea7bb7f14542..15d706b89d96 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-2.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/rainbow-2.0.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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_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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Colorize printed text on ANSI terminals
 EAPI=5
 HOMEPAGE=https://github.com/sickill/rainbow
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 hppa ~ppc ~sparc x86
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/sickill/rainbow/archive/v2.0.0.tar.gz -> rainbow-git-2.0.0.tgz
 _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_=5a8426ff64886754c0cd6e9e64c2afd5
diff --git a/metadata/md5-cache/dev-ruby/rainbow-2.1.0 b/metadata/md5-cache/dev-ruby/rainbow-2.1.0
index 5c077e80c942..897813e796c6 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-2.1.0
+++ b/metadata/md5-cache/dev-ruby/rainbow-2.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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: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=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: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=Colorize printed text on ANSI terminals
 EAPI=5
 HOMEPAGE=https://github.com/sickill/rainbow
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
 LICENSE=MIT
-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=2
 SRC_URI=https://github.com/sickill/rainbow/archive/v2.1.0.tar.gz -> rainbow-git-2.1.0.tgz
 _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_=20e36ac72d377082496ed6c003081005
diff --git a/metadata/md5-cache/dev-ruby/rainbow-2.2.1 b/metadata/md5-cache/dev-ruby/rainbow-2.2.1
index 80d7b79c6469..7c73bb2e9f59 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-2.2.1
+++ b/metadata/md5-cache/dev-ruby/rainbow-2.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Colorize printed text on ANSI terminals
 EAPI=5
 HOMEPAGE=https://github.com/sickill/rainbow
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=https://github.com/sickill/rainbow/archive/v2.2.1.tar.gz -> rainbow-git-2.2.1.tgz
 _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_=1855b5653347bc3fa6e17585646b9ca3
diff --git a/metadata/md5-cache/dev-ruby/rainbow-2.2.2 b/metadata/md5-cache/dev-ruby/rainbow-2.2.2
index 6bb9603fa3c7..b5ad6e999900 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-2.2.2
+++ b/metadata/md5-cache/dev-ruby/rainbow-2.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Colorize printed text on ANSI terminals
 EAPI=6
 HOMEPAGE=https://github.com/sickill/rainbow
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=https://github.com/sickill/rainbow/archive/v2.2.2.tar.gz -> rainbow-git-2.2.2.tgz
 _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_=f0ab7701f221d7147cceb381dfeaebdb
diff --git a/metadata/md5-cache/dev-ruby/rake-0.9.6-r1 b/metadata/md5-cache/dev-ruby/rake-0.9.6-r1
index 025b45b293eb..dd2a28863919 100644
--- a/metadata/md5-cache/dev-ruby/rake-0.9.6-r1
+++ b/metadata/md5-cache/dev-ruby/rake-0.9.6-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/gzip ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) test? ( virtual/ruby-minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) test? ( virtual/ruby-minitest[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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=app-arch/gzip ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) test? ( virtual/ruby-minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Make-like scripting in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/jimweirich/rake
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-0.9.6.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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=5522fb3ed3b39b443c17357846a8e101
diff --git a/metadata/md5-cache/dev-ruby/rake-10.5.0 b/metadata/md5-cache/dev-ruby/rake-10.5.0
index 07bd0f808712..89ef450eda9d 100644
--- a/metadata/md5-cache/dev-ruby/rake-10.5.0
+++ b/metadata/md5-cache/dev-ruby/rake-10.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/gzip ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.8[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] ) 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=app-arch/gzip ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.8[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Make-like scripting in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/jimweirich/rake
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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/rake-10.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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=b55736fe48f91ea13a72c011ea5ebbf2
diff --git a/metadata/md5-cache/dev-ruby/rake-11.1.2 b/metadata/md5-cache/dev-ruby/rake-11.1.2
index 5900746621fa..0ddb184cd2d1 100644
--- a/metadata/md5-cache/dev-ruby/rake-11.1.2
+++ b/metadata/md5-cache/dev-ruby/rake-11.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/gzip ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.8[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] ) 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=app-arch/gzip ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.8[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Make-like scripting in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/ruby/rake
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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/rake-11.1.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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=db23fb3c3dba2ac0e5b92a89e5dfd31c
diff --git a/metadata/md5-cache/dev-ruby/rake-11.2.2-r1 b/metadata/md5-cache/dev-ruby/rake-11.2.2-r1
index 62767fb494ba..4e4b968c837d 100644
--- a/metadata/md5-cache/dev-ruby/rake-11.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/rake-11.2.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/gzip ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.8[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] ) 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=app-arch/gzip ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.8[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Make-like scripting in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/ruby/rake
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=https://github.com/ruby/rake/archive/v11.2.2.tar.gz -> rake-11.2.2.tar.gz
 _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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=459d8b76b1e9be0c38379b10621e5bcd
diff --git a/metadata/md5-cache/dev-ruby/rake-11.3.0 b/metadata/md5-cache/dev-ruby/rake-11.3.0
index b3ed59598721..721372a150d3 100644
--- a/metadata/md5-cache/dev-ruby/rake-11.3.0
+++ b/metadata/md5-cache/dev-ruby/rake-11.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/gzip ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.8[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] ) 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=app-arch/gzip ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.8[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Make-like scripting in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/ruby/rake
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=https://github.com/ruby/rake/archive/v11.3.0.tar.gz -> rake-11.3.0.tar.gz
 _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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=459d8b76b1e9be0c38379b10621e5bcd
diff --git a/metadata/md5-cache/dev-ruby/rake-12.0.0 b/metadata/md5-cache/dev-ruby/rake-12.0.0
index c594850adadf..3273d00d7686 100644
--- a/metadata/md5-cache/dev-ruby/rake-12.0.0
+++ b/metadata/md5-cache/dev-ruby/rake-12.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/gzip ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=app-arch/gzip ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Make-like scripting in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/ruby/rake
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v12.0.0.tar.gz -> rake-12.0.0.tar.gz
 _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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=38c0e13c065560bd792fdc6f4de1e055
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.0.2 b/metadata/md5-cache/dev-ruby/rake-compiler-1.0.2
index ddfdb9450a4b..0cd64e663c22 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.0.2
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-util/cucumber[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Provide a standard and simplified way to build and package Ruby extensions
 EAPI=5
 HOMEPAGE=https://github.com/luislavena/rake-compiler
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.0.2.tar.gz -> rake-compiler-1.0.2.tar.gz
 _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_=22f2b01ffae4f8bb054e1ccc23c60d3e
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.0.4 b/metadata/md5-cache/dev-ruby/rake-compiler-1.0.4
index e7268315d48c..ae8e9d2f1d58 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.0.4
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-util/cucumber[ruby_targets_ruby21] dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] dev-ruby/rspec:2[ruby_targets_ruby22] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] dev-ruby/rspec:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Provide a standard and simplified way to build and package Ruby extensions
 EAPI=5
 HOMEPAGE=https://github.com/luislavena/rake-compiler
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.0.4.tar.gz -> rake-compiler-1.0.4.tar.gz
 _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_=69cfb7ae2a8182e256fdea0e97b57682
diff --git a/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.1 b/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.1
index 037dd424edea..3abcf0e21b10 100644
--- a/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.1
+++ b/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( >=dev-ruby/hoe-2.9.2[ruby_targets_ruby21] test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/hoe-2.9.2[ruby_targets_ruby22] test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/hoe-2.9.2[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/open4-1.0[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/open4-1.0[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/open4-1.0[ruby_targets_ruby23] dev-ruby/rake[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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? ( >=dev-ruby/hoe-2.9.2[ruby_targets_ruby22] test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/hoe-2.9.2[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/open4-1.0[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/open4-1.0[ruby_targets_ruby23] dev-ruby/rake[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Extends Rake with remote task goodness
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/rake-remote_task
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/open4-1.0[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/open4-1.0[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/open4-1.0[ruby_targets_ruby23] dev-ruby/rake[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/open4-1.0[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/open4-1.0[ruby_targets_ruby23] dev-ruby/rake[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/rake-remote_task-2.4.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_=878f1de6e24640b606f088a3a70435af
diff --git a/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.2 b/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.2
index 8f433fb5c1b2..186393977a17 100644
--- a/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.2
+++ b/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( >=dev-ruby/hoe-2.9.2[ruby_targets_ruby21] test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/hoe-2.9.2[ruby_targets_ruby22] test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/hoe-2.9.2[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/open4-1.0[ruby_targets_ruby21] >=dev-ruby/rake-0.8[ruby_targets_ruby21] <dev-ruby/rake-12[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/open4-1.0[ruby_targets_ruby22] >=dev-ruby/rake-0.8[ruby_targets_ruby22] <dev-ruby/rake-12[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/open4-1.0[ruby_targets_ruby23] >=dev-ruby/rake-0.8[ruby_targets_ruby23] <dev-ruby/rake-12[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/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? ( >=dev-ruby/hoe-2.9.2[ruby_targets_ruby22] test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/hoe-2.9.2[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/open4-1.0[ruby_targets_ruby22] >=dev-ruby/rake-0.8[ruby_targets_ruby22] <dev-ruby/rake-12[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/open4-1.0[ruby_targets_ruby23] >=dev-ruby/rake-0.8[ruby_targets_ruby23] <dev-ruby/rake-12[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/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=Extends Rake with remote task goodness
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/rake-remote_task
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/open4-1.0[ruby_targets_ruby21] >=dev-ruby/rake-0.8[ruby_targets_ruby21] <dev-ruby/rake-12[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/open4-1.0[ruby_targets_ruby22] >=dev-ruby/rake-0.8[ruby_targets_ruby22] <dev-ruby/rake-12[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/open4-1.0[ruby_targets_ruby23] >=dev-ruby/rake-0.8[ruby_targets_ruby23] <dev-ruby/rake-12[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/open4-1.0[ruby_targets_ruby22] >=dev-ruby/rake-0.8[ruby_targets_ruby22] <dev-ruby/rake-12[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/open4-1.0[ruby_targets_ruby23] >=dev-ruby/rake-0.8[ruby_targets_ruby23] <dev-ruby/rake-12[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/rake-remote_task-2.4.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_=2275126282139cd5c126f63346ed122e
diff --git a/metadata/md5-cache/dev-ruby/rash-0.4.0-r2 b/metadata/md5-cache/dev-ruby/rash-0.4.0-r2
index 3abe74a71b20..37e7cbf4e2c6 100644
--- a/metadata/md5-cache/dev-ruby/rash-0.4.0-r2
+++ b/metadata/md5-cache/dev-ruby/rash-0.4.0-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Rash is an extension to Hashie
 EAPI=5
 HOMEPAGE=https://github.com/tcocca/rash
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rash-0.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_=d8b125cf56baf0835b8bae37e7d2689a
diff --git a/metadata/md5-cache/dev-ruby/rash_alt-0.4.3 b/metadata/md5-cache/dev-ruby/rash_alt-0.4.3
index 84fd52713ab4..28eb917b3011 100644
--- a/metadata/md5-cache/dev-ruby/rash_alt-0.4.3
+++ b/metadata/md5-cache/dev-ruby/rash_alt-0.4.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Rash alt version for Hashie's own Rash
 EAPI=6
 HOMEPAGE=https://github.com/shishi/rash_alt
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-3.4:3[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rash_alt-0.4.3.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_=ca52210389d866539d651f316c92a26f
diff --git a/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.6 b/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.6
index ceb050ce32ab..f48473127959 100644
--- a/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.6
+++ b/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sci-libs/gsl-1.15 <sci-libs/gsl-2.1 ruby_targets_ruby21? ( dev-ruby/narray[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/narray[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/narray[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( dev-ruby/narray[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/narray[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/narray[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=>=sci-libs/gsl-1.15 <sci-libs/gsl-2.1 ruby_targets_ruby22? ( dev-ruby/narray[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/narray[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( dev-ruby/narray[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/narray[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Ruby interface to GNU Scientific Library
 EAPI=5
 HOMEPAGE=https://github.com/SciRuby/rb-gsl
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=sci-libs/gsl-1.15 <sci-libs/gsl-2.1 ruby_targets_ruby21? ( dev-ruby/narray[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/narray[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/narray[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=>=sci-libs/gsl-1.15 <sci-libs/gsl-2.1 ruby_targets_ruby22? ( dev-ruby/narray[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/narray[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/gsl-1.16.0.6.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_=3d3de6092b9df7484e18b54392057b76
diff --git a/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.1 b/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.1
index 981469eec56f..0d1b7ddbe7da 100644
--- a/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.1
+++ b/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sci-libs/gsl-2.3[deprecated] ruby_targets_ruby21? ( dev-ruby/narray[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/narray[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/narray[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( dev-ruby/narray[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/narray[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/narray[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=>=sci-libs/gsl-2.3[deprecated] ruby_targets_ruby22? ( dev-ruby/narray[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/narray[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( dev-ruby/narray[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/narray[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Ruby interface to GNU Scientific Library
 EAPI=5
 HOMEPAGE=https://github.com/SciRuby/rb-gsl
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=sci-libs/gsl-2.3[deprecated] ruby_targets_ruby21? ( dev-ruby/narray[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/narray[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/narray[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=>=sci-libs/gsl-2.3[deprecated] ruby_targets_ruby22? ( dev-ruby/narray[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/narray[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/gsl-2.1.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_=ab852d4d4e7dafa4f20f5de96becc434
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.10 b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.10
index c86aff9cced5..d76965d80c2a 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.10
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.10
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ffi[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ffi[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ffi[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A thorough inotify wrapper for Ruby using FFI
 EAPI=5
 HOMEPAGE=https://github.com/nex3/rb-inotify
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ffi[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ffi[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ffi[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-inotify-0.9.10.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_=4e422c4c4a54a65e54d12737ba31dbcb
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5-r1 b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5-r1
index c4b109c302ce..32d7038ba645 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5-r1
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ffi[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( 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=test? ( ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A thorough inotify wrapper for Ruby using FFI
 EAPI=5
 HOMEPAGE=https://github.com/nex3/rb-inotify
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test
 KEYWORDS=amd64 arm ppc ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ffi[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ffi[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? ( virtual/ruby-ffi[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/rb-inotify-0.9.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_=4cd435e7d2e7b9fc087958970049d5c9
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.8 b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.8
index 564263f2e6de..6ed6b09b7777 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.8
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ffi[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ffi[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ffi[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A thorough inotify wrapper for Ruby using FFI
 EAPI=5
 HOMEPAGE=https://github.com/nex3/rb-inotify
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ffi[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ffi[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ffi[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-inotify-0.9.8.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_=14de6a5c6279f1fb2b21564e59a44a48
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.9 b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.9
index 3602519b82c2..937e8228ae26 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.9
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( virtual/ruby-ffi[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ffi[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ffi[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A thorough inotify wrapper for Ruby using FFI
 EAPI=5
 HOMEPAGE=https://github.com/nex3/rb-inotify
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ffi[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ffi[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ffi[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-inotify-0.9.9.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_=57f19e85fb7ae45a0a3f03ef9e0eced2
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-0.5.3 b/metadata/md5-cache/dev-ruby/rb-readline-0.5.3
index 7d4a522dd8e1..e58671b67ee7 100644
--- a/metadata/md5-cache/dev-ruby/rb-readline-0.5.3
+++ b/metadata/md5-cache/dev-ruby/rb-readline-0.5.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] >=dev-ruby/minitest-5.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] >=dev-ruby/minitest-5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] >=dev-ruby/minitest-5.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? ( 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/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? ( dev-ruby/rake[ruby_targets_ruby22] >=dev-ruby/minitest-5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] >=dev-ruby/minitest-5.2[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/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=Ruby implementation of the GNU readline C library
 EAPI=5
 HOMEPAGE=http://rubygems.org/gems/rb-readline
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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/rb-readline-0.5.3.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_=3b83b285f2fe041fed67ff7298731e74
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-0.5.4 b/metadata/md5-cache/dev-ruby/rb-readline-0.5.4
index 6a0272408451..2d064d5fee1d 100644
--- a/metadata/md5-cache/dev-ruby/rb-readline-0.5.4
+++ b/metadata/md5-cache/dev-ruby/rb-readline-0.5.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] >=dev-ruby/minitest-5.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] >=dev-ruby/minitest-5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] >=dev-ruby/minitest-5.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] >=dev-ruby/minitest-5.2[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] >=dev-ruby/minitest-5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] >=dev-ruby/minitest-5.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] >=dev-ruby/minitest-5.2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby implementation of the GNU readline C library
 EAPI=5
 HOMEPAGE=http://rubygems.org/gems/rb-readline
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-readline-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_=2dabb020a259a91f7e52b87fdc78b88c
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-0.5.5 b/metadata/md5-cache/dev-ruby/rb-readline-0.5.5
index a3384467d50b..56f5a9687b94 100644
--- a/metadata/md5-cache/dev-ruby/rb-readline-0.5.5
+++ b/metadata/md5-cache/dev-ruby/rb-readline-0.5.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] >=dev-ruby/minitest-5.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] >=dev-ruby/minitest-5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] >=dev-ruby/minitest-5.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] >=dev-ruby/minitest-5.2[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] >=dev-ruby/minitest-5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] >=dev-ruby/minitest-5.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] >=dev-ruby/minitest-5.2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby implementation of the GNU readline C library
 EAPI=6
 HOMEPAGE=http://rubygems.org/gems/rb-readline
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-readline-0.5.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_=cfe27355797c1317155302ac152e3a65
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-r7-0.5.2.0 b/metadata/md5-cache/dev-ruby/rb-readline-r7-0.5.2.0
index 2d58116bf058..b74368b21e49 100644
--- a/metadata/md5-cache/dev-ruby/rb-readline-r7-0.5.2.0
+++ b/metadata/md5-cache/dev-ruby/rb-readline-r7-0.5.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-ruby/minitest dev-ruby/rake ) 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/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=test? ( dev-ruby/minitest dev-ruby/rake ) 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/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=Ruby implementation of the GNU readline C library forked by r7
 EAPI=5
 HOMEPAGE=http://rubygems.org/gems/rb-readline-r7
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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/rb-readline-r7-0.5.2.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_=5e2de2a4a0e6df248592fbec53eae3c2
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-4.0.2 b/metadata/md5-cache/dev-ruby/rbnacl-4.0.2
index 550a64f8b1d9..036d64b8e3ad 100644
--- a/metadata/md5-cache/dev-ruby/rbnacl-4.0.2
+++ b/metadata/md5-cache/dev-ruby/rbnacl-4.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=mirror://rubygems/rbnacl-4.0.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_=f935e825fbba106482fc9ecef856a94b
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-5.0.0 b/metadata/md5-cache/dev-ruby/rbnacl-5.0.0
index c76e457757c1..f37f030f9690 100644
--- a/metadata/md5-cache/dev-ruby/rbnacl-5.0.0
+++ b/metadata/md5-cache/dev-ruby/rbnacl-5.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5
 SRC_URI=mirror://rubygems/rbnacl-5.0.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_=58a191e7be95d8c28eced7fcd38c3bba
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.19.0 b/metadata/md5-cache/dev-ruby/rbpdf-1.19.0
index ac118256a0df..ca249f72c5eb 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.19.0
+++ b/metadata/md5-cache/dev-ruby/rbpdf-1.19.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/actionview:*[ruby_targets_ruby21] dev-ruby/htmlentities[ruby_targets_ruby21] dev-ruby/rbpdf-font[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/actionview:*[ruby_targets_ruby22] dev-ruby/htmlentities[ruby_targets_ruby22] dev-ruby/rbpdf-font[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[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/test-unit-3[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/actionview:*[ruby_targets_ruby22] dev-ruby/htmlentities[ruby_targets_ruby22] dev-ruby/rbpdf-font[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Ruby on Rails RBPDF plugin
 EAPI=5
 HOMEPAGE=https://github.com/naitoh/rbpdf
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/actionview:*[ruby_targets_ruby21] dev-ruby/htmlentities[ruby_targets_ruby21] dev-ruby/rbpdf-font[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/actionview:*[ruby_targets_ruby22] dev-ruby/htmlentities[ruby_targets_ruby22] dev-ruby/rbpdf-font[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/actionview:*[ruby_targets_ruby22] dev-ruby/htmlentities[ruby_targets_ruby22] dev-ruby/rbpdf-font[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/rbpdf-1.19.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_=383028902f7ca73ac609560cf2d5ec67
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.19.1 b/metadata/md5-cache/dev-ruby/rbpdf-1.19.1
index 942e8cd9700a..b8b189f6c17d 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.19.1
+++ b/metadata/md5-cache/dev-ruby/rbpdf-1.19.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/actionview:*[ruby_targets_ruby21] dev-ruby/htmlentities[ruby_targets_ruby21] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/actionview:*[ruby_targets_ruby22] dev-ruby/htmlentities[ruby_targets_ruby22] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/actionview:*[ruby_targets_ruby23] dev-ruby/htmlentities[ruby_targets_ruby23] =dev-ruby/rbpdf-font-1.19*[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? ( 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/test-unit-3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/actionview:*[ruby_targets_ruby22] dev-ruby/htmlentities[ruby_targets_ruby22] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/actionview:*[ruby_targets_ruby23] dev-ruby/htmlentities[ruby_targets_ruby23] =dev-ruby/rbpdf-font-1.19*[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? ( 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=Ruby on Rails RBPDF plugin
 EAPI=5
 HOMEPAGE=https://github.com/naitoh/rbpdf
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/actionview:*[ruby_targets_ruby21] dev-ruby/htmlentities[ruby_targets_ruby21] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/actionview:*[ruby_targets_ruby22] dev-ruby/htmlentities[ruby_targets_ruby22] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/actionview:*[ruby_targets_ruby23] dev-ruby/htmlentities[ruby_targets_ruby23] =dev-ruby/rbpdf-font-1.19*[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/actionview:*[ruby_targets_ruby22] dev-ruby/htmlentities[ruby_targets_ruby22] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/actionview:*[ruby_targets_ruby23] dev-ruby/htmlentities[ruby_targets_ruby23] =dev-ruby/rbpdf-font-1.19*[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/rbpdf-1.19.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_=655b04040e715800fd8017e484e9017b
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.19.2 b/metadata/md5-cache/dev-ruby/rbpdf-1.19.2
index 332e531a6fe9..ce98a6e36515 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.19.2
+++ b/metadata/md5-cache/dev-ruby/rbpdf-1.19.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/actionview:*[ruby_targets_ruby21] dev-ruby/htmlentities[ruby_targets_ruby21] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/actionview:*[ruby_targets_ruby22] dev-ruby/htmlentities[ruby_targets_ruby22] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/actionview:*[ruby_targets_ruby23] dev-ruby/htmlentities[ruby_targets_ruby23] =dev-ruby/rbpdf-font-1.19*[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? ( 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/test-unit-3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/actionview:*[ruby_targets_ruby22] dev-ruby/htmlentities[ruby_targets_ruby22] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/actionview:*[ruby_targets_ruby23] dev-ruby/htmlentities[ruby_targets_ruby23] =dev-ruby/rbpdf-font-1.19*[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? ( 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=Ruby on Rails RBPDF plugin
 EAPI=5
 HOMEPAGE=https://github.com/naitoh/rbpdf
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/actionview:*[ruby_targets_ruby21] dev-ruby/htmlentities[ruby_targets_ruby21] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/actionview:*[ruby_targets_ruby22] dev-ruby/htmlentities[ruby_targets_ruby22] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/actionview:*[ruby_targets_ruby23] dev-ruby/htmlentities[ruby_targets_ruby23] =dev-ruby/rbpdf-font-1.19*[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/actionview:*[ruby_targets_ruby22] dev-ruby/htmlentities[ruby_targets_ruby22] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/actionview:*[ruby_targets_ruby23] dev-ruby/htmlentities[ruby_targets_ruby23] =dev-ruby/rbpdf-font-1.19*[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/rbpdf-1.19.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_=655b04040e715800fd8017e484e9017b
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.0-r1 b/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.0-r1
index 2cd1a7fedc2d..87a2691e1cab 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.0-r1
+++ b/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( >=dev-ruby/test-unit-3:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/test-unit-3:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/test-unit-3: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? ( 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/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? ( >=dev-ruby/test-unit-3:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/test-unit-3:2[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/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=Font files for the Ruby on Rails RBPDF plugin
 EAPI=5
 HOMEPAGE=https://github.com/naitoh/rbpdf
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
-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/rbpdf-font-1.19.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_=915862e18e81eb4d2fae7418372a0334
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1 b/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1
index d0d6632dcf81..cebcbd5b9bf8 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1
+++ b/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( >=dev-ruby/test-unit-3:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/test-unit-3:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/test-unit-3:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/test-unit-3:2[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( >=dev-ruby/test-unit-3:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/test-unit-3:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/test-unit-3:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Font files for the Ruby on Rails RBPDF plugin
 EAPI=5
 HOMEPAGE=https://github.com/naitoh/rbpdf
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rbpdf-font-1.19.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_=5458f3f8c938e64e305cee74cd99a594
diff --git a/metadata/md5-cache/dev-ruby/rbtree-0.4.2-r1 b/metadata/md5-cache/dev-ruby/rbtree-0.4.2-r1
index 2a927c356866..acc0ad1c806a 100644
--- a/metadata/md5-cache/dev-ruby/rbtree-0.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/rbtree-0.4.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Ruby/RBTree module
 EAPI=5
 HOMEPAGE=http://www.geocities.co.jp/SiliconValley-PaloAlto/3388/rbtree/README.html
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rbtree-0.4.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_=63810a835a0a9f1565fce100a16857be
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.14.3 b/metadata/md5-cache/dev-ruby/rcairo-1.14.3
index fbe9b748d91d..3719162d9005 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.14.3
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.14.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] dev-ruby/ruby-glib2[ruby_targets_ruby21] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] dev-ruby/ruby-glib2[ruby_targets_ruby22] test? ( >=dev-ruby/test-unit-2.1.0-r1: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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] dev-ruby/ruby-glib2[ruby_targets_ruby22] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Ruby bindings for cairo
 EAPI=5
 HOMEPAGE=http://cairographics.org/rcairo/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=|| ( Ruby GPL-2 )
-RDEPEND=>=x11-libs/cairo-1.2.0[svg] 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=>=x11-libs/cairo-1.2.0[svg] 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/cairo-1.14.3.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_=16ca498eef60b70698178eeb3453e0ae
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.15.4 b/metadata/md5-cache/dev-ruby/rcairo-1.15.4
index 945a922d9cb4..22a19c8c9a98 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.15.4
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.15.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby21? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby21] dev-ruby/ruby-glib2[ruby_targets_ruby21] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby22] dev-ruby/ruby-glib2[ruby_targets_ruby22] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby23] dev-ruby/ruby-glib2[ruby_targets_ruby23] test? ( >=dev-ruby/test-unit-2.1.0-r1: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] ) 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=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby22? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby22] dev-ruby/ruby-glib2[ruby_targets_ruby22] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby23] dev-ruby/ruby-glib2[ruby_targets_ruby23] test? ( >=dev-ruby/test-unit-2.1.0-r1: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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Ruby bindings for cairo
 EAPI=5
 HOMEPAGE=https://cairographics.org/rcairo/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Ruby GPL-2 )
-RDEPEND=>=x11-libs/cairo-1.2.0[svg] 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=>=x11-libs/cairo-1.2.0[svg] 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/cairo-1.15.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_=88149236dfae89603d6dd8757d4d4a8a
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.15.5 b/metadata/md5-cache/dev-ruby/rcairo-1.15.5
index 98709f848c21..a21b25a7192a 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.15.5
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.15.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby21? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby21] dev-ruby/ruby-glib2[ruby_targets_ruby21] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby22] dev-ruby/ruby-glib2[ruby_targets_ruby22] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby23] dev-ruby/ruby-glib2[ruby_targets_ruby23] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby24] dev-ruby/ruby-glib2[ruby_targets_ruby24] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby22? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby22] dev-ruby/ruby-glib2[ruby_targets_ruby22] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby23] dev-ruby/ruby-glib2[ruby_targets_ruby23] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby24] dev-ruby/ruby-glib2[ruby_targets_ruby24] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby bindings for cairo
 EAPI=5
 HOMEPAGE=https://cairographics.org/rcairo/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Ruby GPL-2 )
-RDEPEND=>=x11-libs/cairo-1.2.0[svg] 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/cairo-1.15.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_=021ce3d4af331b2f1e0a6f5b5d567d31
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.15.9-r1 b/metadata/md5-cache/dev-ruby/rcairo-1.15.9-r1
index 1ff5a22cd0e4..3e674d09b4fa 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.15.9-r1
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.15.9-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby21? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby21] dev-ruby/ruby-glib2[ruby_targets_ruby21] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby22] dev-ruby/ruby-glib2[ruby_targets_ruby22] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby23] dev-ruby/ruby-glib2[ruby_targets_ruby23] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby24] dev-ruby/ruby-glib2[ruby_targets_ruby24] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby22? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby22] dev-ruby/ruby-glib2[ruby_targets_ruby22] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby23] dev-ruby/ruby-glib2[ruby_targets_ruby23] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/pkg-config-1.1.5[ruby_targets_ruby24] dev-ruby/ruby-glib2[ruby_targets_ruby24] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby bindings for cairo
 EAPI=6
 HOMEPAGE=https://cairographics.org/rcairo/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Ruby GPL-2 )
-RDEPEND=>=x11-libs/cairo-1.2.0[svg] 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/cairo-1.15.9.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_=e066035c9333806a93d3fa16227b5510
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.1.8 b/metadata/md5-cache/dev-ruby/rdiscount-2.1.8
index 7b2ff7b97387..595e235d9830 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.1.8
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.1.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Implementation of John Gruber's Markdown
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/rdiscount
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-macos
 LICENSE=MIT
-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/rdiscount-2.1.8.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_=f2ab5a6b3c57a677882afc356939ce62
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1 b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1
index edca077fa84c..d330848363a7 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Implementation of John Gruber's Markdown
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/rdiscount
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos ~x64-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdiscount-2.2.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_=3734d752c2a146555fe4f2bd8dd982e8
diff --git a/metadata/md5-cache/dev-ruby/rdoc-4.2.0 b/metadata/md5-cache/dev-ruby/rdoc-4.2.0
index 4fdef07299aa..05b63c3a6c3a 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-4.2.0
+++ b/metadata/md5-cache/dev-ruby/rdoc-4.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/racc[ruby_targets_ruby21] test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/racc[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( =dev-ruby/json-1*[ruby_targets_ruby21] >=dev-ruby/json-1.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/json-1*[ruby_targets_ruby22] >=dev-ruby/json-1.4[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? ( dev-ruby/racc[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( =dev-ruby/json-1*[ruby_targets_ruby22] >=dev-ruby/json-1.4[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=An extended version of the RDoc library from Ruby 1.8
 EAPI=5
 HOMEPAGE=https://github.com/rdoc/rdoc/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/json-1*[ruby_targets_ruby21] >=dev-ruby/json-1.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/json-1*[ruby_targets_ruby22] >=dev-ruby/json-1.4[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/json-1*[ruby_targets_ruby22] >=dev-ruby/json-1.4[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/rdoc-4.2.0.gem
 _eclass_exported_funcs=pkg_postinst:- 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_=b9ea964a765c5ccf6be9cd31f4e298ec
diff --git a/metadata/md5-cache/dev-ruby/rdoc-4.2.2 b/metadata/md5-cache/dev-ruby/rdoc-4.2.2
index 91947109528e..15343919de46 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-4.2.2
+++ b/metadata/md5-cache/dev-ruby/rdoc-4.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/racc[ruby_targets_ruby21] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/racc[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/racc[ruby_targets_ruby23] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.4:0[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? ( dev-ruby/racc[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/racc[ruby_targets_ruby23] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.4:0[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=An extended version of the RDoc library from Ruby 1.8
 EAPI=5
 HOMEPAGE=https://github.com/rdoc/rdoc/
-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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.4:0[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/json-1.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.4:0[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/rdoc-4.2.2.gem
 _eclass_exported_funcs=pkg_postinst:- 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_=be4cec63ffe2191f261d09811a6b24c9
diff --git a/metadata/md5-cache/dev-ruby/rdoc-4.3.0 b/metadata/md5-cache/dev-ruby/rdoc-4.3.0
index 77ed257edc7e..68b8a8a7ec3f 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-4.3.0
+++ b/metadata/md5-cache/dev-ruby/rdoc-4.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/racc[ruby_targets_ruby21] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/racc[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/racc[ruby_targets_ruby23] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.4:0[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? ( dev-ruby/racc[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/racc[ruby_targets_ruby23] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.4:0[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=An extended version of the RDoc library from Ruby 1.8
 EAPI=5
 HOMEPAGE=https://github.com/rdoc/rdoc/
-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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.4:0[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/json-1.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.4:0[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/rdoc-4.3.0.gem
 _eclass_exported_funcs=pkg_postinst:- 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_=be4cec63ffe2191f261d09811a6b24c9
diff --git a/metadata/md5-cache/dev-ruby/rdoc-5.0.0-r3 b/metadata/md5-cache/dev-ruby/rdoc-5.0.0-r3
index 72383515bd8b..c3d6e6b81bb4 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-5.0.0-r3
+++ b/metadata/md5-cache/dev-ruby/rdoc-5.0.0-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/kpeg[ruby_targets_ruby21] dev-ruby/racc[ruby_targets_ruby21] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/kpeg[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/kpeg[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/kpeg[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/json:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json:2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-ruby/kpeg[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/kpeg[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/kpeg[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/json:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
 EAPI=5
 HOMEPAGE=https://github.com/rdoc/rdoc/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=Ruby MIT
-RDEPEND=>=app-eselect/eselect-ruby-20161226 ruby_targets_ruby21? ( dev-ruby/json:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json:2[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=app-eselect/eselect-ruby-20161226 ruby_targets_ruby22? ( dev-ruby/json:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/rdoc/rdoc/archive/v5.0.0.tar.gz -> rdoc-5.0.0.tar.gz
 _eclass_exported_funcs=pkg_postinst:- 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_=193205d674e5676c56608aa598be736e
diff --git a/metadata/md5-cache/dev-ruby/rdoc-5.1.0 b/metadata/md5-cache/dev-ruby/rdoc-5.1.0
index 1987cbb8e782..5bd0187646b5 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-5.1.0
+++ b/metadata/md5-cache/dev-ruby/rdoc-5.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/kpeg[ruby_targets_ruby21] dev-ruby/racc[ruby_targets_ruby21] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/kpeg[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/kpeg[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/kpeg[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/json:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json:2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-ruby/kpeg[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/kpeg[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/kpeg[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/json:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
 EAPI=5
 HOMEPAGE=https://github.com/rdoc/rdoc/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby MIT
-RDEPEND=>=app-eselect/eselect-ruby-20161226 ruby_targets_ruby21? ( dev-ruby/json:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json:2[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=app-eselect/eselect-ruby-20161226 ruby_targets_ruby22? ( dev-ruby/json:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/rdoc/rdoc/archive/v5.1.0.tar.gz -> rdoc-5.1.0.tar.gz
 _eclass_exported_funcs=pkg_postinst:- 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_=f9f2ba0b15ddadfc57a2f0a141d8c5ee
diff --git a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2 b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
index f180d90c8505..cc5763eb6706 100644
--- a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
+++ b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A multipurpose documentation format for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/uwabami/rdtool
-IUSE=emacs elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=emacs elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=Ruby GPL-2
-RDEPEND=emacs? ( virtual/emacs ) 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=emacs? ( virtual/emacs ) 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/rdtool-0.6.38.gem
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- 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_=elisp-common	19ff54b35acd0bf2a14831a308a57753	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_=elisp-common	19ff54b35acd0bf2a14831a308a57753	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_=2cf8133d535dad790ff83c15ae6911b7
diff --git a/metadata/md5-cache/dev-ruby/recog-2.0.14-r1 b/metadata/md5-cache/dev-ruby/recog-2.0.14-r1
index 3c34896b403d..9bd9775b691c 100644
--- a/metadata/md5-cache/dev-ruby/recog-2.0.14-r1
+++ b/metadata/md5-cache/dev-ruby/recog-2.0.14-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/regexp_parser[ruby_targets_ruby21] dev-ruby/rspec:3[ruby_targets_ruby21] dev-util/aruba[ruby_targets_ruby21] dev-util/cucumber[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/regexp_parser[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] dev-util/aruba[ruby_targets_ruby22] dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/regexp_parser[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] dev-util/aruba[ruby_targets_ruby22] dev-util/cucumber[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Pattern recognition for hosts, services, and content
 EAPI=5
 HOMEPAGE=https://github.com/rapid7/recog
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] !<dev-ruby/recog-2.0.6-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] !<dev-ruby/recog-2.0.6-r1[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/nokogiri[ruby_targets_ruby22] !<dev-ruby/recog-2.0.6-r1[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=2.0.14
 SRC_URI=mirror://rubygems/recog-2.0.14.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_=46e8e84a64041af6e8420512bdc96dde
diff --git a/metadata/md5-cache/dev-ruby/recog-2.1.6-r1 b/metadata/md5-cache/dev-ruby/recog-2.1.6-r1
index f4484b48ec8f..5295a4ed071f 100644
--- a/metadata/md5-cache/dev-ruby/recog-2.1.6-r1
+++ b/metadata/md5-cache/dev-ruby/recog-2.1.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby23 )
 SLOT=2.1.6
 SRC_URI=mirror://rubygems/recog-2.1.6.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_=bd0f801419574254513dddee53642681
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.3.4 b/metadata/md5-cache/dev-ruby/redcarpet-3.3.4
index 39ca2ee23c1d..0afa585c1330 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.3.4
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.3.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri[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/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/nokogiri[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri[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/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=A Ruby wrapper for Upskirt
 EAPI=5
 HOMEPAGE=https://github.com/vmg/redcarpet
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=MIT
-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=https://github.com/vmg/redcarpet/archive/v3.3.4.tar.gz -> redcarpet-3.3.4.tar.gz
 _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_=319508a0f01dc53b13bc7768dc686c3a
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.4.0 b/metadata/md5-cache/dev-ruby/redcarpet-3.4.0
index 80e57fbe55e6..8d80fe5cdd22 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.4.0
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Ruby wrapper for Upskirt
 EAPI=5
 HOMEPAGE=https://github.com/vmg/redcarpet
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 arm ~arm64 ppc ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/vmg/redcarpet/archive/v3.4.0.tar.gz -> redcarpet-3.4.0.tar.gz
 _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_=d31e9018710270aea0eb82e25359e8d3
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r4 b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r4
index 7c6e917f7a99..66939e0048e4 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r4
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby21? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] >=dev-ruby/rake-compiler-0.7.1[ruby_targets_ruby21] test? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] >=dev-ruby/rake-compiler-0.7.1[ruby_targets_ruby22] test? ( >=dev-ruby/diff-lcs-1.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/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_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==dev-util/ragel-6* ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] >=dev-ruby/rake-compiler-0.7.1[ruby_targets_ruby22] test? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A module for using Textile in Ruby
 EAPI=5
 HOMEPAGE=http://redcloth.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jgarber/redcloth/tarball/v4.2.9 -> RedCloth-git-4.2.9.tgz
 _eclass_exported_funcs=pkg_setup:- 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_=6b02101c0d611875c450ae5580e26438
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.3.2 b/metadata/md5-cache/dev-ruby/redcloth-4.3.2
index ed6c350b42e7..84b2a0e79e54 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.3.2
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.3.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby21? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] >=dev-ruby/rake-compiler-0.7.1[ruby_targets_ruby21] test? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] >=dev-ruby/rake-compiler-0.7.1[ruby_targets_ruby22] test? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] >=dev-ruby/rake-compiler-0.7.1[ruby_targets_ruby23] test? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] >=dev-ruby/rake-compiler-0.7.1[ruby_targets_ruby24] test? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND==dev-util/ragel-6* ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] >=dev-ruby/rake-compiler-0.7.1[ruby_targets_ruby22] test? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] >=dev-ruby/rake-compiler-0.7.1[ruby_targets_ruby23] test? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] >=dev-ruby/rake-compiler-0.7.1[ruby_targets_ruby24] test? ( >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A module for using Textile in Ruby
 EAPI=5
 HOMEPAGE=http://redcloth.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/jgarber/redcloth/archive/v4.3.2.tar.gz -> RedCloth-4.3.2.tar.gz
 _eclass_exported_funcs=pkg_setup:- 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_=14f1109ffc7c1af169be1df8631b00ce
diff --git a/metadata/md5-cache/dev-ruby/redis-3.3.2 b/metadata/md5-cache/dev-ruby/redis-3.3.2
index 2310b03f6601..1d8b015aaa65 100644
--- a/metadata/md5-cache/dev-ruby/redis-3.3.2
+++ b/metadata/md5-cache/dev-ruby/redis-3.3.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=dev-db/redis-3.2.0 ) 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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=test? ( >=dev-db/redis-3.2.0 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=A Ruby client library for Redis
 EAPI=5
 HOMEPAGE=https://github.com/redis/redis-rb
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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=https://github.com/redis/redis-rb/archive/v3.3.2.tar.gz -> redis-rb-3.3.2.tar.gz
 _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_=6abfe6c7511be588600b06b731ab9933
diff --git a/metadata/md5-cache/dev-ruby/redis-3.3.3 b/metadata/md5-cache/dev-ruby/redis-3.3.3
index c29f65d279c7..864daf9b7b59 100644
--- a/metadata/md5-cache/dev-ruby/redis-3.3.3
+++ b/metadata/md5-cache/dev-ruby/redis-3.3.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=dev-db/redis-3.2.0 ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( >=dev-db/redis-3.2.0 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Ruby client library for Redis
 EAPI=6
 HOMEPAGE=https://github.com/redis/redis-rb
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/redis/redis-rb/archive/v3.3.3.tar.gz -> redis-rb-3.3.3.tar.gz
 _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_=cc35f2f85ecc4946363140a4e0255826
diff --git a/metadata/md5-cache/dev-ruby/ref-2.0.0 b/metadata/md5-cache/dev-ruby/ref-2.0.0
index e5dda54a0484..d138b719f453 100644
--- a/metadata/md5-cache/dev-ruby/ref-2.0.0
+++ b/metadata/md5-cache/dev-ruby/ref-2.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Implements weak, soft, and strong references in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/ruby-concurrency/ref
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=https://github.com/ruby-concurrency/ref/archive/v2.0.0.tar.gz -> ref-2.0.0.tar.gz
 _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_=91bf2c03e4a12c818a8e81b51e1624c7
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-0.4.3 b/metadata/md5-cache/dev-ruby/regexp_parser-0.4.3
index 9d062d577d34..31f8cb548858 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-0.4.3
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-0.4.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND==dev-util/ragel-6* ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressions
 EAPI=5
 HOMEPAGE=https://github.com/ammar/regexp_parser
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v0.4.3.tar.gz -> regexp_parser-0.4.3.tar.gz
 _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_=5447a492e9329c06954a4cf09cf7d957
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-0.4.4 b/metadata/md5-cache/dev-ruby/regexp_parser-0.4.4
index 66d6cda96708..ce947a7c39fc 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-0.4.4
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-0.4.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND==dev-util/ragel-6* ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressions
 EAPI=6
 HOMEPAGE=https://github.com/ammar/regexp_parser
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v0.4.4.tar.gz -> regexp_parser-0.4.4.tar.gz
 _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_=c6b5a6d6322a7934e33c2bce06c8ddca
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.0.5 b/metadata/md5-cache/dev-ruby/request_store-1.0.5
index cd05b062d5be..1f8fa367730f 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.0.5
+++ b/metadata/md5-cache/dev-ruby/request_store-1.0.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Per-request global storage for Rack
 EAPI=5
 HOMEPAGE=https://github.com/steveklabnik/request_store
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.0.5
 SRC_URI=mirror://rubygems/request_store-1.0.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_=a6c34689de181bb1c8b72ca40a7b5145
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.3.1 b/metadata/md5-cache/dev-ruby/request_store-1.3.1
index 0632c7820d23..df0bac16171c 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.3.1
+++ b/metadata/md5-cache/dev-ruby/request_store-1.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/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? ( 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/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=Per-request global storage for Rack
 EAPI=5
 HOMEPAGE=https://github.com/steveklabnik/request_store
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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/request_store-1.3.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_=a0a86c50ba505fbf66eb08b38214ac3d
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.3.2 b/metadata/md5-cache/dev-ruby/request_store-1.3.2
index 9b979677df06..4948653af04c 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.3.2
+++ b/metadata/md5-cache/dev-ruby/request_store-1.3.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Per-request global storage for Rack
 EAPI=5
 HOMEPAGE=https://github.com/steveklabnik/request_store
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/request_store-1.3.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_=ad291ef389d85a6f08d221394cf34a88
diff --git a/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r3 b/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r3
index b882c94800bd..90023a0745f5 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r3
+++ b/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/webmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16[ruby_targets_ruby21] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16[ruby_targets_ruby22] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16[ruby_targets_ruby23] >=dev-ruby/netrc-0.7:0[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=ruby_targets_ruby22? ( test? ( dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16[ruby_targets_ruby22] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16[ruby_targets_ruby23] >=dev-ruby/netrc-0.7:0[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Simple Simple HTTP and REST client for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/archiloque/rest-client
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16[ruby_targets_ruby21] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16[ruby_targets_ruby22] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16[ruby_targets_ruby23] >=dev-ruby/netrc-0.7:0[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/http-cookie-1.0.2:0[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16[ruby_targets_ruby22] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16[ruby_targets_ruby23] >=dev-ruby/netrc-0.7:0[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/rest-client-1.8.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_=d4bfa732fe6c7e37a9f97687989bb2d3
diff --git a/metadata/md5-cache/dev-ruby/rest-client-2.0.1 b/metadata/md5-cache/dev-ruby/rest-client-2.0.1
index 249be8417452..e5758f886db9 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-2.0.1
+++ b/metadata/md5-cache/dev-ruby/rest-client-2.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/webmock:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock:2[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] <dev-ruby/mime-types-4:*[ruby_targets_ruby21] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby21] !!<dev-ruby/rest-client-1.8.0-r3:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby22] !!<dev-ruby/rest-client-1.8.0-r3:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby23] !!<dev-ruby/rest-client-1.8.0-r3:0[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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/webmock:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock:2[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby22] !!<dev-ruby/rest-client-1.8.0-r3:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby23] !!<dev-ruby/rest-client-1.8.0-r3:0[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=Simple Simple HTTP and REST client for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/archiloque/rest-client
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] <dev-ruby/mime-types-4:*[ruby_targets_ruby21] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby21] !!<dev-ruby/rest-client-1.8.0-r3:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby22] !!<dev-ruby/rest-client-1.8.0-r3:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby23] !!<dev-ruby/rest-client-1.8.0-r3:0[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/http-cookie-1.0.2:0[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby22] !!<dev-ruby/rest-client-1.8.0-r3:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby23] !!<dev-ruby/rest-client-1.8.0-r3:0[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=2
 SRC_URI=mirror://rubygems/rest-client-2.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_=93e78d79ab1156abdee8589fd36ac63c
diff --git a/metadata/md5-cache/dev-ruby/rest-client-2.0.2 b/metadata/md5-cache/dev-ruby/rest-client-2.0.2
index e21e931b32e1..fa525c522a01 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-2.0.2
+++ b/metadata/md5-cache/dev-ruby/rest-client-2.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/webmock:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock:2[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] <dev-ruby/mime-types-4:*[ruby_targets_ruby21] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby21] !!<dev-ruby/rest-client-1.8.0-r3:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby22] !!<dev-ruby/rest-client-1.8.0-r3:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby23] !!<dev-ruby/rest-client-1.8.0-r3:0[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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/webmock:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock:2[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby22] !!<dev-ruby/rest-client-1.8.0-r3:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby23] !!<dev-ruby/rest-client-1.8.0-r3:0[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=Simple Simple HTTP and REST client for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/archiloque/rest-client
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] <dev-ruby/mime-types-4:*[ruby_targets_ruby21] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby21] !!<dev-ruby/rest-client-1.8.0-r3:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby22] !!<dev-ruby/rest-client-1.8.0-r3:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby23] !!<dev-ruby/rest-client-1.8.0-r3:0[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/http-cookie-1.0.2:0[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby22] !!<dev-ruby/rest-client-1.8.0-r3:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby23] !!<dev-ruby/rest-client-1.8.0-r3:0[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=2
 SRC_URI=mirror://rubygems/rest-client-2.0.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_=b5efb9190ae72a72aa3dd15285eb034d
diff --git a/metadata/md5-cache/dev-ruby/rex-arch-0.1.4 b/metadata/md5-cache/dev-ruby/rex-arch-0.1.4
index 894e59a9551c..606eabf8976a 100644
--- a/metadata/md5-cache/dev-ruby/rex-arch-0.1.4
+++ b/metadata/md5-cache/dev-ruby/rex-arch-0.1.4
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-text[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? ( dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-text[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=architecture specific information for Rex
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/rex-arch
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-arch-0.1.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_=42c578e112f416ae67f96ce2946a927e
diff --git a/metadata/md5-cache/dev-ruby/rex-arch-0.1.5 b/metadata/md5-cache/dev-ruby/rex-arch-0.1.5
index d2a3d7205a52..329eef13a495 100644
--- a/metadata/md5-cache/dev-ruby/rex-arch-0.1.5
+++ b/metadata/md5-cache/dev-ruby/rex-arch-0.1.5
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-text[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? ( dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-text[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=architecture specific information for Rex
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/rex-arch
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-arch-0.1.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_=42c578e112f416ae67f96ce2946a927e
diff --git a/metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.2 b/metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.2
index f5185131b11d..ac20157fb2ce 100644
--- a/metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.2
+++ b/metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.2
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/rex-arch[ruby_targets_ruby21] dev-ruby/metasm:*[ruby_targets_ruby21] dev-ruby/rex-core[ruby_targets_ruby21] dev-ruby/rex-struct2[ruby_targets_ruby21] dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rex-arch[ruby_targets_ruby22] dev-ruby/metasm:*[ruby_targets_ruby22] dev-ruby/rex-core[ruby_targets_ruby22] dev-ruby/rex-struct2[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-core[ruby_targets_ruby23] dev-ruby/rex-struct2[ruby_targets_ruby23] dev-ruby/rex-text[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=test? ( ruby_targets_ruby22? ( dev-ruby/rex-arch[ruby_targets_ruby22] dev-ruby/metasm:*[ruby_targets_ruby22] dev-ruby/rex-core[ruby_targets_ruby22] dev-ruby/rex-struct2[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-core[ruby_targets_ruby23] dev-ruby/rex-struct2[ruby_targets_ruby23] dev-ruby/rex-text[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=suite of tools for analyzing executables to find specific chunks of code
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-bin_tools
-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 ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/rex-arch[ruby_targets_ruby21] dev-ruby/metasm:*[ruby_targets_ruby21] dev-ruby/rex-core[ruby_targets_ruby21] dev-ruby/rex-struct2[ruby_targets_ruby21] dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rex-arch[ruby_targets_ruby22] dev-ruby/metasm:*[ruby_targets_ruby22] dev-ruby/rex-core[ruby_targets_ruby22] dev-ruby/rex-struct2[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-core[ruby_targets_ruby23] dev-ruby/rex-struct2[ruby_targets_ruby23] dev-ruby/rex-text[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/rex-arch[ruby_targets_ruby22] dev-ruby/metasm:*[ruby_targets_ruby22] dev-ruby/rex-core[ruby_targets_ruby22] dev-ruby/rex-struct2[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-core[ruby_targets_ruby23] dev-ruby/rex-struct2[ruby_targets_ruby23] dev-ruby/rex-text[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=0
 SRC_URI=mirror://rubygems/rex-bin_tools-0.1.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_=2694c62712c25d3a3c09c263aa358f62
diff --git a/metadata/md5-cache/dev-ruby/rex-core-0.1.10 b/metadata/md5-cache/dev-ruby/rex-core-0.1.10
index 334f337a02b7..e5c0db38b249 100644
--- a/metadata/md5-cache/dev-ruby/rex-core-0.1.10
+++ b/metadata/md5-cache/dev-ruby/rex-core-0.1.10
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) 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? ( 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Core libraries required for the Ruby Exploitation(Rex) Suite
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-core
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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/rex-core-0.1.10.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_=c4ec92173b624e1cdc543150b6ad0dea
diff --git a/metadata/md5-cache/dev-ruby/rex-core-0.1.12 b/metadata/md5-cache/dev-ruby/rex-core-0.1.12
index 04489770cf66..9500c3fc9064 100644
--- a/metadata/md5-cache/dev-ruby/rex-core-0.1.12
+++ b/metadata/md5-cache/dev-ruby/rex-core-0.1.12
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Core libraries required for the Ruby Exploitation(Rex) Suite
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-core
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-core-0.1.12.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_=f03423d06062a8f37e7d17efdaa68924
diff --git a/metadata/md5-cache/dev-ruby/rex-core-0.1.9 b/metadata/md5-cache/dev-ruby/rex-core-0.1.9
index c830a0268f9d..334913c1e933 100644
--- a/metadata/md5-cache/dev-ruby/rex-core-0.1.9
+++ b/metadata/md5-cache/dev-ruby/rex-core-0.1.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Core libraries required for the Ruby Exploitation(Rex) Suite
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-core
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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/rex-core-0.1.9.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_=ea7753b7b28c252286b396c3b1291283
diff --git a/metadata/md5-cache/dev-ruby/rex-encoder-0.1.3 b/metadata/md5-cache/dev-ruby/rex-encoder-0.1.3
index 1d59d19f2757..9c36488c2ab4 100644
--- a/metadata/md5-cache/dev-ruby/rex-encoder-0.1.3
+++ b/metadata/md5-cache/dev-ruby/rex-encoder-0.1.3
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/metasm:*[ruby_targets_ruby21] dev-ruby/rex-arch[ruby_targets_ruby21] dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/metasm:*[ruby_targets_ruby22] dev-ruby/rex-arch[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/rex-text[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=test? ( ruby_targets_ruby22? ( dev-ruby/metasm:*[ruby_targets_ruby22] dev-ruby/rex-arch[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/rex-text[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=provides the basis for all of the polymorphic encoders that Metasploit uses
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-encoder
-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 ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/metasm:*[ruby_targets_ruby21] dev-ruby/rex-arch[ruby_targets_ruby21] dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/metasm:*[ruby_targets_ruby22] dev-ruby/rex-arch[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/rex-text[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/metasm:*[ruby_targets_ruby22] dev-ruby/rex-arch[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/rex-text[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=0
 SRC_URI=mirror://rubygems/rex-encoder-0.1.3.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_=8a706a918806ecd6be75ad8fc9bfc08c
diff --git a/metadata/md5-cache/dev-ruby/rex-encoder-0.1.4 b/metadata/md5-cache/dev-ruby/rex-encoder-0.1.4
index f395819bb573..599beeba8b12 100644
--- a/metadata/md5-cache/dev-ruby/rex-encoder-0.1.4
+++ b/metadata/md5-cache/dev-ruby/rex-encoder-0.1.4
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/metasm:*[ruby_targets_ruby21] dev-ruby/rex-arch[ruby_targets_ruby21] dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/metasm:*[ruby_targets_ruby22] dev-ruby/rex-arch[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/rex-text[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] ) 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-ruby/metasm:*[ruby_targets_ruby22] dev-ruby/rex-arch[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/rex-text[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=provides the basis for all of the polymorphic encoders that Metasploit uses
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-encoder
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/metasm:*[ruby_targets_ruby21] dev-ruby/rex-arch[ruby_targets_ruby21] dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/metasm:*[ruby_targets_ruby22] dev-ruby/rex-arch[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/rex-text[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/metasm:*[ruby_targets_ruby22] dev-ruby/rex-arch[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/rex-text[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=0
 SRC_URI=mirror://rubygems/rex-encoder-0.1.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_=e2907e791d62474b41ee4d030656bda3
diff --git a/metadata/md5-cache/dev-ruby/rex-exploitation-0.1.12 b/metadata/md5-cache/dev-ruby/rex-exploitation-0.1.12
index 96cf8d962377..730f52b1a470 100644
--- a/metadata/md5-cache/dev-ruby/rex-exploitation-0.1.12
+++ b/metadata/md5-cache/dev-ruby/rex-exploitation-0.1.12
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/jsobfu[ruby_targets_ruby21] dev-ruby/metasm:*[ruby_targets_ruby21] dev-ruby/rex-arch[ruby_targets_ruby21] dev-ruby/rex-encoder[ruby_targets_ruby21] dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/jsobfu[ruby_targets_ruby22] dev-ruby/metasm:*[ruby_targets_ruby22] dev-ruby/rex-arch[ruby_targets_ruby22] dev-ruby/rex-encoder[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/jsobfu[ruby_targets_ruby23] dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/rex-encoder[ruby_targets_ruby23] dev-ruby/rex-text[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=test? ( ruby_targets_ruby22? ( dev-ruby/jsobfu[ruby_targets_ruby22] dev-ruby/metasm:*[ruby_targets_ruby22] dev-ruby/rex-arch[ruby_targets_ruby22] dev-ruby/rex-encoder[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/jsobfu[ruby_targets_ruby23] dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/rex-encoder[ruby_targets_ruby23] dev-ruby/rex-text[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=various helper mechanisms for creating exploits
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-exploitation
-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 ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/jsobfu[ruby_targets_ruby21] dev-ruby/metasm:*[ruby_targets_ruby21] dev-ruby/rex-arch[ruby_targets_ruby21] dev-ruby/rex-encoder[ruby_targets_ruby21] dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/jsobfu[ruby_targets_ruby22] dev-ruby/metasm:*[ruby_targets_ruby22] dev-ruby/rex-arch[ruby_targets_ruby22] dev-ruby/rex-encoder[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/jsobfu[ruby_targets_ruby23] dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/rex-encoder[ruby_targets_ruby23] dev-ruby/rex-text[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/jsobfu[ruby_targets_ruby22] dev-ruby/metasm:*[ruby_targets_ruby22] dev-ruby/rex-arch[ruby_targets_ruby22] dev-ruby/rex-encoder[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/jsobfu[ruby_targets_ruby23] dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/rex-encoder[ruby_targets_ruby23] dev-ruby/rex-text[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=0
 SRC_URI=mirror://rubygems/rex-exploitation-0.1.12.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_=1a5331bc6ef3786ce8ad941d749eb87d
diff --git a/metadata/md5-cache/dev-ruby/rex-java-0.1.2 b/metadata/md5-cache/dev-ruby/rex-java-0.1.2
index a5386321e42a..1829b1ab94a3 100644
--- a/metadata/md5-cache/dev-ruby/rex-java-0.1.2
+++ b/metadata/md5-cache/dev-ruby/rex-java-0.1.2
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Ruby Exploitation(Rex) library for parsing Java serialized streams
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/rex-java
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-java-0.1.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_=81e84daf93ac84e3545a6b19719116eb
diff --git a/metadata/md5-cache/dev-ruby/rex-mime-0.1.4 b/metadata/md5-cache/dev-ruby/rex-mime-0.1.4
index 8a900fc0507c..a3b729a86426 100644
--- a/metadata/md5-cache/dev-ruby/rex-mime-0.1.4
+++ b/metadata/md5-cache/dev-ruby/rex-mime-0.1.4
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=library is for creating and/or parsing MIME messages
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-mime
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-mime-0.1.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_=6bd75cea3517d500e0b0f3f65fc4756f
diff --git a/metadata/md5-cache/dev-ruby/rex-nop-0.1.0 b/metadata/md5-cache/dev-ruby/rex-nop-0.1.0
index 1ff249149c2e..3a0f5e986878 100644
--- a/metadata/md5-cache/dev-ruby/rex-nop-0.1.0
+++ b/metadata/md5-cache/dev-ruby/rex-nop-0.1.0
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/rex-arch[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rex-arch[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-arch[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=test? ( ruby_targets_ruby22? ( dev-ruby/rex-arch[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-arch[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=Rex library for dynamic generation of x86 multi-byte NOPs
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-nop
-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 ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/rex-arch[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rex-arch[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-arch[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/rex-arch[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-arch[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=0
 SRC_URI=mirror://rubygems/rex-nop-0.1.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_=ab478404e68be526e5e7b590e564ba8a
diff --git a/metadata/md5-cache/dev-ruby/rex-ole-0.1.2 b/metadata/md5-cache/dev-ruby/rex-ole-0.1.2
index 61fc0732ad06..9cd8cc108dff 100644
--- a/metadata/md5-cache/dev-ruby/rex-ole-0.1.2
+++ b/metadata/md5-cache/dev-ruby/rex-ole-0.1.2
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-text[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? ( dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-text[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=Ruby Exploitation(Rex) library gem for reading/writing OLE files and streams
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/rex-ole
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-ole-0.1.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_=936b8190b6a1ad9e021687b8620caf44
diff --git a/metadata/md5-cache/dev-ruby/rex-powershell-0.1.1-r1 b/metadata/md5-cache/dev-ruby/rex-powershell-0.1.1-r1
index 81dba51ee6fe..920088b45f8c 100644
--- a/metadata/md5-cache/dev-ruby/rex-powershell-0.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/rex-powershell-0.1.1-r1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rex-random_identifier[ruby_targets_ruby21] dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rex-random_identifier[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-random_identifier[ruby_targets_ruby23] dev-ruby/rex-text[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? ( dev-ruby/rex-random_identifier[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-random_identifier[ruby_targets_ruby23] dev-ruby/rex-text[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=Ruby Exploitation(Rex) library for generating/manipulating Powershell scripts
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/rex-powershell
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-powershell-0.1.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_=2b9b45541ce45e4c7e26028666aabcd2
diff --git a/metadata/md5-cache/dev-ruby/rex-powershell-0.1.64 b/metadata/md5-cache/dev-ruby/rex-powershell-0.1.64
index b6871a3d49ed..43be65d01e60 100644
--- a/metadata/md5-cache/dev-ruby/rex-powershell-0.1.64
+++ b/metadata/md5-cache/dev-ruby/rex-powershell-0.1.64
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rex-random_identifier[ruby_targets_ruby21] dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rex-random_identifier[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-random_identifier[ruby_targets_ruby23] dev-ruby/rex-text[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/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? ( dev-ruby/rex-random_identifier[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-random_identifier[ruby_targets_ruby23] dev-ruby/rex-text[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/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=Ruby Exploitation(Rex) library for generating/manipulating Powershell scripts
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/rex-powershell
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-powershell-0.1.64.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_=e0b9db2b947651a9eb57f4141fc4dcb8
diff --git a/metadata/md5-cache/dev-ruby/rex-powershell-0.1.65 b/metadata/md5-cache/dev-ruby/rex-powershell-0.1.65
index 7fdf96638cd8..14f6d9fcc85a 100644
--- a/metadata/md5-cache/dev-ruby/rex-powershell-0.1.65
+++ b/metadata/md5-cache/dev-ruby/rex-powershell-0.1.65
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rex-random_identifier[ruby_targets_ruby21] dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rex-random_identifier[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-random_identifier[ruby_targets_ruby23] dev-ruby/rex-text[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/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? ( dev-ruby/rex-random_identifier[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-random_identifier[ruby_targets_ruby23] dev-ruby/rex-text[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/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=Ruby Exploitation(Rex) library for generating/manipulating Powershell scripts
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/rex-powershell
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-powershell-0.1.65.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_=e0b9db2b947651a9eb57f4141fc4dcb8
diff --git a/metadata/md5-cache/dev-ruby/rex-random_identifier-0.1.0-r1 b/metadata/md5-cache/dev-ruby/rex-random_identifier-0.1.0-r1
index 9d12dd96579b..cdd8ce725dd5 100644
--- a/metadata/md5-cache/dev-ruby/rex-random_identifier-0.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/rex-random_identifier-0.1.0-r1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-text[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? ( dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-text[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=Ruby Exploitation(Rex) library for generating Random identifier strings
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/rex-random_identifier
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-random_identifier-0.1.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_=39e7bba56e01dfc2c922425c62f9b3c0
diff --git a/metadata/md5-cache/dev-ruby/rex-registry-0.1.0-r1 b/metadata/md5-cache/dev-ruby/rex-registry-0.1.0-r1
index 6146fc491402..ffb445f84a62 100644
--- a/metadata/md5-cache/dev-ruby/rex-registry-0.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/rex-registry-0.1.0-r1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Rex library for parsing offline registry files from a Windows machine
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/rex-registry
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-registry-0.1.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_=6f5eb1a4309fdd9774ad163e091e93ff
diff --git a/metadata/md5-cache/dev-ruby/rex-rop_builder-0.1.2 b/metadata/md5-cache/dev-ruby/rex-rop_builder-0.1.2
index 98be17b39e16..a0cebd590874 100644
--- a/metadata/md5-cache/dev-ruby/rex-rop_builder-0.1.2
+++ b/metadata/md5-cache/dev-ruby/rex-rop_builder-0.1.2
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/metasm:*[ruby_targets_ruby21] dev-ruby/rex-core[ruby_targets_ruby21] dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/metasm:*[ruby_targets_ruby22] dev-ruby/rex-core[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-core[ruby_targets_ruby23] dev-ruby/rex-text[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=test? ( ruby_targets_ruby22? ( dev-ruby/metasm:*[ruby_targets_ruby22] dev-ruby/rex-core[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-core[ruby_targets_ruby23] dev-ruby/rex-text[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=Ruby Exploitation(Rex) Library for building ROP chains
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-rop_builder
-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 ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/metasm:*[ruby_targets_ruby21] dev-ruby/rex-core[ruby_targets_ruby21] dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/metasm:*[ruby_targets_ruby22] dev-ruby/rex-core[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-core[ruby_targets_ruby23] dev-ruby/rex-text[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/metasm:*[ruby_targets_ruby22] dev-ruby/rex-core[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-core[ruby_targets_ruby23] dev-ruby/rex-text[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=0
 SRC_URI=mirror://rubygems/rex-rop_builder-0.1.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_=78b81ae6bae551887a99ab19f8d0dbb2
diff --git a/metadata/md5-cache/dev-ruby/rex-socket-0.1.5 b/metadata/md5-cache/dev-ruby/rex-socket-0.1.5
index 911ad160a01b..8466cb1d13a3 100644
--- a/metadata/md5-cache/dev-ruby/rex-socket-0.1.5
+++ b/metadata/md5-cache/dev-ruby/rex-socket-0.1.5
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rex-core[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rex-core[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-core[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? ( dev-ruby/rex-core[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-core[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=Ruby Exploitation (Rex) Socket Abstraction Library
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/rex-socket
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-socket-0.1.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_=1c5f7c0b7ce372631c989b162208dcd9
diff --git a/metadata/md5-cache/dev-ruby/rex-sslscan-0.1.3 b/metadata/md5-cache/dev-ruby/rex-sslscan-0.1.3
index 010ef4b4a08c..33900ba8edf2 100644
--- a/metadata/md5-cache/dev-ruby/rex-sslscan-0.1.3
+++ b/metadata/md5-cache/dev-ruby/rex-sslscan-0.1.3
@@ -1,17 +1,17 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/rex-socket[ruby_targets_ruby21] dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rex-socket[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-socket[ruby_targets_ruby23] dev-ruby/rex-text[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=test? ( ruby_targets_ruby22? ( dev-ruby/rex-socket[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-socket[ruby_targets_ruby23] dev-ruby/rex-text[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=ruby implmenetation of the SSLScan tool
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/rex-sslscan
-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 ~x86
 LICENSE=BSD
 PDEPEND=dev-libs/openssl
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/rex-socket[ruby_targets_ruby21] dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rex-socket[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-socket[ruby_targets_ruby23] dev-ruby/rex-text[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/rex-socket[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-socket[ruby_targets_ruby23] dev-ruby/rex-text[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=0
 SRC_URI=mirror://rubygems/rex-sslscan-0.1.3.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_=0108a3d2d1267e6dac26f1f89dfd7f08
diff --git a/metadata/md5-cache/dev-ruby/rex-struct2-0.1.0 b/metadata/md5-cache/dev-ruby/rex-struct2-0.1.0
index 85133cffb152..98b8b607fe3f 100644
--- a/metadata/md5-cache/dev-ruby/rex-struct2-0.1.0
+++ b/metadata/md5-cache/dev-ruby/rex-struct2-0.1.0
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Ruby Exploitation(Rex) library for generating/manipulating C-Style structs
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/rex-struct2
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-struct2-0.1.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_=32ff0c7054eec1db87185baf5b75c3c5
diff --git a/metadata/md5-cache/dev-ruby/rex-struct2-0.1.1 b/metadata/md5-cache/dev-ruby/rex-struct2-0.1.1
index 261ab147a449..212cfd7b7d8f 100644
--- a/metadata/md5-cache/dev-ruby/rex-struct2-0.1.1
+++ b/metadata/md5-cache/dev-ruby/rex-struct2-0.1.1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Ruby Exploitation(Rex) library for generating/manipulating C-Style structs
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/rex-struct2
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-struct2-0.1.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_=ad108796267ad1937084c41e565371d0
diff --git a/metadata/md5-cache/dev-ruby/rex-text-0.1.2 b/metadata/md5-cache/dev-ruby/rex-text-0.1.2
index 1985ec8eb8a1..dafd0cfc1029 100644
--- a/metadata/md5-cache/dev-ruby/rex-text-0.1.2
+++ b/metadata/md5-cache/dev-ruby/rex-text-0.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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? ( 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? ( 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=Rex library for text generation and manipulation
 EAPI=5
 HOMEPAGE=https://github.com/rapid7/rex-text
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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/rex-text-0.1.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_=d24925c9c6971ba86470414ce93c65f7
diff --git a/metadata/md5-cache/dev-ruby/rex-text-0.2.12 b/metadata/md5-cache/dev-ruby/rex-text-0.2.12
index eccd1d985d44..54d08fe09ace 100644
--- a/metadata/md5-cache/dev-ruby/rex-text-0.2.12
+++ b/metadata/md5-cache/dev-ruby/rex-text-0.2.12
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Rex library for text generation and manipulation
 EAPI=5
 HOMEPAGE=https://github.com/rapid7/rex-text
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-text-0.2.12.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_=d24e22abca3a2a57b10cb5b30f36cdd5
diff --git a/metadata/md5-cache/dev-ruby/rex-text-0.2.9 b/metadata/md5-cache/dev-ruby/rex-text-0.2.9
index 2f99b2944254..d013e9f07cfa 100644
--- a/metadata/md5-cache/dev-ruby/rex-text-0.2.9
+++ b/metadata/md5-cache/dev-ruby/rex-text-0.2.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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? ( 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? ( 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=Rex library for text generation and manipulation
 EAPI=5
 HOMEPAGE=https://github.com/rapid7/rex-text
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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/rex-text-0.2.9.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_=d24925c9c6971ba86470414ce93c65f7
diff --git a/metadata/md5-cache/dev-ruby/rex-zip-0.1.0-r1 b/metadata/md5-cache/dev-ruby/rex-zip-0.1.0-r1
index 9381c8913191..14cb0b962d90 100644
--- a/metadata/md5-cache/dev-ruby/rex-zip-0.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/rex-zip-0.1.0-r1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-text[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? ( dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-text[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=Ruby Exploitation(Rex) library for working with zip and related files
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/rex-zip
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-zip-0.1.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_=67c7bc560ca773ca119e0b175b6fd8e0
diff --git a/metadata/md5-cache/dev-ruby/rex-zip-0.1.1 b/metadata/md5-cache/dev-ruby/rex-zip-0.1.1
index a694fffbf296..9b3ea3c5b9d4 100644
--- a/metadata/md5-cache/dev-ruby/rex-zip-0.1.1
+++ b/metadata/md5-cache/dev-ruby/rex-zip-0.1.1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-text[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? ( dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-text[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=Ruby Exploitation(Rex) library for working with zip and related files
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/rex-zip
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-zip-0.1.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_=75c4d0320b882bbbc00b6d4b37361d0d
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.5-r3 b/metadata/md5-cache/dev-ruby/rexical-1.0.5-r3
index 36ca82abf209..2f44f16090e9 100644
--- a/metadata/md5-cache/dev-ruby/rexical-1.0.5-r3
+++ b/metadata/md5-cache/dev-ruby/rexical-1.0.5-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( >=dev-ruby/hoe-2.6.2[ruby_targets_ruby21] ) test? ( >=dev-ruby/hoe-2.6.2[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.6.2[ruby_targets_ruby22] ) test? ( >=dev-ruby/hoe-2.6.2[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.6.2[ruby_targets_ruby23] ) test? ( >=dev-ruby/hoe-2.6.2[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( >=dev-ruby/hoe-2.6.2[ruby_targets_ruby24] ) test? ( >=dev-ruby/hoe-2.6.2[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.6.2[ruby_targets_ruby22] ) test? ( >=dev-ruby/hoe-2.6.2[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.6.2[ruby_targets_ruby23] ) test? ( >=dev-ruby/hoe-2.6.2[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( >=dev-ruby/hoe-2.6.2[ruby_targets_ruby24] ) test? ( >=dev-ruby/hoe-2.6.2[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Rexical is a lexical scanner generator
 EAPI=5
 HOMEPAGE=https://github.com/tenderlove/rexical/tree/master
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
-RDEPEND=!!app-admin/rex 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=!!app-admin/rex ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rexical-1.0.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_=b2b66512483c244daa1e4b0acd719a2c
diff --git a/metadata/md5-cache/dev-ruby/rgen-0.8.0 b/metadata/md5-cache/dev-ruby/rgen-0.8.0
index 36db69a70e7b..31213442c1b7 100644
--- a/metadata/md5-cache/dev-ruby/rgen-0.8.0
+++ b/metadata/md5-cache/dev-ruby/rgen-0.8.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/nokogiri[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( >=dev-ruby/rdoc-4.2.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/rdoc-4.2.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/rdoc-4.2.0[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/nokogiri[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/rdoc-4.2.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/rdoc-4.2.0[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Ruby Modelling and Generator Framework
 EAPI=5
 HOMEPAGE=https://github.com/mthiede/rgen
-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 hppa ~ppc ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/nokogiri[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/nokogiri[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/nokogiri[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/rgen-0.8.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_=03adc41e0aa5c215f7f54a3d1751646a
diff --git a/metadata/md5-cache/dev-ruby/rgen-0.8.1 b/metadata/md5-cache/dev-ruby/rgen-0.8.1
index 383d06a64c02..afb2f9aba2fe 100644
--- a/metadata/md5-cache/dev-ruby/rgen-0.8.1
+++ b/metadata/md5-cache/dev-ruby/rgen-0.8.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/nokogiri[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( >=dev-ruby/rdoc-4.2.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/rdoc-4.2.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/rdoc-4.2.0[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/nokogiri[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/rdoc-4.2.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/rdoc-4.2.0[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Ruby Modelling and Generator Framework
 EAPI=5
 HOMEPAGE=https://github.com/mthiede/rgen
-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 ~hppa ~ppc ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/nokogiri[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/nokogiri[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/nokogiri[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/rgen-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_=3c7589aad6cdb08ce9111359290759b5
diff --git a/metadata/md5-cache/dev-ruby/rgen-0.8.2 b/metadata/md5-cache/dev-ruby/rgen-0.8.2
index dba67c0535c3..d60ae5116948 100644
--- a/metadata/md5-cache/dev-ruby/rgen-0.8.2
+++ b/metadata/md5-cache/dev-ruby/rgen-0.8.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/nokogiri[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( >=dev-ruby/rdoc-4.2.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/rdoc-4.2.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/rdoc-4.2.0[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/nokogiri[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/rdoc-4.2.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/rdoc-4.2.0[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Ruby Modelling and Generator Framework
 EAPI=5
 HOMEPAGE=https://github.com/mthiede/rgen
-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 ~hppa ~ppc ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/nokogiri[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/nokogiri[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/nokogiri[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/rgen-0.8.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_=3c7589aad6cdb08ce9111359290759b5
diff --git a/metadata/md5-cache/dev-ruby/riel-1.2.0-r2 b/metadata/md5-cache/dev-ruby/riel-1.2.0-r2
index ac11fc04b0ba..7da5f21de53f 100644
--- a/metadata/md5-cache/dev-ruby/riel-1.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/riel-1.2.0-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rainbow-1.1.4:*[ruby_targets_ruby21] dev-ruby/logue[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rainbow-1.1.4:*[ruby_targets_ruby22] dev-ruby/logue[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rainbow-1.1.4:*[ruby_targets_ruby23] dev-ruby/logue[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rainbow-1.1.4:*[ruby_targets_ruby24] dev-ruby/logue[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rainbow-1.1.4:*[ruby_targets_ruby22] dev-ruby/logue[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rainbow-1.1.4:*[ruby_targets_ruby23] dev-ruby/logue[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rainbow-1.1.4:*[ruby_targets_ruby24] dev-ruby/logue[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=This library extends the core Ruby libraries
 EAPI=5
 HOMEPAGE=https://github.com/jpace/riel
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=amd64 hppa ~ppc ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rainbow-1.1.4:*[ruby_targets_ruby21] dev-ruby/logue[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rainbow-1.1.4:*[ruby_targets_ruby22] dev-ruby/logue[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rainbow-1.1.4:*[ruby_targets_ruby23] dev-ruby/logue[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rainbow-1.1.4:*[ruby_targets_ruby24] dev-ruby/logue[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rainbow-1.1.4:*[ruby_targets_ruby22] dev-ruby/logue[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rainbow-1.1.4:*[ruby_targets_ruby23] dev-ruby/logue[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rainbow-1.1.4:*[ruby_targets_ruby24] dev-ruby/logue[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/jpace/riel/archive/v1.2.0.tar.gz -> riel-git-1.2.0.tgz
 _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_=f790834636fb9fd95115c8d1537770ad
diff --git a/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1 b/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1
index 455c7a0fc9c1..e7e822bb0079 100644
--- a/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=RightScale's robust HTTP/S connection module
 EAPI=5
 HOMEPAGE=http://rightscale.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rightscale/right_http_connection/tarball/v1.3.0 -> right_http_connection-1.3.0.tgz
 _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_=659cf7768fd340c601c8179dd2659e5b
diff --git a/metadata/md5-cache/dev-ruby/right_http_connection-1.5.0 b/metadata/md5-cache/dev-ruby/right_http_connection-1.5.0
index e9354a6eeab1..ca0d0dccc1e8 100644
--- a/metadata/md5-cache/dev-ruby/right_http_connection-1.5.0
+++ b/metadata/md5-cache/dev-ruby/right_http_connection-1.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-util/cucumber[ruby_targets_ruby21] dev-ruby/rspec:2[ruby_targets_ruby21] dev-ruby/trollop:0[ruby_targets_ruby21] dev-ruby/flexmock[ruby_targets_ruby21] ) ) 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? ( 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=RightScale's robust HTTP/S connection module
 EAPI=5
 HOMEPAGE=https://github.com/rightscale/right_http_connection
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/rightscale/right_http_connection/archive/v1.5.0.tar.gz -> right_http_connection-1.5.0.tgz
 _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_=0792fb574741d072b66dea203d1e0023
diff --git a/metadata/md5-cache/dev-ruby/rinku-1.7.3 b/metadata/md5-cache/dev-ruby/rinku-1.7.3
index 9201dfc1f8ad..0af4ddb3bd10 100644
--- a/metadata/md5-cache/dev-ruby/rinku-1.7.3
+++ b/metadata/md5-cache/dev-ruby/rinku-1.7.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/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? ( 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/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=A Ruby library that does autolinking
 EAPI=5
 HOMEPAGE=https://github.com/vmg/rinku
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=ISC
-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/rinku-1.7.3.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_=b7e0d3a5b24b414f3a1d2ffb50cfd03c
diff --git a/metadata/md5-cache/dev-ruby/rinku-2.0.0 b/metadata/md5-cache/dev-ruby/rinku-2.0.0
index b213ef4d9fd7..d6711012efb2 100644
--- a/metadata/md5-cache/dev-ruby/rinku-2.0.0
+++ b/metadata/md5-cache/dev-ruby/rinku-2.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/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? ( 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/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=A Ruby library that does autolinking
 EAPI=5
 HOMEPAGE=https://github.com/vmg/rinku
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=ISC
-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/rinku-2.0.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_=b7e0d3a5b24b414f3a1d2ffb50cfd03c
diff --git a/metadata/md5-cache/dev-ruby/rinku-2.0.2 b/metadata/md5-cache/dev-ruby/rinku-2.0.2
index 5f864a8111b2..997fa006e34f 100644
--- a/metadata/md5-cache/dev-ruby/rinku-2.0.2
+++ b/metadata/md5-cache/dev-ruby/rinku-2.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Ruby library that does autolinking
 EAPI=5
 HOMEPAGE=https://github.com/vmg/rinku
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=ISC
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rinku-2.0.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_=0518ff10404aa9c76b4c8b94b2b3bd69
diff --git a/metadata/md5-cache/dev-ruby/ritex-1.0.1 b/metadata/md5-cache/dev-ruby/ritex-1.0.1
index 285cce3453e5..bb2b18692caf 100644
--- a/metadata/md5-cache/dev-ruby/ritex-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ritex-1.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/racc[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/racc[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/racc[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/racc[ruby_targets_ruby24] ) ) test? ( app-text/itex2mml ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/racc[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/racc[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/racc[ruby_targets_ruby24] ) ) test? ( app-text/itex2mml ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Converts expressions from WebTeX into MathML
 EAPI=5
 HOMEPAGE=http://masanjin.net/ritex/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/racc[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/racc[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/racc[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/racc[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/racc[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/racc[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/racc[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ritex-1.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_=ce05aad2d52e535d30839dd3206bdfe5
diff --git a/metadata/md5-cache/dev-ruby/rjb-1.5.4 b/metadata/md5-cache/dev-ruby/rjb-1.5.4
index 79e80bd80bc6..dabb55a08fd0 100644
--- a/metadata/md5-cache/dev-ruby/rjb-1.5.4
+++ b/metadata/md5-cache/dev-ruby/rjb-1.5.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.5 hardened? ( sys-apps/paxctl ) >=dev-java/java-config-2.2.0-r3 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[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=>=virtual/jdk-1.5 hardened? ( sys-apps/paxctl ) >=dev-java/java-config-2.2.0-r3 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Rjb is a Ruby-Java software bridge
 EAPI=5
 HOMEPAGE=https://github.com/arton/rjb
-IUSE=examples hardened elibc_FreeBSD elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=examples hardened elibc_FreeBSD elibc_FreeBSD ruby_targets_ruby22 elibc_FreeBSD ruby_targets_ruby22 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=virtual/jre >=dev-java/java-config-2.2.0-r3 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) 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 ) || ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=virtual/jre >=dev-java/java-config-2.2.0-r3 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ) || ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rjb-1.5.4.gem
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:- 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-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	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-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8531e5c508ff17b5b8f3d470508b78fb
diff --git a/metadata/md5-cache/dev-ruby/rjb-1.5.5 b/metadata/md5-cache/dev-ruby/rjb-1.5.5
index 33f328a4f9f8..0def58c59686 100644
--- a/metadata/md5-cache/dev-ruby/rjb-1.5.5
+++ b/metadata/md5-cache/dev-ruby/rjb-1.5.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.5 hardened? ( sys-apps/paxctl ) >=dev-java/java-config-2.2.0-r3 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? ( 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? ( 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=>=virtual/jdk-1.5 hardened? ( sys-apps/paxctl ) >=dev-java/java-config-2.2.0-r3 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) 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? ( 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=Rjb is a Ruby-Java software bridge
 EAPI=5
 HOMEPAGE=https://github.com/arton/rjb
-IUSE=examples hardened elibc_FreeBSD elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=examples hardened elibc_FreeBSD elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=virtual/jre >=dev-java/java-config-2.2.0-r3 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? ( 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 ) || ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=virtual/jre >=dev-java/java-config-2.2.0-r3 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) 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 ) || ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rjb-1.5.5.gem
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:- 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-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	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-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=34c7260275daab5255ce4bfc2e2159a6
diff --git a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6 b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6
index 88d03d460214..b3de624f3ce7 100644
--- a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6
+++ b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=RKelly Remix is a fork of the RKelly JavaScript parser
 EAPI=5
 HOMEPAGE=https://github.com/nene/rkelly-remix
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rkelly-remix-0.0.6.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_=9b6369b1bade7561d47df3f792e2598e
diff --git a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7 b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
index 33079a589430..bd1568700a4a 100644
--- a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
+++ b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/rdoc[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/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? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/rdoc[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/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=RKelly Remix is a fork of the RKelly JavaScript parser
 EAPI=5
 HOMEPAGE=https://github.com/nene/rkelly-remix
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-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/rkelly-remix-0.0.7.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_=163c95e9a793ac205aad39b4cb1fa6ab
diff --git a/metadata/md5-cache/dev-ruby/rmagick-2.13.4 b/metadata/md5-cache/dev-ruby/rmagick-2.13.4
index 5e9a3e0a0034..ac208f34c12e 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-2.13.4
+++ b/metadata/md5-cache/dev-ruby/rmagick-2.13.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=media-gfx/imagemagick-6.4.9:=[-hdri] =media-gfx/imagemagick-6* 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=>=media-gfx/imagemagick-6.4.9:=[-hdri] =media-gfx/imagemagick-6* 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=An interface between Ruby and the ImageMagick(TM) image processing library
 EAPI=5
 HOMEPAGE=https://github.com/gemhome/rmagick
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=amd64 hppa ~mips ppc ppc64 x86 ~x86-macos
 LICENSE=Artistic
-RDEPEND=>=media-gfx/imagemagick-6.4.9:=[-hdri] =media-gfx/imagemagick-6* 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=>=media-gfx/imagemagick-6.4.9:=[-hdri] =media-gfx/imagemagick-6* 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/rmagick-2.13.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_=c176b06d4ebea7cdcba44085934fcb0b
diff --git a/metadata/md5-cache/dev-ruby/rmagick-2.15.4 b/metadata/md5-cache/dev-ruby/rmagick-2.15.4
index e4ea3e99a2aa..62e37c5e9631 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-2.15.4
+++ b/metadata/md5-cache/dev-ruby/rmagick-2.15.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=media-gfx/imagemagick-6.4.9:=[jpeg] =media-gfx/imagemagick-6* ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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=>=media-gfx/imagemagick-6.4.9:=[jpeg] =media-gfx/imagemagick-6* ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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=An interface between Ruby and the ImageMagick(TM) image processing library
 EAPI=5
 HOMEPAGE=https://github.com/gemhome/rmagick
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=amd64 ~hppa ppc ppc64 x86 ~x86-macos
 LICENSE=Artistic
-RDEPEND=>=media-gfx/imagemagick-6.4.9:= =media-gfx/imagemagick-6* 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=>=media-gfx/imagemagick-6.4.9:= =media-gfx/imagemagick-6* 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/rmagick-2.15.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_=b04b9af9ab5a3572adb3787fc2932751
diff --git a/metadata/md5-cache/dev-ruby/rmagick-2.16.0 b/metadata/md5-cache/dev-ruby/rmagick-2.16.0
index 2bacdf57e1ea..85c55b255408 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-2.16.0
+++ b/metadata/md5-cache/dev-ruby/rmagick-2.16.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=media-gfx/imagemagick-6.4.9:=[jpeg] =media-gfx/imagemagick-6* 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=>=media-gfx/imagemagick-6.4.9:=[jpeg] =media-gfx/imagemagick-6* ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An interface between Ruby and the ImageMagick(TM) image processing library
 EAPI=6
 HOMEPAGE=https://github.com/gemhome/rmagick
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-macos
 LICENSE=Artistic
-RDEPEND=>=media-gfx/imagemagick-6.4.9:= =media-gfx/imagemagick-6* 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=media-gfx/imagemagick-6.4.9:= =media-gfx/imagemagick-6* ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rmagick-2.16.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_=46a037d42cb18e9f63040cc2ae7bce54
diff --git a/metadata/md5-cache/dev-ruby/roadie-3.2.1 b/metadata/md5-cache/dev-ruby/roadie-3.2.1
index 4942c69ef0b3..bfa55df4c83f 100644
--- a/metadata/md5-cache/dev-ruby/roadie-3.2.1
+++ b/metadata/md5-cache/dev-ruby/roadie-3.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby21] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby21] =dev-ruby/css_parser-1.4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1.4*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby23] dev-ruby/webmock[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1.4*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby23] dev-ruby/webmock[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=Making HTML emails comfortable for the Rails rockstars
 EAPI=5
 HOMEPAGE=https://github.com/Mange/roadie
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby21] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby21] =dev-ruby/css_parser-1.4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1.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/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1.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=https://github.com/Mange/roadie/archive/v3.2.1.tar.gz -> roadie-3.2.1.tar.gz
 _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_=5790cb30b6b81dccca5cab6611dc6480
diff --git a/metadata/md5-cache/dev-ruby/roadie-3.2.1-r1 b/metadata/md5-cache/dev-ruby/roadie-3.2.1-r1
index 1f31f1557fd9..4e91611c128e 100644
--- a/metadata/md5-cache/dev-ruby/roadie-3.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/roadie-3.2.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby21] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby21] =dev-ruby/css_parser-1.4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1.4*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby23] dev-ruby/webmock[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1.4*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby23] dev-ruby/webmock[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=Making HTML emails comfortable for the Rails rockstars
 EAPI=6
 HOMEPAGE=https://github.com/Mange/roadie
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby21] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby21] =dev-ruby/css_parser-1.4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1.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/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1.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=https://github.com/Mange/roadie/archive/v3.2.1.tar.gz -> roadie-3.2.1.tar.gz
 _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_=34b00fb127db37bf68c47dd9b14dfe8d
diff --git a/metadata/md5-cache/dev-ruby/roadie-3.2.1-r2 b/metadata/md5-cache/dev-ruby/roadie-3.2.1-r2
index 805bb946e337..79e0d2a79848 100644
--- a/metadata/md5-cache/dev-ruby/roadie-3.2.1-r2
+++ b/metadata/md5-cache/dev-ruby/roadie-3.2.1-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby21] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby21] =dev-ruby/css_parser-1.4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1.4*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby23] dev-ruby/webmock[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1.4*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby23] dev-ruby/webmock[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=Making HTML emails comfortable for the Rails rockstars
 EAPI=6
 HOMEPAGE=https://github.com/Mange/roadie
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby21] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby21] =dev-ruby/css_parser-1.4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1.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/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1.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=https://github.com/Mange/roadie/archive/v3.2.1.tar.gz -> roadie-3.2.1.tar.gz
 _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_=a4bc4b88d8b648b434b95e12d07dddcf
diff --git a/metadata/md5-cache/dev-ruby/roadie-3.2.2 b/metadata/md5-cache/dev-ruby/roadie-3.2.2
index 0ef0bc80b867..ee7e1e63ba7f 100644
--- a/metadata/md5-cache/dev-ruby/roadie-3.2.2
+++ b/metadata/md5-cache/dev-ruby/roadie-3.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby21] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby21] =dev-ruby/css_parser-1.4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1.4*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby23] dev-ruby/webmock[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1.4*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby23] dev-ruby/webmock[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=Making HTML emails comfortable for the Rails rockstars
 EAPI=6
 HOMEPAGE=https://github.com/Mange/roadie
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby21] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby21] =dev-ruby/css_parser-1.4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1.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/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1.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=https://github.com/Mange/roadie/archive/v3.2.2.tar.gz -> roadie-3.2.2.tar.gz
 _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_=a4bc4b88d8b648b434b95e12d07dddcf
diff --git a/metadata/md5-cache/dev-ruby/roadie-rails-1.1.1 b/metadata/md5-cache/dev-ruby/roadie-rails-1.1.1
index ab440b2458d4..d429409f78f1 100644
--- a/metadata/md5-cache/dev-ruby/roadie-rails-1.1.1
+++ b/metadata/md5-cache/dev-ruby/roadie-rails-1.1.1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/roadie-3.1[ruby_targets_ruby21] >=dev-ruby/railties-3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/roadie-3.1[ruby_targets_ruby22] >=dev-ruby/railties-3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( >=dev-ruby/rails-3.0[ruby_targets_ruby21] test? ( dev-ruby/rspec-rails[ruby_targets_ruby21] dev-ruby/rspec-collection_matchers[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/rails-3.0[ruby_targets_ruby22] test? ( dev-ruby/rspec-rails[ruby_targets_ruby22] dev-ruby/rspec-collection_matchers[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( >=dev-ruby/roadie-3.1[ruby_targets_ruby22] >=dev-ruby/railties-3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( >=dev-ruby/rails-3.0[ruby_targets_ruby22] test? ( dev-ruby/rspec-rails[ruby_targets_ruby22] dev-ruby/rspec-collection_matchers[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Hooks Roadie into your Rails application to help with email generation
 EAPI=5
 HOMEPAGE=https://github.com/Mange/roadie-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/roadie-3.1[ruby_targets_ruby21] >=dev-ruby/railties-3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/roadie-3.1[ruby_targets_ruby22] >=dev-ruby/railties-3.0[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/roadie-3.1[ruby_targets_ruby22] >=dev-ruby/railties-3.0[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Mange/roadie-rails/archive/v1.1.1.tar.gz -> roadie-rails-1.1.1.tar.gz
 _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_=74a9c19ad73f780d75819677d8a09196
diff --git a/metadata/md5-cache/dev-ruby/roadie-rails-1.2.1 b/metadata/md5-cache/dev-ruby/roadie-rails-1.2.1
index 451f0e7d7702..ea3378b06088 100644
--- a/metadata/md5-cache/dev-ruby/roadie-rails-1.2.1
+++ b/metadata/md5-cache/dev-ruby/roadie-rails-1.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/roadie-3.1[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] <dev-ruby/railties-5.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/roadie-3.1[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] <dev-ruby/railties-5.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/roadie-3.1[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] <dev-ruby/railties-5.1:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/rspec-rails[ruby_targets_ruby21] dev-ruby/rspec-collection_matchers[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/rspec-rails[ruby_targets_ruby22] dev-ruby/rspec-collection_matchers[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/rspec-rails[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/roadie-3.1[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] <dev-ruby/railties-5.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/roadie-3.1[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] <dev-ruby/railties-5.1:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/rspec-rails[ruby_targets_ruby22] dev-ruby/rspec-collection_matchers[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/rspec-rails[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=Hooks Roadie into your Rails application to help with email generation
 EAPI=6
 HOMEPAGE=https://github.com/Mange/roadie-rails
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/roadie-3.1[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] <dev-ruby/railties-5.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/roadie-3.1[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] <dev-ruby/railties-5.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/roadie-3.1[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] <dev-ruby/railties-5.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/roadie-3.1[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] <dev-ruby/railties-5.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/roadie-3.1[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] <dev-ruby/railties-5.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=https://github.com/Mange/roadie-rails/archive/v1.2.1.tar.gz -> roadie-rails-1.2.1.tar.gz
 _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_=3cc72d6a0d4f1e3a7328c0b07b1431e4
diff --git a/metadata/md5-cache/dev-ruby/robots-0.10.1-r2 b/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
index d1e438bb4498..92b8aa832618 100644
--- a/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
+++ b/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A simple Ruby library to parse robots.txt
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/robots
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-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/robots-0.10.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_=67ed7e6dc3262c4ad6a3a470a96d736c
diff --git a/metadata/md5-cache/dev-ruby/rouge-1.11.1-r1 b/metadata/md5-cache/dev-ruby/rouge-1.11.1-r1
index 21b42e9b8635..9b6218dac757 100644
--- a/metadata/md5-cache/dev-ruby/rouge-1.11.1-r1
+++ b/metadata/md5-cache/dev-ruby/rouge-1.11.1-r1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/redcarpet[ruby_targets_ruby21] !!dev-ruby/rouge:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/redcarpet[ruby_targets_ruby22] !!dev-ruby/rouge:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/redcarpet[ruby_targets_ruby22] !!dev-ruby/rouge:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Yet-another-markdown-parser using a strict syntax definition in pure Ruby
 EAPI=5
 HOMEPAGE=https://github.com/jneen/rouge
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/redcarpet[ruby_targets_ruby21] !!dev-ruby/rouge:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/redcarpet[ruby_targets_ruby22] !!dev-ruby/rouge:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:2[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/redcarpet[ruby_targets_ruby22] !!dev-ruby/rouge:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jneen/rouge/archive/v1.11.1.tar.gz -> rouge-1.11.1.tar.gz
 _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_=e9db07a03b7e01cb44323ea923e53714
diff --git a/metadata/md5-cache/dev-ruby/rouge-2.1.0 b/metadata/md5-cache/dev-ruby/rouge-2.1.0
index ae9ce5cac018..4cd24c9ae2b0 100644
--- a/metadata/md5-cache/dev-ruby/rouge-2.1.0
+++ b/metadata/md5-cache/dev-ruby/rouge-2.1.0
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/redcarpet[ruby_targets_ruby21] !!dev-ruby/rouge:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/redcarpet[ruby_targets_ruby22] !!dev-ruby/rouge:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/redcarpet[ruby_targets_ruby22] !!dev-ruby/rouge:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Yet-another-markdown-parser using a strict syntax definition in pure Ruby
 EAPI=6
 HOMEPAGE=https://github.com/jneen/rouge
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/redcarpet[ruby_targets_ruby21] !!dev-ruby/rouge:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/redcarpet[ruby_targets_ruby22] !!dev-ruby/rouge:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/redcarpet[ruby_targets_ruby22] !!dev-ruby/rouge:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://rubygems/rouge-2.1.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_=82745f66f2a44dd052c32ec195ddc485
diff --git a/metadata/md5-cache/dev-ruby/rouge-2.1.1 b/metadata/md5-cache/dev-ruby/rouge-2.1.1
index e04ee4b13a10..ffbe3bb3a22c 100644
--- a/metadata/md5-cache/dev-ruby/rouge-2.1.1
+++ b/metadata/md5-cache/dev-ruby/rouge-2.1.1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/redcarpet[ruby_targets_ruby21] !!dev-ruby/rouge:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/redcarpet[ruby_targets_ruby22] !!dev-ruby/rouge:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/redcarpet[ruby_targets_ruby22] !!dev-ruby/rouge:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Yet-another-markdown-parser using a strict syntax definition in pure Ruby
 EAPI=6
 HOMEPAGE=https://github.com/jneen/rouge
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/redcarpet[ruby_targets_ruby21] !!dev-ruby/rouge:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/redcarpet[ruby_targets_ruby22] !!dev-ruby/rouge:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/redcarpet[ruby_targets_ruby22] !!dev-ruby/rouge:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://rubygems/rouge-2.1.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_=82745f66f2a44dd052c32ec195ddc485
diff --git a/metadata/md5-cache/dev-ruby/rouge-2.2.0 b/metadata/md5-cache/dev-ruby/rouge-2.2.0
index ec53a44ca4ea..5864dcd6152f 100644
--- a/metadata/md5-cache/dev-ruby/rouge-2.2.0
+++ b/metadata/md5-cache/dev-ruby/rouge-2.2.0
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/redcarpet[ruby_targets_ruby21] !!dev-ruby/rouge:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/redcarpet[ruby_targets_ruby22] !!dev-ruby/rouge:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/redcarpet[ruby_targets_ruby22] !!dev-ruby/rouge:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Yet-another-markdown-parser using a strict syntax definition in pure Ruby
 EAPI=6
 HOMEPAGE=https://github.com/jneen/rouge
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/redcarpet[ruby_targets_ruby21] !!dev-ruby/rouge:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/redcarpet[ruby_targets_ruby22] !!dev-ruby/rouge:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/redcarpet[ruby_targets_ruby22] !!dev-ruby/rouge:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://rubygems/rouge-2.2.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_=82745f66f2a44dd052c32ec195ddc485
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-0.10.1 b/metadata/md5-cache/dev-ruby/rqrcode-0.10.1
index b0b139671861..83aa6d9259f2 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode-0.10.1
+++ b/metadata/md5-cache/dev-ruby/rqrcode-0.10.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/chunky_png:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/chunky_png:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/chunky_png:0[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=test? ( ruby_targets_ruby22? ( dev-ruby/chunky_png:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/chunky_png:0[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=Library for encoding QR Codes
 EAPI=5
 HOMEPAGE=https://whomwah.github.com/rqrcode/
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/chunky_png:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/chunky_png:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/chunky_png:0[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/chunky_png:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/chunky_png:0[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/rqrcode-0.10.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_=2d701d2d206b7ea4c356dce1ed846fa5
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-0.9.0 b/metadata/md5-cache/dev-ruby/rqrcode-0.9.0
index a919f0458768..3dcccbc9dedf 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode-0.9.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode-0.9.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/chunky_png:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/chunky_png:0[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=test? ( ruby_targets_ruby22? ( dev-ruby/chunky_png:0[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=Library for encoding QR Codes
 EAPI=5
 HOMEPAGE=https://whomwah.github.com/rqrcode/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/chunky_png:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/chunky_png:0[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/chunky_png:0[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/rqrcode-0.9.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_=156a6755f87ea98e8cc2e89ad983afde
diff --git a/metadata/md5-cache/dev-ruby/rr-1.1.2-r1 b/metadata/md5-cache/dev-ruby/rr-1.1.2-r1
index 4a4c453f656a..a81a54165bcd 100644
--- a/metadata/md5-cache/dev-ruby/rr-1.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/rr-1.1.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/session[ruby_targets_ruby21] dev-ruby/diff-lcs[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/session[ruby_targets_ruby22] dev-ruby/diff-lcs[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/session[ruby_targets_ruby23] dev-ruby/diff-lcs[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:2[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/session[ruby_targets_ruby22] dev-ruby/diff-lcs[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/session[ruby_targets_ruby23] dev-ruby/diff-lcs[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=A double framework featuring a selection of double techniques and a terse syntax
 EAPI=5
 HOMEPAGE=http://pivotallabs.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=https://github.com/rr/rr/archive/v1.1.2.tar.gz -> rr-1.1.2.tar.gz
 _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_=5f7bb40c25ad8aabda0a0a281e6794a8
diff --git a/metadata/md5-cache/dev-ruby/rr-1.2.0 b/metadata/md5-cache/dev-ruby/rr-1.2.0
index 90ce1661d88a..d77b4316655c 100644
--- a/metadata/md5-cache/dev-ruby/rr-1.2.0
+++ b/metadata/md5-cache/dev-ruby/rr-1.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/session[ruby_targets_ruby21] dev-ruby/diff-lcs[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/session[ruby_targets_ruby22] dev-ruby/diff-lcs[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/session[ruby_targets_ruby23] dev-ruby/diff-lcs[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] dev-ruby/session[ruby_targets_ruby24] dev-ruby/diff-lcs[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/session[ruby_targets_ruby22] dev-ruby/diff-lcs[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/session[ruby_targets_ruby23] dev-ruby/diff-lcs[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] dev-ruby/session[ruby_targets_ruby24] dev-ruby/diff-lcs[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A double framework featuring a selection of double techniques and a terse syntax
 EAPI=5
 HOMEPAGE=http://pivotallabs.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/rr/rr/archive/v1.2.0.tar.gz -> rr-1.2.0.tar.gz
 _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_=ec0b666a6e55ad7ca133164475623442
diff --git a/metadata/md5-cache/dev-ruby/rr-1.2.1 b/metadata/md5-cache/dev-ruby/rr-1.2.1
index c01c1044ad88..4a5829cc6815 100644
--- a/metadata/md5-cache/dev-ruby/rr-1.2.1
+++ b/metadata/md5-cache/dev-ruby/rr-1.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/session[ruby_targets_ruby21] dev-ruby/diff-lcs[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/session[ruby_targets_ruby22] dev-ruby/diff-lcs[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/session[ruby_targets_ruby23] dev-ruby/diff-lcs[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] dev-ruby/session[ruby_targets_ruby24] dev-ruby/diff-lcs[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/session[ruby_targets_ruby22] dev-ruby/diff-lcs[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/session[ruby_targets_ruby23] dev-ruby/diff-lcs[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] dev-ruby/session[ruby_targets_ruby24] dev-ruby/diff-lcs[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A double framework featuring a selection of double techniques and a terse syntax
 EAPI=6
 HOMEPAGE=https://rr.github.io/rr
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/rr/rr/archive/v1.2.1.tar.gz -> rr-1.2.1.tar.gz
 _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_=ad9f0ce024c42a1a968d28bc72fc31a9
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
index 2fe6e1982b2c..d88c1d2e284c 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-analyzer/rrdtool[graph] ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DEPEND=net-analyzer/rrdtool[graph] ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=Ruby bindings for rrdtool
 EAPI=5
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=elibc_FreeBSD ruby_targets_ruby22
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=net-analyzer/rrdtool[graph] !!<net-analyzer/rrdtool-1.4.8-r1 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=net-analyzer/rrdtool[graph] !!<net-analyzer/rrdtool-1.4.8-r1 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.8.tar.gz
 _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-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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9b23197f6efec3aead76955611b9e078
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.5 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.5
index 3cb09dc147b5..c1af6ccc8199 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.5
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ~net-analyzer/rrdtool-1.5.5[graph] ) 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_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=test? ( ~net-analyzer/rrdtool-1.5.5[graph] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=Ruby bindings for rrdtool
 EAPI=5
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
-IUSE=graph test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=graph test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=alpha amd64 ~arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=~net-analyzer/rrdtool-1.5.5[graph=] 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_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=~net-analyzer/rrdtool-1.5.5[graph=] ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.5.5.tar.gz
 _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-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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a19cb99380e28db85f86b76d6254b678
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0
index ebaa8cc5f5a0..ece40bef6ba3 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ~net-analyzer/rrdtool-1.6.0[graph] ) 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_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=test? ( ~net-analyzer/rrdtool-1.6.0[graph] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=Ruby bindings for rrdtool
 EAPI=5
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
-IUSE=graph test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=graph test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=~net-analyzer/rrdtool-1.6.0[graph=] 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_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=~net-analyzer/rrdtool-1.6.0[graph=] ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.6.0.tar.gz
 _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-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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ed771f6979bbbe7e47e5f37f1902dbb2
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0
index f11782079bda..fc0a5f6312ab 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ~net-analyzer/rrdtool-1.7.0[graph] ) 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_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=test? ( ~net-analyzer/rrdtool-1.7.0[graph] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=Ruby bindings for rrdtool
 EAPI=5
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
-IUSE=graph test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=graph test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=~net-analyzer/rrdtool-1.7.0[graph=] 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_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=~net-analyzer/rrdtool-1.7.0[graph=] ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.0.tar.gz
 _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-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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3238a935b2fdc5bc1ad972ac3136af82
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1 b/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
index 5ae7999dd8d1..e51c94c7ccb0 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/rspec-core-2.14*[ruby_targets_ruby21] =dev-ruby/rspec-expectations-2.14*[ruby_targets_ruby21] =dev-ruby/rspec-mocks-2.14*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-core-2.14*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-2.14*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-2.14*[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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/rspec-core-2.14*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-2.14*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-2.14*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-core-2.14*[ruby_targets_ruby21] =dev-ruby/rspec-expectations-2.14*[ruby_targets_ruby21] =dev-ruby/rspec-mocks-2.14*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-core-2.14*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-2.14*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-2.14*[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/rspec-core-2.14*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-2.14*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-2.14*[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=2
 SRC_URI=mirror://rubygems/rspec-2.14.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_=cd8dd07af3ee56feef85aef2e21a2ee8
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.99.0 b/metadata/md5-cache/dev-ruby/rspec-2.99.0
index 9e3b589fcdbc..6133149b8e46 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-2.99.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby21] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby21] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby24] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby24] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby24] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby24] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby21] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby21] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby24] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby24] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby24] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby24] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/rspec-2.99.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_=4977fe5f4052a434b249f87c35a2abe2
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.3.0 b/metadata/md5-cache/dev-ruby/rspec-3.3.0
index cc998931a043..8b77897a8dad 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.3.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/rspec-core-3.3*[ruby_targets_ruby21] =dev-ruby/rspec-expectations-3.3*[ruby_targets_ruby21] =dev-ruby/rspec-mocks-3.3*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-core-3.3*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-3.3*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-3.3*[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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/rspec-core-3.3*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-3.3*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-3.3*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-core-3.3*[ruby_targets_ruby21] =dev-ruby/rspec-expectations-3.3*[ruby_targets_ruby21] =dev-ruby/rspec-mocks-3.3*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-core-3.3*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-3.3*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-3.3*[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/rspec-core-3.3*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-3.3*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-3.3*[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=3
 SRC_URI=mirror://rubygems/rspec-3.3.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_=44a2985ab0593105342164c6fa5717cd
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.5.0 b/metadata/md5-cache/dev-ruby/rspec-3.5.0
index 9ff549cadfe3..e8116d364f93 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.5.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/rspec-core-3.5*[ruby_targets_ruby21] =dev-ruby/rspec-expectations-3.5*[ruby_targets_ruby21] =dev-ruby/rspec-mocks-3.5*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-core-3.5*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-3.5*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-3.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-core-3.5*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-3.5*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-3.5*[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] ) 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-ruby/rspec-core-3.5*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-3.5*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-3.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-core-3.5*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-3.5*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-3.5*[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-core-3.5*[ruby_targets_ruby21] =dev-ruby/rspec-expectations-3.5*[ruby_targets_ruby21] =dev-ruby/rspec-mocks-3.5*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-core-3.5*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-3.5*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-3.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-core-3.5*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-3.5*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-3.5*[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/rspec-core-3.5*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-3.5*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-3.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-core-3.5*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-3.5*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-3.5*[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=3
 SRC_URI=mirror://rubygems/rspec-3.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_=0d5a60a3fb3c6a3c8c748c6ef44cc4af
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.6.0 b/metadata/md5-cache/dev-ruby/rspec-3.6.0
index 867a1910ec86..cc0af27a862e 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.6.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/rspec-core-3.6*[ruby_targets_ruby21] =dev-ruby/rspec-expectations-3.6*[ruby_targets_ruby21] =dev-ruby/rspec-mocks-3.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-core-3.6*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-3.6*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-3.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-core-3.6*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-3.6*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-3.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-core-3.6*[ruby_targets_ruby24] =dev-ruby/rspec-expectations-3.6*[ruby_targets_ruby24] =dev-ruby/rspec-mocks-3.6*[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/rspec-core-3.6*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-3.6*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-3.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-core-3.6*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-3.6*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-3.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-core-3.6*[ruby_targets_ruby24] =dev-ruby/rspec-expectations-3.6*[ruby_targets_ruby24] =dev-ruby/rspec-mocks-3.6*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-core-3.6*[ruby_targets_ruby21] =dev-ruby/rspec-expectations-3.6*[ruby_targets_ruby21] =dev-ruby/rspec-mocks-3.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-core-3.6*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-3.6*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-3.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-core-3.6*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-3.6*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-3.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-core-3.6*[ruby_targets_ruby24] =dev-ruby/rspec-expectations-3.6*[ruby_targets_ruby24] =dev-ruby/rspec-mocks-3.6*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( =dev-ruby/rspec-core-3.6*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-3.6*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-3.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-core-3.6*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-3.6*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-3.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-core-3.6*[ruby_targets_ruby24] =dev-ruby/rspec-expectations-3.6*[ruby_targets_ruby24] =dev-ruby/rspec-mocks-3.6*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/rspec-3.6.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_=aaa64847deab53214bc6474128ad2960
diff --git a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.3 b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.3
index 0186ae7f911c..b620afd41c9c 100644
--- a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.3
+++ b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/activemodel-3.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activemodel-3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activemodel-3.0[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activemodel-3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activemodel-3.0[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=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-collection_matchers
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-expectations-3.0.0[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/rspec-expectations-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-expectations-3.0.0[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=1
 SRC_URI=mirror://rubygems/rspec-collection_matchers-1.1.3.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_=311912d01e440c9144d7f53f0dbd653b
diff --git a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.3-r1 b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.3-r1
index ffd65f9f7b43..c63ff2b8202f 100644
--- a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.3-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/activemodel-3.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activemodel-3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activemodel-3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/activemodel-3.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activemodel-3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activemodel-3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/activemodel-3.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-collection_matchers
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/rspec-collection_matchers-1.1.3.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_=5153f416df9f1e3d744fbb84feda5f47
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4 b/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
index 1a8f7e4544eb..929a644e659c 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby21] dev-ruby/syntax[ruby_targets_ruby21] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby21] >=dev-ruby/rspec-mocks-2.12.0:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.12.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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/nokogiri-1.5.2[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.12.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-core
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.14.8.tar.gz -> rspec-core-2.14.8-git.tgz
 _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_=8faf66f3a0db6b8732882b282ff468fb
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r1 b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r1
index b97d66af7080..24cf2b809a0b 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby21] dev-ruby/syntax[ruby_targets_ruby21] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby21] >=dev-ruby/rspec-mocks-2.99.0:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] dev-ruby/syntax[ruby_targets_ruby23] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby23] >=dev-ruby/rspec-mocks-2.99.0: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? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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/nokogiri-1.5.2[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] dev-ruby/syntax[ruby_targets_ruby23] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby23] >=dev-ruby/rspec-mocks-2.99.0:2[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-core
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.99.2.tar.gz -> rspec-core-2.99.2-git.tgz
 _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_=618b3a6a4e52e4803616732024c67c97
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2 b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
index a7de3b5f82ba..6e856a4c206b 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby21] dev-ruby/syntax[ruby_targets_ruby21] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby21] >=dev-ruby/rspec-mocks-2.99.0:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] dev-ruby/syntax[ruby_targets_ruby23] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby23] >=dev-ruby/rspec-mocks-2.99.0:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] dev-ruby/syntax[ruby_targets_ruby24] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby24] >=dev-ruby/rspec-mocks-2.99.0:2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] dev-ruby/syntax[ruby_targets_ruby23] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby23] >=dev-ruby/rspec-mocks-2.99.0:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] dev-ruby/syntax[ruby_targets_ruby24] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby24] >=dev-ruby/rspec-mocks-2.99.0:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-core
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.99.2.tar.gz -> rspec-core-2.99.2-git.tgz
 _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_=2d444cf5c71efa565c1d2ed15a69ef69
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.3.2 b/metadata/md5-cache/dev-ruby/rspec-core-3.3.2
index 3a62e258ea1d..3e2c5fc847a7 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.3.2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.3.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] dev-ruby/syntax[ruby_targets_ruby21] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby21] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-core
-IUSE=highlight test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=highlight test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[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/rspec-support-3.3*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[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=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.3.2.tar.gz -> rspec-core-3.3.2-git.tgz
 _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_=8acd983087324ea8d5010a3e5c1efc76
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.3.2-r1 b/metadata/md5-cache/dev-ruby/rspec-core-3.3.2-r1
index 3afb4ee50fac..4708e90a6ef2 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.3.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] dev-ruby/syntax[ruby_targets_ruby21] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby21] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-core
-IUSE=highlight test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=highlight test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[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/rspec-support-3.3*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[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=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.3.2.tar.gz -> rspec-core-3.3.2-git.tgz
 _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_=c7e9007f992619d19cd3d9866ceda104
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.5.3 b/metadata/md5-cache/dev-ruby/rspec-core-3.5.3
index f6cb3a092da3..0c3e94f31eda 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.5.3
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.5.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] ) ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] dev-ruby/syntax[ruby_targets_ruby21] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby21] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] dev-ruby/syntax[ruby_targets_ruby23] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-mocks-2.99.0:3[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] dev-ruby/syntax[ruby_targets_ruby23] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-mocks-2.99.0:3[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-core
-IUSE=highlight test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=highlight test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.0.9[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/rspec-support-3.5*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.0.9[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=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.5.3.tar.gz -> rspec-core-3.5.3-git.tgz
 _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_=d005eb4665b48d93dc0930dec5f76615
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.5.4 b/metadata/md5-cache/dev-ruby/rspec-core-3.5.4
index df03df055f9d..1884bbddb689 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.5.4
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.5.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] ) ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] dev-ruby/syntax[ruby_targets_ruby21] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby21] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] dev-ruby/syntax[ruby_targets_ruby23] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-mocks-2.99.0:3[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] dev-ruby/syntax[ruby_targets_ruby23] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-mocks-2.99.0:3[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-core
-IUSE=highlight test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=highlight test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.0.9[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/rspec-support-3.5*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.0.9[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=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.5.4.tar.gz -> rspec-core-3.5.4-git.tgz
 _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_=8c7778905600a3707d3c09b04ab23028
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.6.0 b/metadata/md5-cache/dev-ruby/rspec-core-3.6.0
index 64acffdb6261..1a16696cbcb8 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.6.0
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby24] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby24] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby24] ) ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] dev-ruby/syntax[ruby_targets_ruby21] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby21] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] dev-ruby/syntax[ruby_targets_ruby23] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby24] dev-ruby/syntax[ruby_targets_ruby24] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby24] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby24] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] dev-ruby/syntax[ruby_targets_ruby23] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby24] dev-ruby/syntax[ruby_targets_ruby24] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec-core
-IUSE=highlight test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=highlight test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby24] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby24] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby24] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby24] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.6.0.tar.gz -> rspec-core-3.6.0-git.tgz
 _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_=ef0470876325032fb77e32a5df1ab62a
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
index 55c862a93ea9..a09f7576fd8d 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-core-2.11.0:2[ruby_targets_ruby21] >=dev-ruby/rspec-mocks-2.14.0:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-core-2.11.0:2[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.14.0: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/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_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? ( ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-core-2.11.0:2[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.14.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.1.3[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/diff-lcs-1.1.3[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=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.14.5.tar.gz -> rspec-expectations-2.14.5-git.tgz
 _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_=c9f7e2e05d9be6090b564ab42517e427
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
index 008d96621f39..c924a408774e 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-core-2.11.0:2[ruby_targets_ruby21] >=dev-ruby/rspec-mocks-2.14.0:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-core-2.11.0:2[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.14.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-core-2.11.0:2[ruby_targets_ruby23] >=dev-ruby/rspec-mocks-2.14.0:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-core-2.11.0:2[ruby_targets_ruby24] >=dev-ruby/rspec-mocks-2.14.0:2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-core-2.11.0:2[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.14.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-core-2.11.0:2[ruby_targets_ruby23] >=dev-ruby/rspec-mocks-2.14.0:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-core-2.11.0:2[ruby_targets_ruby24] >=dev-ruby/rspec-mocks-2.14.0:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.99.2.tar.gz -> rspec-expectations-2.99.2-git.tgz
 _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_=2699ce561b42b921312e5f94cc20536a
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.3.1 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.3.1
index b8894529a9e2..6b9e9be082f5 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.3.1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby21] <dev-ruby/diff-lcs-2[ruby_targets_ruby21] =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] <dev-ruby/diff-lcs-2[ruby_targets_ruby22] =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[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/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] <dev-ruby/diff-lcs-2[ruby_targets_ruby22] =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-expectations
-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby21] <dev-ruby/diff-lcs-2[ruby_targets_ruby21] =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] <dev-ruby/diff-lcs-2[ruby_targets_ruby22] =dev-ruby/rspec-support-3.3*[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/diff-lcs-1.2.0[ruby_targets_ruby22] <dev-ruby/diff-lcs-2[ruby_targets_ruby22] =dev-ruby/rspec-support-3.3*[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=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.3.1.tar.gz -> rspec-expectations-3.3.1-git.tgz
 _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_=2905b6186f2d1b68cd6c4b8839e6309b
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0
index 8279fc4d7a05..5d9097b93afd 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby21] <dev-ruby/diff-lcs-2[ruby_targets_ruby21] =dev-ruby/rspec-support-3.5*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] <dev-ruby/diff-lcs-2[ruby_targets_ruby22] =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby21] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-support-3.5.0:3[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] <dev-ruby/diff-lcs-2[ruby_targets_ruby22] =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-support-3.5.0:3[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: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=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-expectations
-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=alpha amd64 arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby21] <dev-ruby/diff-lcs-2[ruby_targets_ruby21] =dev-ruby/rspec-support-3.5*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] <dev-ruby/diff-lcs-2[ruby_targets_ruby22] =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.5*[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/diff-lcs-1.2.0[ruby_targets_ruby22] <dev-ruby/diff-lcs-2[ruby_targets_ruby22] =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.5*[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=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.5.0.tar.gz -> rspec-expectations-3.5.0-git.tgz
 _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_=1cff614191e5f47063f1de4618cf0e72
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.6.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.6.0
index 1c388139bc50..1988b7fea769 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.6.0
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby21] <dev-ruby/diff-lcs-2[ruby_targets_ruby21] =dev-ruby/rspec-support-3.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] <dev-ruby/diff-lcs-2[ruby_targets_ruby22] =dev-ruby/rspec-support-3.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] <dev-ruby/diff-lcs-2[ruby_targets_ruby24] =dev-ruby/rspec-support-3.6*[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby21] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] <dev-ruby/diff-lcs-2[ruby_targets_ruby22] =dev-ruby/rspec-support-3.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] <dev-ruby/diff-lcs-2[ruby_targets_ruby24] =dev-ruby/rspec-support-3.6*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec-expectations
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby21] <dev-ruby/diff-lcs-2[ruby_targets_ruby21] =dev-ruby/rspec-support-3.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] <dev-ruby/diff-lcs-2[ruby_targets_ruby22] =dev-ruby/rspec-support-3.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] <dev-ruby/diff-lcs-2[ruby_targets_ruby24] =dev-ruby/rspec-support-3.6*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] <dev-ruby/diff-lcs-2[ruby_targets_ruby22] =dev-ruby/rspec-support-3.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] <dev-ruby/diff-lcs-2[ruby_targets_ruby24] =dev-ruby/rspec-support-3.6*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.6.0.tar.gz -> rspec-expectations-3.6.0-git.tgz
 _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_=f1ce08839f7a7559ee2546b21259279c
diff --git a/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1 b/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1
index bf921087eaac..f62860f08f95 100644
--- a/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-its
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/rspec-its-1.2.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_=d96898e3bc618db6bc0715322cafd78a
diff --git a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.1.0 b/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.1.0
index db6ef7d0aab4..1581ab60212d 100644
--- a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.1.0
+++ b/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.1.0
@@ -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/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-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/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=Set of matchers and helpers to allow you test your APIs responses.
 EAPI=5
 HOMEPAGE=https://github.com/waterlink/rspec-json_expectations
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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=1
 SRC_URI=mirror://rubygems/rspec-json_expectations-2.1.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_=ba86620d598b28e55abce9c8088a7bbc
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
index 6ee24af44347..fc56ea614588 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby21] dev-ruby/rspec-expectations:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby22] dev-ruby/rspec-expectations: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/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_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-core-2.10.0:2[ruby_targets_ruby22] dev-ruby/rspec-expectations:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.14.6.tar.gz -> rspec-mocks-2.14.6-git.tgz
 _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_=f0771d01cd7348a8d99c9f9f7c939e46
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
index 40bd97f58477..54c81639d2c6 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.99.0:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.99.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.99.0:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.99.0:2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.99.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.99.0:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.99.0:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.99.2.tar.gz -> rspec-mocks-2.99.2-git.tgz
 _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_=e38b2fcd41bdaf1f0ce1fa1ee24aba05
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.3.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.3.2
index 83c6e4b607f9..c3fba999ec3a 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.3.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.3.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.99.0:3[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/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-mocks
-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.3*[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/rspec-support-3.3*[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=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.3.2.tar.gz -> rspec-mocks-3.3.2-git.tgz
 _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_=56cc179b4880fa8becbba6b5832686ff
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0
index 0f72903f36b1..4fe22e00be7f 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby21] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby21] =dev-ruby/diff-lcs-1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] =dev-ruby/diff-lcs-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] =dev-ruby/diff-lcs-1*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.99.0:3[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: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=test? ( ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] =dev-ruby/diff-lcs-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] =dev-ruby/diff-lcs-1*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.99.0:3[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: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=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-mocks
-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=alpha amd64 arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby21] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby21] =dev-ruby/diff-lcs-1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] =dev-ruby/diff-lcs-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] =dev-ruby/diff-lcs-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/rspec-support-3.5*[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] =dev-ruby/diff-lcs-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] =dev-ruby/diff-lcs-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=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.5.0.tar.gz -> rspec-mocks-3.5.0-git.tgz
 _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_=c842fcb66cd11ad8a664265544c9bcd6
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.6.0 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.6.0
index 1d1cdfe1409e..af2228396297 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.6.0
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby21] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby21] =dev-ruby/diff-lcs-1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] =dev-ruby/diff-lcs-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] =dev-ruby/diff-lcs-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] =dev-ruby/diff-lcs-1*[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] =dev-ruby/diff-lcs-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] =dev-ruby/diff-lcs-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] =dev-ruby/diff-lcs-1*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec-mocks
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby21] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby21] =dev-ruby/diff-lcs-1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] =dev-ruby/diff-lcs-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] =dev-ruby/diff-lcs-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] =dev-ruby/diff-lcs-1*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] =dev-ruby/diff-lcs-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] =dev-ruby/diff-lcs-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] =dev-ruby/diff-lcs-1*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.6.0.tar.gz -> rspec-mocks-3.6.0-git.tgz
 _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_=70ae2ecdd50935c6f98ac761271275ef
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-2.14.2 b/metadata/md5-cache/dev-ruby/rspec-rails-2.14.2
index 53813b04ec50..d32cc2385589 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-2.14.2
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-2.14.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby21] >=dev-ruby/activemodel-3.0[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0[ruby_targets_ruby21] >=dev-ruby/railties-3.0[ruby_targets_ruby21] =dev-ruby/rspec-2.14*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby22] >=dev-ruby/activemodel-3.0[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0[ruby_targets_ruby22] >=dev-ruby/railties-3.0[ruby_targets_ruby22] =dev-ruby/rspec-2.14*[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby21] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby21] >=dev-ruby/ammeter-0.2.5[ruby_targets_ruby21] ~dev-ruby/rspec-rails-2.14.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby22] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby22] >=dev-ruby/ammeter-0.2.5[ruby_targets_ruby22] ~dev-ruby/rspec-rails-2.14.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/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_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? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby22] >=dev-ruby/activemodel-3.0[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0[ruby_targets_ruby22] >=dev-ruby/railties-3.0[ruby_targets_ruby22] =dev-ruby/rspec-2.14*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby22] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby22] >=dev-ruby/ammeter-0.2.5[ruby_targets_ruby22] ~dev-ruby/rspec-rails-2.14.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=RSpec's official Ruby on Rails plugin
 EAPI=5
 HOMEPAGE=http://rspec.info/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby21] >=dev-ruby/activemodel-3.0[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0[ruby_targets_ruby21] >=dev-ruby/railties-3.0[ruby_targets_ruby21] =dev-ruby/rspec-2.14*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby22] >=dev-ruby/activemodel-3.0[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0[ruby_targets_ruby22] >=dev-ruby/railties-3.0[ruby_targets_ruby22] =dev-ruby/rspec-2.14*[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/activesupport-3.0[ruby_targets_ruby22] >=dev-ruby/activemodel-3.0[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0[ruby_targets_ruby22] >=dev-ruby/railties-3.0[ruby_targets_ruby22] =dev-ruby/rspec-2.14*[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=2
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v2.14.2.tar.gz -> rspec-rails-2.14.2.tar.gz
 _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_=f4c1fef4ae83e453a778349929ebd7b5
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-2.99.0 b/metadata/md5-cache/dev-ruby/rspec-rails-2.99.0
index 4caccf992f46..b8e127ee285d 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-2.99.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby21] >=dev-ruby/activemodel-3.0[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0[ruby_targets_ruby21] >=dev-ruby/railties-3.0[ruby_targets_ruby21] =dev-ruby/rspec-2.99*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby22] >=dev-ruby/activemodel-3.0[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0[ruby_targets_ruby22] >=dev-ruby/railties-3.0[ruby_targets_ruby22] =dev-ruby/rspec-2.99*[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby21] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby21] >=dev-ruby/ammeter-0.2.5[ruby_targets_ruby21] ~dev-ruby/rspec-rails-2.99.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby22] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby22] >=dev-ruby/ammeter-0.2.5[ruby_targets_ruby22] ~dev-ruby/rspec-rails-2.99.0[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/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_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? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby22] >=dev-ruby/activemodel-3.0[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0[ruby_targets_ruby22] >=dev-ruby/railties-3.0[ruby_targets_ruby22] =dev-ruby/rspec-2.99*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby22] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby22] >=dev-ruby/ammeter-0.2.5[ruby_targets_ruby22] ~dev-ruby/rspec-rails-2.99.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=RSpec's official Ruby on Rails plugin
 EAPI=5
 HOMEPAGE=http://rspec.info/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby21] >=dev-ruby/activemodel-3.0[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0[ruby_targets_ruby21] >=dev-ruby/railties-3.0[ruby_targets_ruby21] =dev-ruby/rspec-2.99*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby22] >=dev-ruby/activemodel-3.0[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0[ruby_targets_ruby22] >=dev-ruby/railties-3.0[ruby_targets_ruby22] =dev-ruby/rspec-2.99*[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/activesupport-3.0[ruby_targets_ruby22] >=dev-ruby/activemodel-3.0[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0[ruby_targets_ruby22] >=dev-ruby/railties-3.0[ruby_targets_ruby22] =dev-ruby/rspec-2.99*[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=2
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v2.99.0.tar.gz -> rspec-rails-2.99.0.tar.gz
 _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_=92e2813f6dabed03dbf8d322ff7bcc7e
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.3.3 b/metadata/md5-cache/dev-ruby/rspec-rails-3.3.3
index 5250f26e3fbe..c051846c27e7 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.3.3
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.3.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/rspec-3.3*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.3*[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby21] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby21] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby21] ~dev-ruby/rspec-rails-3.3.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby22] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby22] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby22] ~dev-ruby/rspec-rails-3.3.3[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/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.3*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby22] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby22] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby22] ~dev-ruby/rspec-rails-3.3.3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=RSpec's official Ruby on Rails plugin
 EAPI=5
 HOMEPAGE=http://rspec.info/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/rspec-3.3*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.3*[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/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.3*[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=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.3.3.tar.gz -> rspec-rails-3.3.3.tar.gz
 _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_=c36f3b67d2562d6a34789e9fec37e4d2
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.5.2 b/metadata/md5-cache/dev-ruby/rspec-rails-3.5.2
index 852204d891c9..b53fd99f5d51 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.5.2
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.5.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/rspec-3.5*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.5*[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby21] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby21] ~dev-ruby/rspec-rails-3.5.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby22] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby22] ~dev-ruby/rspec-rails-3.5.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/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.5*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby22] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby22] ~dev-ruby/rspec-rails-3.5.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=RSpec's official Ruby on Rails plugin
 EAPI=5
 HOMEPAGE=http://rspec.info/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/rspec-3.5*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.5*[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/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.5*[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=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.5.2.tar.gz -> rspec-rails-3.5.2.tar.gz
 _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_=29d43e3cdf71cc0427fc4a920cf45885
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.5.2-r1 b/metadata/md5-cache/dev-ruby/rspec-rails-3.5.2-r1
index 71ff49a2c540..a730c461e062 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.5.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/rspec-3.5*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.5*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby21] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby21] ~dev-ruby/rspec-rails-3.5.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby22] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby22] ~dev-ruby/rspec-rails-3.5.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby23] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby23] ~dev-ruby/rspec-rails-3.5.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/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=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.5*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby22] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby22] ~dev-ruby/rspec-rails-3.5.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby23] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby23] ~dev-ruby/rspec-rails-3.5.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/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=RSpec's official Ruby on Rails plugin
 EAPI=5
 HOMEPAGE=http://rspec.info/
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/rspec-3.5*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.5*[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/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.5*[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=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.5.2.tar.gz -> rspec-rails-3.5.2.tar.gz
 _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_=92b48e8f0a16aba654d816a0994fa579
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.6.0 b/metadata/md5-cache/dev-ruby/rspec-rails-3.6.0
index 6b30828a0f3c..ab5641a3616e 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.6.0
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/rspec-3.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.6*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby21] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby21] ~dev-ruby/rspec-rails-3.6.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby22] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby22] ~dev-ruby/rspec-rails-3.6.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby23] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby23] ~dev-ruby/rspec-rails-3.6.0[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.6*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby22] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby22] ~dev-ruby/rspec-rails-3.6.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby23] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby23] ~dev-ruby/rspec-rails-3.6.0[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: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=RSpec's official Ruby on Rails plugin
 EAPI=6
 HOMEPAGE=http://rspec.info/
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/rspec-3.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.6*[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/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.6*[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=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.6.0.tar.gz -> rspec-rails-3.6.0.tar.gz
 _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_=1e62248b6e030cac7a7795ce9a8ccc04
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.6.1 b/metadata/md5-cache/dev-ruby/rspec-rails-3.6.1
index 37aa0a9295c4..532c4abf54f3 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.6.1
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.6.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/rspec-3.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.6*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby21] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby21] ~dev-ruby/rspec-rails-3.6.1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby22] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby22] ~dev-ruby/rspec-rails-3.6.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby23] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby23] ~dev-ruby/rspec-rails-3.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-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=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.6*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby22] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby22] ~dev-ruby/rspec-rails-3.6.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby23] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby23] ~dev-ruby/rspec-rails-3.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-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=RSpec's official Ruby on Rails plugin
 EAPI=6
 HOMEPAGE=http://rspec.info/
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/rspec-3.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.6*[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/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.6*[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=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.6.1.tar.gz -> rspec-rails-3.6.1.tar.gz
 _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_=1e62248b6e030cac7a7795ce9a8ccc04
diff --git a/metadata/md5-cache/dev-ruby/rspec-retry-0.5.2 b/metadata/md5-cache/dev-ruby/rspec-retry-0.5.2
index 927161ebfc97..447b8b4e6265 100644
--- a/metadata/md5-cache/dev-ruby/rspec-retry-0.5.2
+++ b/metadata/md5-cache/dev-ruby/rspec-retry-0.5.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[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=Retry intermittently failing rspec examples
 EAPI=5
 HOMEPAGE=https://github.com/NoRedInk/rspec-retry
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[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/rspec-core-3.3:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[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/rspec-retry-0.5.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_=5dbb75f42482816c0de4553f480395c7
diff --git a/metadata/md5-cache/dev-ruby/rspec-retry-0.5.3 b/metadata/md5-cache/dev-ruby/rspec-retry-0.5.3
index 8c515628243d..7c58bc5483f3 100644
--- a/metadata/md5-cache/dev-ruby/rspec-retry-0.5.3
+++ b/metadata/md5-cache/dev-ruby/rspec-retry-0.5.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[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=Retry intermittently failing rspec examples
 EAPI=5
 HOMEPAGE=https://github.com/NoRedInk/rspec-retry
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[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/rspec-core-3.3:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[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/rspec-retry-0.5.3.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_=b7ce4c4d55ff7f7bc10d905b75276bfc
diff --git a/metadata/md5-cache/dev-ruby/rspec-retry-0.5.4 b/metadata/md5-cache/dev-ruby/rspec-retry-0.5.4
index 9cc0126fbda0..990b30b9611b 100644
--- a/metadata/md5-cache/dev-ruby/rspec-retry-0.5.4
+++ b/metadata/md5-cache/dev-ruby/rspec-retry-0.5.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Retry intermittently failing rspec examples
 EAPI=6
 HOMEPAGE=https://github.com/NoRedInk/rspec-retry
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rspec-retry-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_=fa70b4755b9b33b9cb7f392e63e7b9b3
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.3.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.3.0
index f06f4f6c47a8..4142adcbe716 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.3.0
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-3.3.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-3.3.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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.3.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-support
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.3.0.tar.gz -> rspec-support-3.3.0-git.tgz
 _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_=9fa56d379f7758a00566c84d7aa547b6
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.5.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.5.0
index 93a6e264fb7f..c1635bd471e7 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.5.0
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-3.5.0:3[ruby_targets_ruby21] dev-ruby/thread_order[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-3.5.0:3[ruby_targets_ruby22] dev-ruby/thread_order[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-3.5.0:3[ruby_targets_ruby23] dev-ruby/thread_order[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/rspec-3.5.0:3[ruby_targets_ruby22] dev-ruby/thread_order[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-3.5.0:3[ruby_targets_ruby23] dev-ruby/thread_order[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=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-support
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.5.0.tar.gz -> rspec-support-3.5.0-git.tgz
 _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_=b36a30e185fce444f185fa8107f8a498
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.6.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.6.0
index 7707245cb2a0..0cab3e4e355d 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.6.0
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-3.5.0:3[ruby_targets_ruby21] dev-ruby/thread_order[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-3.5.0:3[ruby_targets_ruby22] dev-ruby/thread_order[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-3.5.0:3[ruby_targets_ruby23] dev-ruby/thread_order[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-3.5.0:3[ruby_targets_ruby24] dev-ruby/thread_order[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-3.5.0:3[ruby_targets_ruby22] dev-ruby/thread_order[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-3.5.0:3[ruby_targets_ruby23] dev-ruby/thread_order[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-3.5.0:3[ruby_targets_ruby24] dev-ruby/thread_order[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec-support
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.6.0.tar.gz -> rspec-support-3.6.0-git.tgz
 _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_=7ecccd372f656531f6ee436960f35298
diff --git a/metadata/md5-cache/dev-ruby/rspectacular-0.70.0 b/metadata/md5-cache/dev-ruby/rspectacular-0.70.0
index dd62c00cbabc..a1d311476b40 100644
--- a/metadata/md5-cache/dev-ruby/rspectacular-0.70.0
+++ b/metadata/md5-cache/dev-ruby/rspectacular-0.70.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby21] dev-ruby/fuubar:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby22] dev-ruby/fuubar: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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby22] dev-ruby/fuubar:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=RSpec support and matchers
 EAPI=5
 HOMEPAGE=https://github.com/thekompanee/rspectacular
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby21] dev-ruby/fuubar:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby22] dev-ruby/fuubar: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/rspec-3.1:3[ruby_targets_ruby22] dev-ruby/fuubar: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/rspectacular-0.70.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_=b0bc6d510544fa26790a42636cf314ea
diff --git a/metadata/md5-cache/dev-ruby/rspectacular-0.70.7 b/metadata/md5-cache/dev-ruby/rspectacular-0.70.7
index 0ee9e075ab47..2ccd63560383 100644
--- a/metadata/md5-cache/dev-ruby/rspectacular-0.70.7
+++ b/metadata/md5-cache/dev-ruby/rspectacular-0.70.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby21] dev-ruby/fuubar:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby22] dev-ruby/fuubar:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby23] dev-ruby/fuubar: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] ) 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-ruby/rspec-3.1:3[ruby_targets_ruby22] dev-ruby/fuubar:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby23] dev-ruby/fuubar: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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=RSpec support and matchers
 EAPI=5
 HOMEPAGE=https://github.com/thekompanee/rspectacular
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby21] dev-ruby/fuubar:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby22] dev-ruby/fuubar:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby23] dev-ruby/fuubar: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/rspec-3.1:3[ruby_targets_ruby22] dev-ruby/fuubar:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby23] dev-ruby/fuubar: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/rspectacular-0.70.7.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_=7b566b01850055ab2c24af845f57bc34
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-atk-3.0.8
index a9aee41f8ddd..20686b1eae04 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/atk test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=dev-libs/atk test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby Atk bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=dev-libs/atk ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[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=dev-libs/atk ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f053d41d7b8669635cd9d99a9f7789fe
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-atk-3.1.1
index 1f33cc34a536..bb468291ef69 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/atk test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=dev-libs/atk test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby Atk bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=dev-libs/atk ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=dev-libs/atk ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=61d39429801b916adf8e8f89912db585
diff --git a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3 b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
index 18345d6e35b7..95c0647b3ade 100644
--- a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=app-admin/augeas-1.1.0 dev-libs/libxml2 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=>=app-admin/augeas-1.1.0 dev-libs/libxml2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby bindings for Augeas
 EAPI=5
 HOMEPAGE=http://augeas.net/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=amd64 hppa ia64 ppc ~sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=>=app-admin/augeas-1.1.0 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=app-admin/augeas-1.1.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=http://download.augeas.net/ruby/ruby-augeas-0.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_=3bfba4cbaf6564de185af5a43c5b7167
diff --git a/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.4 b/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.4
index c98eace85de7..349ec02b7f9e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.4
+++ b/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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_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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=a cli tool (and module) to beautify ruby code
 EAPI=5
 HOMEPAGE=https://github.com/erniebrodeur/ruby-beautify
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-beautify-0.97.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_=9c079c0e4b68a5cbc73e2fbf18f4f3b2
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.0.8
index 79ced9aad742..09a44ca95bc6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/cairo test? ( ruby_targets_ruby21? ( dev-ruby/rcairo[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rcairo[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rcairo[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.0.8[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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=x11-libs/cairo test? ( ruby_targets_ruby22? ( dev-ruby/rcairo[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rcairo[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.0.8[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby cairo-gobject bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/cairo ruby_targets_ruby21? ( dev-ruby/rcairo[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rcairo[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rcairo[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.0.8[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=x11-libs/cairo ruby_targets_ruby22? ( dev-ruby/rcairo[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rcairo[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.0.8[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b05af28a53edc6bce949d61468137203
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.1.1
index 3e52b911eb13..6ad289b8e49a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/cairo test? ( ruby_targets_ruby21? ( dev-ruby/rcairo[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rcairo[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rcairo[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rcairo[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=x11-libs/cairo test? ( ruby_targets_ruby22? ( dev-ruby/rcairo[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rcairo[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rcairo[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby cairo-gobject bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/cairo ruby_targets_ruby21? ( dev-ruby/rcairo[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rcairo[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rcairo[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rcairo[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=x11-libs/cairo ruby_targets_ruby22? ( dev-ruby/rcairo[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rcairo[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rcairo[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=87e0172ed3a4672058ed976b26b80c8a
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-clutter-3.0.8
index f194d105b53d..9c5732902e60 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=media-libs/clutter ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=media-libs/clutter ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby Clutter bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=media-libs/clutter ruby_targets_ruby21? ( >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.0.8[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=media-libs/clutter ruby_targets_ruby22? ( >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.0.8[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=ff16260977241c6ca88dab40f0b828d7
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-clutter-3.1.1
index e00720c129fd..aea489fab730 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=media-libs/clutter ruby_targets_ruby21? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=media-libs/clutter ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby Clutter bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=media-libs/clutter ruby_targets_ruby21? ( >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=media-libs/clutter ruby_targets_ruby22? ( >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=af3ee8a1d1b57a05806de5bdb60f1701
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.1.1
index 1ba61f78181d..b063611c1fc7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby binding of GDK specific API of Clutter
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=media-libs/clutter[gtk] ruby_targets_ruby21? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=media-libs/clutter[gtk] ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=2c475a3757a1882c750cc1010882230f
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.0.8
index e74bd2df4459..17805bce301f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=media-libs/clutter-gst test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=media-libs/clutter-gst test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby Clutter bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=media-libs/clutter-gst:* ruby_targets_ruby21? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.0.8[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=media-libs/clutter-gst:* ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.0.8[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=d30b0bc9cf4bc62e5197960f60e1a756
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.1.1
index 14c5fe077af0..162d345a54f1 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=media-libs/clutter-gst test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=media-libs/clutter-gst test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby Clutter bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=media-libs/clutter-gst:* ruby_targets_ruby21? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=media-libs/clutter-gst:* ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=00c6787c98c8e4aec14699edc00800aa
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.0.8
index aaaa04a1d77e..a594ce2cc20f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=media-libs/clutter-gtk ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=media-libs/clutter-gtk ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby Clutter bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=media-libs/clutter-gtk ruby_targets_ruby21? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.0.8[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=media-libs/clutter-gtk ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.0.8[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=81fc38fa8b9704cf5ffa299b39090d36
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.1.1
index fdf72d48b731..c2a376944454 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=media-libs/clutter-gtk[gtk] ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=media-libs/clutter-gtk[gtk] ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby Clutter bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=media-libs/clutter-gtk[gtk] ruby_targets_ruby21? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=media-libs/clutter-gtk[gtk] ruby_targets_ruby22? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=4878e50a40fb283ee698865118964d53
diff --git a/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4 b/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4
index d51907341900..82df07ce6420 100644
--- a/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4
+++ b/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=RFC 2229 client in Ruby
 EAPI=5
 HOMEPAGE=http://www.caliban.org/ruby/ruby-dict.shtml
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
 LICENSE=GPL-2
-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_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=http://www.caliban.org/files/ruby/ruby-dict-0.9.4.tar.gz
 _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-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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4a2218a973845c9ef2159162ccae0d95
diff --git a/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8 b/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
index f96ba960cb4c..d67762bddea5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] ) dev-ruby/rake[ruby_targets_ruby24] ) dev-libs/libxslt app-text/docbook-xsl-ns-stylesheets 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] ) dev-ruby/rake[ruby_targets_ruby24] ) dev-libs/libxslt app-text/docbook-xsl-ns-stylesheets ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby library to access ELF files information
 EAPI=5
 HOMEPAGE=http://www.flameeyes.eu/projects/ruby-elf
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=virtual/man 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=virtual/man ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/Flameeyes/ruby-elf/archive/1.0.8.tar.gz -> ruby-elf-1.0.8.tar.gz
 _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_=87b6e027dd04e6ebe0b0c4e2a8c7e45b
diff --git a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.4 b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.4
index f6c1696189ca..262637212ade 100644
--- a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.4
+++ b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/magic[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/magic[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/magic[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-ruby/magic[ruby_targets_ruby21] test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/magic[ruby_targets_ruby22] test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/magic[ruby_targets_ruby23] test? ( dev-ruby/mocha[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/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=test? ( ruby_targets_ruby22? ( dev-ruby/magic[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/magic[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-ruby/magic[ruby_targets_ruby22] test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/magic[ruby_targets_ruby23] test? ( dev-ruby/mocha[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/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=Ruby library to parse ATOM/RSS feeds
 EAPI=5
 HOMEPAGE=https://github.com/feed2imap/ruby-feedparser
-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
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/magic[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/magic[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/magic[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/magic[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/magic[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=https://github.com/feed2imap/ruby-feedparser/archive/v0.9.4.tar.gz -> ruby-feedparser-0.9.4.tar.gz
 _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_=2bad9099bf348dc3e05e43f263910d97
diff --git a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.1 b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.1
index 57657f426359..4e5a47ab748a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.1
+++ b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-apps/file 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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=sys-apps/file ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Ruby binding to libmagic
 EAPI=5
 HOMEPAGE=https://github.com/blackwinter/ruby-filemagic
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=Ruby
-RDEPEND=sys-apps/file 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=sys-apps/file 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/ruby-filemagic-0.7.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_=e82846b72cf90451bcc47765c96f60fb
diff --git a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2 b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2
index 4db0f47f8677..0ccca2cc58a1 100644
--- a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2
+++ b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-apps/file test? ( >=sys-apps/file-5.30 ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=sys-apps/file test? ( >=sys-apps/file-5.30 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby binding to libmagic
 EAPI=6
 HOMEPAGE=https://github.com/blackwinter/ruby-filemagic
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=Ruby
-RDEPEND=sys-apps/file 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=sys-apps/file ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-filemagic-0.7.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_=d6bb20e65dd95d5576ac2e228ae9bcb0
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.0.8
index c01d37f979c3..00446bd989d7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtk+:3 ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=x11-libs/gtk+:3 ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby GDK-3.x bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[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=x11-libs/gtk+:3 ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-cairo-gobject-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=e8d36d05ddf4703920fcf161b484f3f8
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.1.1
index 02921c7a9b53..75b3ec694141 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtk+:3 ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=x11-libs/gtk+:3 ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby GDK-3.x bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=55745fae7874bf2d675b24f4ef240262
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.0.8
index 2e7cd39fdb76..64e6b8897935 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby GdkPixbuf2 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[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=x11-libs/gtk+:2 ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6f141eca4080133013e3b27da3e2256f
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.1.1
index e3712ede8897..f5246cca28af 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby GdkPixbuf2 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=00e7fb125b4cab757b679f75ed85801e
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1
index 8a67eb733456..985e0708c427 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby21] dev-ruby/text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby22] dev-ruby/text[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) dev-ruby/racc[ruby_targets_ruby21] ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) dev-ruby/racc[ruby_targets_ruby22] ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/test-unit-rr[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/test-unit-rr[ruby_targets_ruby22] ) ) sys-devel/gettext ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby22] dev-ruby/text[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) dev-ruby/racc[ruby_targets_ruby22] ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/test-unit-rr[ruby_targets_ruby22] ) ) sys-devel/gettext ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) 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=Native Language Support Library and Tools modeled after GNU gettext package
 EAPI=5
 HOMEPAGE=http://www.yotabanana.com/hiki/ruby-gettext.html
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby21] dev-ruby/text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby22] dev-ruby/text[ruby_targets_ruby22] ) sys-devel/gettext 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/locale-2.0.5[ruby_targets_ruby22] dev-ruby/text[ruby_targets_ruby22] ) sys-devel/gettext 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/gettext-3.1.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_=943fc3d9df1c9e6e7dddac07cc45dd48
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.2 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.2
index 45f4e09d11f2..68773432f05d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.2
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby21] >=dev-ruby/text-1.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby22] >=dev-ruby/text-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby23] >=dev-ruby/text-1.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) dev-ruby/racc[ruby_targets_ruby21] ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) dev-ruby/racc[ruby_targets_ruby22] ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) dev-ruby/racc[ruby_targets_ruby23] ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/test-unit-rr[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/test-unit-rr[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/test-unit-rr[ruby_targets_ruby23] ) ) sys-devel/gettext 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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby22] >=dev-ruby/text-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby23] >=dev-ruby/text-1.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) dev-ruby/racc[ruby_targets_ruby22] ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) dev-ruby/racc[ruby_targets_ruby23] ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/test-unit-rr[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/test-unit-rr[ruby_targets_ruby23] ) ) sys-devel/gettext ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=Native Language Support Library and Tools modeled after GNU gettext package
 EAPI=5
 HOMEPAGE=http://ruby-gettext.github.io/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=|| ( Ruby LGPL-3+ )
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby21] >=dev-ruby/text-1.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby22] >=dev-ruby/text-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby23] >=dev-ruby/text-1.3.0[ruby_targets_ruby23] ) sys-devel/gettext 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/locale-2.0.5[ruby_targets_ruby22] >=dev-ruby/text-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby23] >=dev-ruby/text-1.3.0[ruby_targets_ruby23] ) sys-devel/gettext 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/gettext-3.2.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_=ce090b77afdc47094fb0d2b6c79ff7dd
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.3 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.3
index 84684a5e7319..67a134cf34e8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby21] >=dev-ruby/text-1.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby22] >=dev-ruby/text-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby23] >=dev-ruby/text-1.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) dev-ruby/racc[ruby_targets_ruby21] ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) dev-ruby/racc[ruby_targets_ruby22] ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) dev-ruby/racc[ruby_targets_ruby23] ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/test-unit-rr[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/test-unit-rr[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/test-unit-rr[ruby_targets_ruby23] ) ) sys-devel/gettext 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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby22] >=dev-ruby/text-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby23] >=dev-ruby/text-1.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) dev-ruby/racc[ruby_targets_ruby22] ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) dev-ruby/racc[ruby_targets_ruby23] ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/test-unit-rr[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/test-unit-rr[ruby_targets_ruby23] ) ) sys-devel/gettext ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=Native Language Support Library and Tools modeled after GNU gettext package
 EAPI=6
 HOMEPAGE=https://ruby-gettext.github.io/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Ruby LGPL-3+ )
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby21] >=dev-ruby/text-1.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby22] >=dev-ruby/text-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby23] >=dev-ruby/text-1.3.0[ruby_targets_ruby23] ) sys-devel/gettext 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/locale-2.0.5[ruby_targets_ruby22] >=dev-ruby/text-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby23] >=dev-ruby/text-1.3.0[ruby_targets_ruby23] ) sys-devel/gettext 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/gettext-3.2.3.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_=3940db491bd528e909d216bd0fd926e4
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.3-r1
index e431252f01f6..b9fbc1d45bc4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby21] >=dev-ruby/text-1.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby22] >=dev-ruby/text-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby23] >=dev-ruby/text-1.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby24] >=dev-ruby/text-1.3.0[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) dev-ruby/racc[ruby_targets_ruby21] ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) dev-ruby/racc[ruby_targets_ruby22] ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) dev-ruby/racc[ruby_targets_ruby23] ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) dev-ruby/racc[ruby_targets_ruby24] ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/test-unit-rr[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/test-unit-rr[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/test-unit-rr[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/test-unit-rr[ruby_targets_ruby24] ) ) sys-devel/gettext 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby22] >=dev-ruby/text-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby23] >=dev-ruby/text-1.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby24] >=dev-ruby/text-1.3.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) dev-ruby/racc[ruby_targets_ruby22] ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) dev-ruby/racc[ruby_targets_ruby23] ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) dev-ruby/racc[ruby_targets_ruby24] ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/test-unit-rr[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/test-unit-rr[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/test-unit-rr[ruby_targets_ruby24] ) ) sys-devel/gettext ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Native Language Support Library and Tools modeled after GNU gettext package
 EAPI=6
 HOMEPAGE=https://ruby-gettext.github.io/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( Ruby LGPL-3+ )
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby21] >=dev-ruby/text-1.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby22] >=dev-ruby/text-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby23] >=dev-ruby/text-1.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby24] >=dev-ruby/text-1.3.0[ruby_targets_ruby24] ) sys-devel/gettext 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby22] >=dev-ruby/text-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby23] >=dev-ruby/text-1.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby24] >=dev-ruby/text-1.3.0[ruby_targets_ruby24] ) sys-devel/gettext ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.2.3.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_=29ab82ea18c016bcd525f89b046fa9af
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.4 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.4
index 5596186e29f3..d448b6369052 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.4
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby21] >=dev-ruby/text-1.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby22] >=dev-ruby/text-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby23] >=dev-ruby/text-1.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby24] >=dev-ruby/text-1.3.0[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) dev-ruby/racc[ruby_targets_ruby21] ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) dev-ruby/racc[ruby_targets_ruby22] ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) dev-ruby/racc[ruby_targets_ruby23] ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) dev-ruby/racc[ruby_targets_ruby24] ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/test-unit-rr[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/test-unit-rr[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/test-unit-rr[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/test-unit-rr[ruby_targets_ruby24] ) ) sys-devel/gettext 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby22] >=dev-ruby/text-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby23] >=dev-ruby/text-1.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby24] >=dev-ruby/text-1.3.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) dev-ruby/racc[ruby_targets_ruby22] ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) dev-ruby/racc[ruby_targets_ruby23] ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) dev-ruby/racc[ruby_targets_ruby24] ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/test-unit-rr[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/test-unit-rr[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/test-unit-rr[ruby_targets_ruby24] ) ) sys-devel/gettext ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Native Language Support Library and Tools modeled after GNU gettext package
 EAPI=6
 HOMEPAGE=https://ruby-gettext.github.io/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( Ruby LGPL-3+ )
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby21] >=dev-ruby/text-1.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby22] >=dev-ruby/text-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby23] >=dev-ruby/text-1.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby24] >=dev-ruby/text-1.3.0[ruby_targets_ruby24] ) sys-devel/gettext 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby22] >=dev-ruby/text-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby23] >=dev-ruby/text-1.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby24] >=dev-ruby/text-1.3.0[ruby_targets_ruby24] ) sys-devel/gettext ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.2.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_=29ab82ea18c016bcd525f89b046fa9af
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-gio2-3.0.8
index fe3d6189ff87..87da894447e5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.0.8[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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.0.8[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby binding of GooCanvas
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.0.8[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/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.0.8[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ee9ed57dd4f86a81f97f31210263e450
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gio2-3.1.1
index 2dfd6c8b5a4f..a0e3d90e050e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby binding of GooCanvas
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=280aabcb877420151156b6dcf294bd91
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-glib2-3.0.8
index c9f1b9b7649c..23713a6bd0fd 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/glib-2 ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] test? ( >=dev-ruby/test-unit-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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=>=dev-libs/glib-2 ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] test? ( >=dev-ruby/test-unit-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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby Glib2 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=Ruby
-RDEPEND=>=dev-libs/glib-2 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=>=dev-libs/glib-2 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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b0b5a12c30cc95f0362e689ead5f142a
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-glib2-3.1.1
index 4bd99d6ebb39..b87d3c47556c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/glib-2 ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=>=dev-libs/glib-2 ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby Glib2 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=Ruby
-RDEPEND=>=dev-libs/glib-2 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=37b10d016d1cb543c05dae96aa486035
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.0.8-r1 b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.0.8-r1
index 1e9670fb4f45..75b18173a019 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.0.8-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.0.8-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gstreamer-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gtk-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview3-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-poppler-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-rsvg-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-vte-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-vte3-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-webkit2-gtk-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gstreamer-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gtk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-poppler-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-rsvg-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-vte-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-vte3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-webkit2-gtk-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gstreamer-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gtk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-poppler-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-rsvg-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-vte-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-vte3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-webkit2-gtk-3.0.8[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 )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gstreamer-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gtk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-poppler-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-rsvg-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-vte-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-vte3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-webkit2-gtk-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gstreamer-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gtk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-poppler-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-rsvg-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-vte-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-vte3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-webkit2-gtk-3.0.8[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 DESCRIPTION=Ruby Gnome2 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gstreamer-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gtk-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview3-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-poppler-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-rsvg-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-vte-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-vte3-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-webkit2-gtk-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gstreamer-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gtk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-poppler-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-rsvg-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-vte-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-vte3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-webkit2-gtk-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gstreamer-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gtk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-poppler-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-rsvg-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-vte-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-vte3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-webkit2-gtk-3.0.8[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 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gstreamer-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gtk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-poppler-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-rsvg-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-vte-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-vte3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-webkit2-gtk-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gstreamer-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gtk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-poppler-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-rsvg-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-vte-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-vte3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-webkit2-gtk-3.0.8[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 _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-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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ccfafac75276cfca6685c151a3c4a405
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.1.1
index 2a13688574bb..63831124800f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.1.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=Ruby Gnome2 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 _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-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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=615bfa9bfa187d4e32f55f140f27a6b9
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.0.8
index 1c0183145275..c1722f74ebc6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/gobject-introspection test? ( ruby_targets_ruby21? ( ~dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/ruby-glib2-3.0.8[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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=dev-libs/gobject-introspection test? ( ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/ruby-glib2-3.0.8[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby GObjectIntrospection bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby21? ( ~dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/ruby-glib2-3.0.8[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=dev-libs/gobject-introspection ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/ruby-glib2-3.0.8[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d323e62eaa03fb127f4c5cb7ece3e7c9
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.1.1
index aaa0fbe8110f..c62352f8f003 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/gobject-introspection test? ( ruby_targets_ruby21? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=dev-libs/gobject-introspection test? ( ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby GObjectIntrospection bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby21? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fcb2e2d574b82753e8af525c05122265
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.0.8
index 6c1b11cc04ff..72527072b9e0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/gobject-introspection media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 test? ( ruby_targets_ruby21? ( ~dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] ~dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ~dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] ~dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=dev-libs/gobject-introspection media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 test? ( ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ~dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] ~dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby GStreamer bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ruby21? ( ~dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] ~dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ~dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] ~dev-ruby/ruby-gobject-introspection-3.0.8[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=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ~dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] ~dev-ruby/ruby-gobject-introspection-3.0.8[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=39b6b7bc8a6c80f031f55fd29eaa8fc1
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.1.1
index 15f1531fbc97..569bd25bddd7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/gobject-introspection media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 test? ( ruby_targets_ruby21? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] ~dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ~dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ~dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ~dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=dev-libs/gobject-introspection media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 test? ( ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ~dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ~dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ~dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby GStreamer bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ruby21? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] ~dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ~dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ~dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ~dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ~dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ~dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ~dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=04feb9acef73d786ecb6f452cbea7cc9
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.0.8
index d0ef43d12358..62d5a9fba582 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtk+:2 x11-themes/hicolor-icon-theme ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=x11-libs/gtk+:2 x11-themes/hicolor-icon-theme ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby Gtk2 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[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=x11-libs/gtk+:2 ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=7b6d20880e346f63696b38854ef45883
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.1.1
index b6760a707603..df9cb8195ece 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtk+:2 x11-themes/hicolor-icon-theme ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=x11-libs/gtk+:2 x11-themes/hicolor-icon-theme ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby Gtk2 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=8f04542ba7ed560e1d6b25097a5b2934
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.0.8
index 7a3fd5483e78..513b51299f92 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtk+:3 ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=x11-libs/gtk+:3 ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby Gtk3 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby21? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[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=x11-libs/gtk+:3 ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.0.8[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=85ec3d166f42311ebced897bcb1f2ba5
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.1.1
index ece06a8d1172..768c6d822b8d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtk+:3 ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=x11-libs/gtk+:3 ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby Gtk3 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby21? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=46c23e7f9855ed40110d691f6800680d
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.0.8
index 6e08803b355f..90e5c93d3ee6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtksourceview:2.0 test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=x11-libs/gtksourceview:2.0 test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby bindings for gtksourceview
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk2-3.0.8[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=x11-libs/gtksourceview:2.0 ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk2-3.0.8[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=714a4151b12ecc597034eb6166859174
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.1.1
index 6375a1516443..a8d9cc2665d5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtksourceview:2.0 test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=x11-libs/gtksourceview:2.0 test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby bindings for gtksourceview
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=09b2a1db739dd522730e5a3b25ccbe07
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.0.8
index 7d6d07ccfd50..ed1b240812da 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby Gtk3 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk3-3.0.8[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=x11-libs/gtksourceview:3.0 ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk3-3.0.8[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=57bfe128facff567020ea413c546d3b1
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.1.1
index e1ba2a4e974f..691cb5760974 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby Gtk3 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=8a27d3fcbc591c93e409729d54e5988f
diff --git a/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1 b/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
index 59c67892df5d..81736c074165 100644
--- a/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/hoe-2.5.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-2.5.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-2.5.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-2.5.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-2.5.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-2.5.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-2.5.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A common interface to HMAC functionality as documented in RFC2104
 EAPI=5
 HOMEPAGE=http://ruby-hmac.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-hmac-0.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_=a1e7e4213fb4d6ee88d3718e2462ab83
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.17 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.17
index cd339720820f..0424fab4e0de 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.17
+++ b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.17
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=net-nds/openldap-2 dev-libs/cyrus-sasl ssl? ( dev-libs/openssl:0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=>=net-nds/openldap-2 dev-libs/cyrus-sasl ssl? ( dev-libs/openssl:0 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=A Ruby interface to some LDAP libraries
 EAPI=5
 HOMEPAGE=http://ruby-ldap.sourceforge.net/
-IUSE=ssl elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=ssl elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-macos
 LICENSE=BSD
-RDEPEND=>=net-nds/openldap-2 dev-libs/cyrus-sasl ssl? ( dev-libs/openssl:0 ) 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=>=net-nds/openldap-2 dev-libs/cyrus-sasl ssl? ( dev-libs/openssl:0 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-ldap-0.9.17.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_=5a581e82d887869ca2a082374eff5ee4
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.19 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.19
index 88ab217b07ce..34bf7e366f2e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.19
+++ b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.19
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=net-nds/openldap-2 dev-libs/cyrus-sasl ssl? ( dev-libs/openssl:0 ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=>=net-nds/openldap-2 dev-libs/cyrus-sasl ssl? ( dev-libs/openssl:0 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Ruby interface to some LDAP libraries
 EAPI=5
 HOMEPAGE=http://ruby-ldap.sourceforge.net/
-IUSE=ssl elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=ssl elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos
 LICENSE=BSD
-RDEPEND=>=net-nds/openldap-2 dev-libs/cyrus-sasl ssl? ( dev-libs/openssl:0 ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=net-nds/openldap-2 dev-libs/cyrus-sasl ssl? ( dev-libs/openssl:0 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-ldap-0.9.19.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_=ce6110d402ca1e8331b3fe72811782f5
diff --git a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10 b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10
index c24d9bcf2cec..717260714295 100644
--- a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10
+++ b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( media-sound/id3v2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/hoe[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/test-unit: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? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( media-sound/id3v2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/hoe[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/test-unit:2[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A pure Ruby library for access to mp3 files (internal infos and tags)
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/ruby-mp3info/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-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=https://github.com/moumar/ruby-mp3info/archive/v0.8.10.tar.gz -> ruby-mp3info-0.8.10-git.tgz
 _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_=f25db65ef8681e54baa2d386c19e2503
diff --git a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.9 b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.9
index 060e06a6dd47..1b5bfb5f9033 100644
--- a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.9
+++ b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( media-sound/id3v2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/hoe[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/test-unit: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? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( media-sound/id3v2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/hoe[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/test-unit:2[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A pure Ruby library for access to mp3 files (internal infos and tags)
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/ruby-mp3info/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-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=https://github.com/moumar/ruby-mp3info/archive/v0.8.9.tar.gz -> ruby-mp3info-0.8.9-git.tgz
 _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_=f25db65ef8681e54baa2d386c19e2503
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.0 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.0
index 9cdf1a76ccc4..6dee8a783cb2 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.0
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/flexmock-1.3.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/flexmock-1.3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/flexmock-1.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/flexmock-1.3.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/flexmock-1.3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/flexmock-1.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/flexmock-1.3.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Pure ruby LDAP client implementation
 EAPI=5
 HOMEPAGE=https://github.com/ruby-ldap/ruby-net-ldap
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-ldap-0.16.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_=08e002b6dd681baece06828ac0e0405c
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.8 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.8
index 3b7ee0a5555c..a29d552a3091 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.8
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=dev-db/oracle-instantclient-basic ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=A Ruby library for Oracle OCI8
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/ruby-oci8/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 ~x86
 LICENSE=Ruby
-RDEPEND=dev-db/oracle-instantclient-basic 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=dev-db/oracle-instantclient-basic 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/ruby-oci8-2.1.8.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_=922ac70a44a27f1afbf16cface837947
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.3
index a7ba50a812b8..4e43bca5f394 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-db/oracle-instantclient-basic 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Ruby library for Oracle OCI8
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/ruby-oci8/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=Ruby
-RDEPEND=dev-db/oracle-instantclient-basic 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oci8-2.2.3.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_=eb007c4136475d3badba7a89f08c4883
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.4.1 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.4.1
index 587e6e4570ea..5001a5abd42f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.4.1
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-db/oracle-instantclient-basic 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Ruby library for Oracle OCI8
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/ruby-oci8/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=Ruby
-RDEPEND=dev-db/oracle-instantclient-basic 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oci8-2.2.4.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_=2cc805e6c56611deed7f5339bceb0dcc
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997-r1 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997-r1
index 6666e981aa12..55c4dc4d12ec 100644
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997-r1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-db/unixODBC-2.0.6 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] ) 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=>=dev-db/unixODBC-2.0.6 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=RubyODBC - For accessing ODBC data sources from the Ruby language
 EAPI=5
 HOMEPAGE=http://www.ch-werner.de/rubyodbc/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ppc x86
 LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=>=dev-db/unixODBC-2.0.6 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=>=dev-db/unixODBC-2.0.6 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=0
 SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.99997.tar.gz
 _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_=2015f406e9ade168713c400040c0560c
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99998 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99998
index 87d35225be71..fa62bd0e2f30 100644
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99998
+++ b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99998
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-db/unixODBC-2.0.6 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=>=dev-db/unixODBC-2.0.6 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=RubyODBC - For accessing ODBC data sources from the Ruby language
 EAPI=5
 HOMEPAGE=http://www.ch-werner.de/rubyodbc/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=>=dev-db/unixODBC-2.0.6 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=dev-db/unixODBC-2.0.6 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.99998.tar.gz
 _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_=23830ddbdae4723006485c2f4103392e
diff --git a/metadata/md5-cache/dev-ruby/ruby-oembed-0.12.0 b/metadata/md5-cache/dev-ruby/ruby-oembed-0.12.0
index 26449ed604aa..002d916752eb 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oembed-0.12.0
+++ b/metadata/md5-cache/dev-ruby/ruby-oembed-0.12.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] dev-ruby/vcr:1[ruby_targets_ruby21] dev-ruby/xml-simple[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/fakeweb[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/vcr:1[ruby_targets_ruby22] dev-ruby/xml-simple[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/fakeweb[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] dev-ruby/vcr:1[ruby_targets_ruby23] dev-ruby/xml-simple[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/fakeweb[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: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/json[ruby_targets_ruby22] dev-ruby/vcr:1[ruby_targets_ruby22] dev-ruby/xml-simple[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/fakeweb[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] dev-ruby/vcr:1[ruby_targets_ruby23] dev-ruby/xml-simple[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/fakeweb[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: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=An oEmbed consumer library written in Ruby.
 EAPI=5
 HOMEPAGE=https://github.com/judofyr/ruby-oembed
-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=MIT
-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/ruby-oembed-0.12.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_=e7e16c9dc7120362d96bc4a4baf22b56
diff --git a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.1 b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.1
index 9d3b2eaab1d1..2fd5c0a90e89 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.1
+++ b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby library for easy read/write access to OLE compound documents
 EAPI=5
 HOMEPAGE=https://github.com/aquasync/ruby-ole
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-ole-1.2.12.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_=e42971de991a338f9b49a92d8902cf43
diff --git a/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0 b/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
index b90e4a807936..8e601c2ad753 100644
--- a/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
+++ b/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/opengl media-libs/freeglut 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=OpenGL / GLUT bindings for ruby
 EAPI=6
 HOMEPAGE=https://github.com/larskanis/opengl
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=virtual/opengl media-libs/freeglut 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/opengl-0.10.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_=3b00c2e4166518e167c3c52e8ed770d0
diff --git a/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2 b/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2
index 53b0227b46c9..5c6d80877783 100644
--- a/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2
+++ b/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/opengl media-libs/freeglut 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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=OpenGL / GLUT bindings for ruby
 EAPI=5
 HOMEPAGE=https://github.com/larskanis/opengl
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=amd64 hppa ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=virtual/opengl media-libs/freeglut 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=virtual/opengl media-libs/freeglut 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/opengl-0.9.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_=2efd5321f8df6a3003ee523e4a3be250
diff --git a/metadata/md5-cache/dev-ruby/ruby-openid-2.7.0 b/metadata/md5-cache/dev-ruby/ruby-openid-2.7.0
index 74d62d393b5e..3d6a0ab0cead 100644
--- a/metadata/md5-cache/dev-ruby/ruby-openid-2.7.0
+++ b/metadata/md5-cache/dev-ruby/ruby-openid-2.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A robust library for verifying and serving OpenID identities
 EAPI=5
 HOMEPAGE=https://github.com/openid/ruby-openid
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=amd64 ~ppc x86 ~x86-macos
 LICENSE=GPL-2
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/openid/ruby-openid/archive/v2.7.0.tar.gz -> ruby-openid-2.7.0.tar.gz
 _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_=088386b83c27639f81e396741c8c96c0
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-pango-3.0.8
index 63dd4561d901..bc6f5b222285 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=x11-libs/pango-1.2.1 test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rcairo-1.14.0[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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=>=x11-libs/pango-1.2.1 test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rcairo-1.14.0[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby Pango bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=>=x11-libs/pango-1.2.1 ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/rcairo-1.14.0[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=>=x11-libs/pango-1.2.1 ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/rcairo-1.14.0[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c8c5c207fe2708e7d80e5d2eb8ff6ba6
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-pango-3.1.1
index 8f7bfbf0e0d6..88fa3ebf8a38 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=x11-libs/pango-1.2.1 test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=>=x11-libs/pango-1.2.1 test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby Pango bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=>=x11-libs/pango-1.2.1 ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=x11-libs/pango-1.2.1 ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9160c1efd75d59ab15f8f93434c9e969
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-poppler-3.0.8
index b340995031da..e07e66ff8f2a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-text/poppler[cairo] test? ( ruby_targets_ruby21? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.0.8[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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=app-text/poppler[cairo] test? ( ruby_targets_ruby22? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.0.8[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby poppler-glib bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=app-text/poppler[cairo] ruby_targets_ruby21? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.0.8[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=app-text/poppler[cairo] ruby_targets_ruby22? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.0.8[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0678b0cf89df37d0544772edd7cc55e7
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-poppler-3.1.1
index 501094eb9aed..1e0f6b44c09c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-text/poppler[cairo] test? ( ruby_targets_ruby21? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=app-text/poppler[cairo] test? ( ruby_targets_ruby22? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby poppler-glib bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=app-text/poppler[cairo] ruby_targets_ruby21? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=app-text/poppler[cairo] ruby_targets_ruby22? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ad87e5252d295b821db3a472ca812756
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-0.16.2 b/metadata/md5-cache/dev-ruby/ruby-prof-0.16.2
index f1a760a13e7c..bdf8f761f24f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-0.16.2
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-0.16.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A module for profiling Ruby code
 EAPI=5
 HOMEPAGE=https://github.com/ruby-prof/ruby-prof
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/v0.16.2.tar.gz -> ruby-prof-0.16.2.tgz
 _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_=95f18aa0304e792283751fbfbfa10a6e
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1
index e4416d149dca..5dfe1251ee7f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/timecop[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/timecop[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/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_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/timecop[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Text Progress Bar Library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/jfelchner/ruby-progressbar
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=amd64 hppa ppc ppc64 x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-progressbar-1.4.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_=7792a6370aea90c926ed8de57e8fafc7
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.7.5 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.7.5
index 7f75c7b5dd06..e597a6c7d8f8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.7.5
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.7.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspectacular[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspectacular[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/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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/rspectacular[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Text Progress Bar Library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/jfelchner/ruby-progressbar
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~ppc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-progressbar-1.7.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_=d81765f37213a6ed7fce408e89b5e3fb
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.8.1 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.8.1
index 0000e6ebcd32..9cebf1541da4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.8.1
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.8.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspectacular[ruby_targets_ruby21] dev-ruby/timecop[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspectacular[ruby_targets_ruby22] dev-ruby/timecop[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspectacular[ruby_targets_ruby23] dev-ruby/timecop[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: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/rspectacular[ruby_targets_ruby22] dev-ruby/timecop[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspectacular[ruby_targets_ruby23] dev-ruby/timecop[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: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=A Text Progress Bar Library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/jfelchner/ruby-progressbar
-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 ~hppa ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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/ruby-progressbar-1.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_=a858d7dc8a75eba2eb8ff0cce82821c6
diff --git a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2 b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
index d2c58ee065f9..50f5873bb33f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A pure Ruby implementation of the Rc4 algorithm
 EAPI=5
 HOMEPAGE=https://github.com/caiges/Ruby-RC4
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-rc4-0.1.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_=a81d21de9c52326e056e34e647845f5b
diff --git a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6 b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6
index 5f2dfcd3c959..58d6a6f7a17b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6
+++ b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=A Romaji <-> Kana conversion library for Ruby
 EAPI=5
 HOMEPAGE=http://0xcc.net/ruby-romkan/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 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_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=http://0xcc.net/ruby-romkan/ruby-romkan-0.4.tar.gz
 _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-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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a107b67768d9c8fc12f594972f6d6326
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.0.8
index 49d0ec794a6b..5705de0702c3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=gnome-base/librsvg-2.16.1 test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby21] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/rcairo-1.12.8[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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=>=gnome-base/librsvg-2.16.1 test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/rcairo-1.12.8[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby bindings for librsvg
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=>=gnome-base/librsvg-2.16.1 ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby21] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/rcairo-1.12.8[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=>=gnome-base/librsvg-2.16.1 ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby22] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.8[ruby_targets_ruby23] >=dev-ruby/rcairo-1.12.8[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d7fd6238656150ae292367ed95d5420d
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.1.1
index 5f8f6f65f22c..e4a783c4c8a1 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=gnome-base/librsvg-2.16.1 test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby21] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=>=gnome-base/librsvg-2.16.1 test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby bindings for librsvg
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=>=gnome-base/librsvg-2.16.1 ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby21] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=gnome-base/librsvg-2.16.1 ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby22] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1e5fa94ad298c4918435cb97b2887c74
diff --git a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2 b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2
index 62c811488349..de7c8e1a100e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image? ( >=media-libs/sdl-image-1.2.2 ) mixer? ( >=media-libs/sdl-mixer-1.2.4 ) mpeg? ( >=media-libs/smpeg-0.4.4-r1 ) sge? ( media-libs/sge ) 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_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image? ( >=media-libs/sdl-image-1.2.2 ) mixer? ( >=media-libs/sdl-mixer-1.2.4 ) mpeg? ( >=media-libs/smpeg-0.4.4-r1 ) sge? ( media-libs/sge ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=Ruby/SDL: Ruby bindings for SDL
 EAPI=5
 HOMEPAGE=http://www.kmc.gr.jp/~ohai/rubysdl.en.html
-IUSE=image mixer truetype mpeg sge elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=image mixer truetype mpeg sge elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2.1
-RDEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image? ( >=media-libs/sdl-image-1.2.2 ) mixer? ( >=media-libs/sdl-mixer-1.2.4 ) mpeg? ( >=media-libs/smpeg-0.4.4-r1 ) sge? ( media-libs/sge ) 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_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image? ( >=media-libs/sdl-image-1.2.2 ) mixer? ( >=media-libs/sdl-mixer-1.2.4 ) mpeg? ( >=media-libs/smpeg-0.4.4-r1 ) sge? ( media-libs/sge ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ohai/rubysdl/archive/rel-2-1-2.tar.gz -> ruby-sdl-2.1.2.tar.gz
 _eclass_exported_funcs=pkg_postinst:- 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-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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bb54405b5ec666981a45c1c9cf9e9a4e
diff --git a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0 b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
index 82a6db3854b3..11afa857b9b9 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
+++ b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=ruby shadow bindings
 EAPI=5
 HOMEPAGE=https://github.com/apalmblad/ruby-shadow http://ttsky.net
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=amd64 hppa ppc ~sparc x86
 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-shadow-2.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_=29b18fe70e1d6f2e7f5b699f76616f90
diff --git a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2 b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2
index fb4846f62eeb..f0b4505683c0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2
+++ b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=media-libs/libshout-2.0 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] ) 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=>=media-libs/libshout-2.0 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A Ruby interface to libshout2
 EAPI=5
 HOMEPAGE=https://github.com/niko/ruby-shout
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~ppc x86
 LICENSE=Ruby
-RDEPEND=>=media-libs/libshout-2.0 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=>=media-libs/libshout-2.0 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/ruby-shout-2.2.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_=2551866bf8df72938cc264f07601db99
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0-r1 b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0-r1
index 01b95e69b20f..2c86d77a42dd 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0-r1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 DESCRIPTION=A Ruby interface to termios
 EAPI=5
 HOMEPAGE=http://arika.org/ruby/termios
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
 KEYWORDS=amd64 ~hppa ~mips ~ppc x86 ~x86-macos
 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 )
-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 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/arika/ruby-termios/archive/version_1_0_0.tar.gz -> ruby-termios-1.0.0.tar.gz
 _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-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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=821d9099e0d7ad702af82f7208705712
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1 b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
index 480a321aae3f..ff85e9f74f45 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Ruby interface to termios
 EAPI=5
 HOMEPAGE=http://arika.org/ruby/termios
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~hppa ~mips ~ppc ~x86 ~x86-macos
 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-termios-1.0.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_=30e37b6757d4d1ad23b4b7c19939fe61
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-vte-3.0.8
index 8eb71e1ff9f6..113f93c6d0ef 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=x11-libs/vte-0.12.1:0 test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk2-3.0.8[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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=>=x11-libs/vte-0.12.1:0 test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk2-3.0.8[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby vte bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk2-3.0.8[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=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk2-3.0.8[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c141e8f5592486526be6ab5516531afd
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-vte-3.1.1
index 7ec6a64bac89..e52b6cace1f4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=x11-libs/vte-0.12.1:0 test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=>=x11-libs/vte-0.12.1:0 test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby vte bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8e7e82c8f3700fb195a25e0d451dcca7
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-3.0.8-r1 b/metadata/md5-cache/dev-ruby/ruby-vte3-3.0.8-r1
index b52c0280b042..6465d61fdce1 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-3.0.8-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-3.0.8-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/vte:2.91 ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=x11-libs/vte:2.91 ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.0.8[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby VTE bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/vte:2.91 ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk3-3.0.8[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=x11-libs/vte:2.91 ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk3-3.0.8[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=4272312fc0eecdc708cb351b42af8e1f
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-vte3-3.1.1
index de3992ffefa9..d40c6a7e577d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/vte:2.91 ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=x11-libs/vte:2.91 ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby VTE bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/vte:2.91 ruby_targets_ruby21? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=x11-libs/vte:2.91 ruby_targets_ruby22? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=26c06d3d424818595f86e5691f26b499
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.0.8 b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.0.8
index 228e6265cfc4..6609c84f4d1a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-libs/webkit-gtk:4 test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
+DEPEND=net-libs/webkit-gtk:4 test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] )
 DESCRIPTION=Ruby WebKitGtk+ for Gtk 3.0 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=net-libs/webkit-gtk:4 ruby_targets_ruby21? ( >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby21] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.0.8[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=net-libs/webkit-gtk:4 ruby_targets_ruby22? ( >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.0.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gobject-introspection-3.0.8[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.0.8[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://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.8.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=b4c6bca949857efb8451ca3edc9a3a19
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.1.1
index 03d067612292..0ec2799cca01 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-libs/webkit-gtk:4 test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=net-libs/webkit-gtk:4 test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
 DESCRIPTION=Ruby WebKitGtk+ for Gtk 3.0 bindings
 EAPI=5
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
-IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=net-libs/webkit-gtk:4 ruby_targets_ruby21? ( >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=net-libs/webkit-gtk:4 ruby_targets_ruby22? ( >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
 _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-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-ng-gnome2	c87555693e48d10b05cae511675dc22c	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=0fe00bca1a83007b3e50716d7c01eff8
diff --git a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r3 b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r3
index 2b432312dc05..d0ba35227235 100644
--- a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/libxslt-1.1.12 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=>=dev-libs/libxslt-1.1.12 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A Ruby class for processing XSLT
 EAPI=5
 HOMEPAGE=http://www.rubyfr.net/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/libxslt-1.1.12 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=dev-libs/libxslt-1.1.12 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-xslt-0.9.9.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_=d288dcbd5512b3830942ec1c8c1d633f
diff --git a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2 b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
index 5f1876dfa59d..4d399b25e6ad 100644
--- a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A ruby library for performing Yadis service discovery
 EAPI=5
 HOMEPAGE=http://yadis.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-yadis-0.3.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_=bc552c3c61e8630943ab6d543dae902b
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.0 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.0
index 3459203f3ec1..8c778e733143 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.0
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby21] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby21] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby22] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/hoe-seattlerb[ruby_targets_ruby21] ) test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] ) test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] ) test? ( >=dev-ruby/minitest-5.3:5[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby22] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] ) test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] ) test? ( >=dev-ruby/minitest-5.3:5[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Generates readable ruby from ParseTree
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/ruby2ruby
-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=alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby21] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby21] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby22] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[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/sexp_processor-4.6.0:4[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby22] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[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=2
 SRC_URI=mirror://rubygems/ruby2ruby-2.3.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_=94080c1d17eb2d5eb58480a5b027a6a1
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.1 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.1
index ff4825576d51..8744e86f6e11 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.1
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby21] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby21] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby22] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/hoe-seattlerb[ruby_targets_ruby21] ) test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] ) test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] ) test? ( >=dev-ruby/minitest-5.3:5[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby22] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] ) test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] ) test? ( >=dev-ruby/minitest-5.3:5[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Generates readable ruby from ParseTree
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/ruby2ruby
-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=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby21] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby21] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby22] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[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/sexp_processor-4.6.0:4[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby22] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[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=2
 SRC_URI=mirror://rubygems/ruby2ruby-2.3.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_=d565883c52d73e1868e14eb026c0f1b9
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.2 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.2
index 0b5be9de82c7..632d6937c6f1 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.2
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby21] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby21] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby22] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby24] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby24] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby22] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby24] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby24] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Generates readable ruby from ParseTree
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/ruby2ruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby21] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby21] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby22] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby24] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby24] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby22] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby24] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby24] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/ruby2ruby-2.3.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_=1d82e2d18065b3084714ed1cffba3c44
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.0 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.0
index 43e842c6af80..f857a85748de 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.0
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby21] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby21] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby22] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby24] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby24] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby21] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby22] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby23] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby24] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby22] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby24] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby24] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby22] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby23] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby24] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Generates readable ruby from ParseTree
 EAPI=6
 HOMEPAGE=https://github.com/seattlerb/ruby2ruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby21] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby21] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby22] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby24] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby24] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby22] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby24] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby24] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/ruby2ruby-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_=7b6094d141b54a4cef356fc2e0087313
diff --git a/metadata/md5-cache/dev-ruby/ruby_dep-1.3.1 b/metadata/md5-cache/dev-ruby/ruby_dep-1.3.1
index ce0048f50c6d..ff1528a544b7 100644
--- a/metadata/md5-cache/dev-ruby/ruby_dep-1.3.1
+++ b/metadata/md5-cache/dev-ruby/ruby_dep-1.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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? ( 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? ( 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=Creates a version constraint of supported Rubies,suitable for a gemspec file
 EAPI=5
 HOMEPAGE=https://github.com/e2/ruby_dep
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64
 LICENSE=MIT
-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=1
 SRC_URI=mirror://rubygems/ruby_dep-1.3.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_=2ef07249fb7c57b50f944df7a659c5dc
diff --git a/metadata/md5-cache/dev-ruby/ruby_dep-1.4.0 b/metadata/md5-cache/dev-ruby/ruby_dep-1.4.0
index 5a37453e74c3..2bb1e0961891 100644
--- a/metadata/md5-cache/dev-ruby/ruby_dep-1.4.0
+++ b/metadata/md5-cache/dev-ruby/ruby_dep-1.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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? ( 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? ( 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=Creates a version constraint of supported Rubies,suitable for a gemspec file
 EAPI=5
 HOMEPAGE=https://github.com/e2/ruby_dep
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~alpha ~amd64 ~arm
 LICENSE=MIT
-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=1
 SRC_URI=mirror://rubygems/ruby_dep-1.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_=68ccdbc1e3dc8e3e1e67857d9b3a2b44
diff --git a/metadata/md5-cache/dev-ruby/ruby_dep-1.5.0 b/metadata/md5-cache/dev-ruby/ruby_dep-1.5.0
index f60733f3b18c..f5c8a4669e91 100644
--- a/metadata/md5-cache/dev-ruby/ruby_dep-1.5.0
+++ b/metadata/md5-cache/dev-ruby/ruby_dep-1.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Creates a version constraint of supported Rubies,suitable for a gemspec file
 EAPI=5
 HOMEPAGE=https://github.com/e2/ruby_dep
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/ruby_dep-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_=4cdb289ead4dad34e9e57141a21df84a
diff --git a/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4 b/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
index ad05832fad58..6b91c82d5b42 100644
--- a/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
+++ b/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rr[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rr[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rr[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: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=ruby_targets_ruby22? ( test? ( dev-ruby/rr[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rr[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: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=Ruby library for GNTP(Growl Notification Transport Protocol)
 EAPI=5
 HOMEPAGE=https://github.com/snaka/ruby_gntp
-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
 LICENSE=MIT
-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/ruby_gntp-0.3.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_=6121b6ab226be619902c06d4a0978df8
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.10.0 b/metadata/md5-cache/dev-ruby/ruby_parser-3.10.0
index 6333b868e6a6..e67a10182ec4 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.10.0
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.10.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby21] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/racc[ruby_targets_ruby21] >=dev-ruby/minitest-4.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/racc[ruby_targets_ruby22] >=dev-ruby/minitest-4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/racc[ruby_targets_ruby23] >=dev-ruby/minitest-4.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/racc[ruby_targets_ruby24] >=dev-ruby/minitest-4.3[ruby_targets_ruby24] ) ) test? ( dev-util/unifdef ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/racc[ruby_targets_ruby22] >=dev-ruby/minitest-4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/racc[ruby_targets_ruby23] >=dev-ruby/minitest-4.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/racc[ruby_targets_ruby24] >=dev-ruby/minitest-4.3[ruby_targets_ruby24] ) ) test? ( dev-util/unifdef ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A ruby parser written in pure ruby
 EAPI=6
 HOMEPAGE=https://github.com/seattlerb/ruby_parser
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby21] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/ruby_parser-3.10.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_=c3f39841d222d808d5c0b1f7611b506f
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.10.1 b/metadata/md5-cache/dev-ruby/ruby_parser-3.10.1
index 2a5faba51c11..1650a37b805a 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.10.1
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.10.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby21] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/racc[ruby_targets_ruby21] >=dev-ruby/minitest-4.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/racc[ruby_targets_ruby22] >=dev-ruby/minitest-4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/racc[ruby_targets_ruby23] >=dev-ruby/minitest-4.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/racc[ruby_targets_ruby24] >=dev-ruby/minitest-4.3[ruby_targets_ruby24] ) ) test? ( dev-util/unifdef ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/racc[ruby_targets_ruby22] >=dev-ruby/minitest-4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/racc[ruby_targets_ruby23] >=dev-ruby/minitest-4.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/racc[ruby_targets_ruby24] >=dev-ruby/minitest-4.3[ruby_targets_ruby24] ) ) test? ( dev-util/unifdef ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A ruby parser written in pure ruby
 EAPI=6
 HOMEPAGE=https://github.com/seattlerb/ruby_parser
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby21] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/ruby_parser-3.10.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_=c3f39841d222d808d5c0b1f7611b506f
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.8.2 b/metadata/md5-cache/dev-ruby/ruby_parser-3.8.2
index def3b59de3b7..1b6116ff4934 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.8.2
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.8.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby21] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/racc[ruby_targets_ruby21] >=dev-ruby/minitest-4.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/racc[ruby_targets_ruby22] >=dev-ruby/minitest-4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/racc[ruby_targets_ruby23] >=dev-ruby/minitest-4.3[ruby_targets_ruby23] ) ) test? ( dev-util/unifdef ) 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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/racc[ruby_targets_ruby22] >=dev-ruby/minitest-4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/racc[ruby_targets_ruby23] >=dev-ruby/minitest-4.3[ruby_targets_ruby23] ) ) test? ( dev-util/unifdef ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A ruby parser written in pure ruby
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/ruby_parser
-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=alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby21] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[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/sexp_processor-4.7.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[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=3
 SRC_URI=mirror://rubygems/ruby_parser-3.8.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_=3437a3dd69285056ca0b08873bcaaaca
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.8.3 b/metadata/md5-cache/dev-ruby/ruby_parser-3.8.3
index 9fb53fe63b85..282c5745fe00 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.8.3
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.8.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby21] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/racc[ruby_targets_ruby21] >=dev-ruby/minitest-4.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/racc[ruby_targets_ruby22] >=dev-ruby/minitest-4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/racc[ruby_targets_ruby23] >=dev-ruby/minitest-4.3[ruby_targets_ruby23] ) ) test? ( dev-util/unifdef ) 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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/racc[ruby_targets_ruby22] >=dev-ruby/minitest-4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/racc[ruby_targets_ruby23] >=dev-ruby/minitest-4.3[ruby_targets_ruby23] ) ) test? ( dev-util/unifdef ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A ruby parser written in pure ruby
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/ruby_parser
-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=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby21] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[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/sexp_processor-4.7.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[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=3
 SRC_URI=mirror://rubygems/ruby_parser-3.8.3.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_=801cdb68ce50b5d2b9965767d63c2a3a
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.8.4 b/metadata/md5-cache/dev-ruby/ruby_parser-3.8.4
index 9728329d6bea..1eab13610884 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.8.4
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.8.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby21] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/racc[ruby_targets_ruby21] >=dev-ruby/minitest-4.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/racc[ruby_targets_ruby22] >=dev-ruby/minitest-4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/racc[ruby_targets_ruby23] >=dev-ruby/minitest-4.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/racc[ruby_targets_ruby24] >=dev-ruby/minitest-4.3[ruby_targets_ruby24] ) ) test? ( dev-util/unifdef ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/racc[ruby_targets_ruby22] >=dev-ruby/minitest-4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/racc[ruby_targets_ruby23] >=dev-ruby/minitest-4.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/racc[ruby_targets_ruby24] >=dev-ruby/minitest-4.3[ruby_targets_ruby24] ) ) test? ( dev-util/unifdef ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A ruby parser written in pure ruby
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/ruby_parser
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby21] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/ruby_parser-3.8.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_=9bbf8d1f4d7fdcbd2cb1a48004737357
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.9.0 b/metadata/md5-cache/dev-ruby/ruby_parser-3.9.0
index dd5ec9647d34..b59a2d93398e 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.9.0
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.9.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby21] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/racc[ruby_targets_ruby21] >=dev-ruby/minitest-4.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/racc[ruby_targets_ruby22] >=dev-ruby/minitest-4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/racc[ruby_targets_ruby23] >=dev-ruby/minitest-4.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/racc[ruby_targets_ruby24] >=dev-ruby/minitest-4.3[ruby_targets_ruby24] ) ) test? ( dev-util/unifdef ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/racc[ruby_targets_ruby22] >=dev-ruby/minitest-4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/racc[ruby_targets_ruby23] >=dev-ruby/minitest-4.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/racc[ruby_targets_ruby24] >=dev-ruby/minitest-4.3[ruby_targets_ruby24] ) ) test? ( dev-util/unifdef ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A ruby parser written in pure ruby
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/ruby_parser
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby21] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/ruby_parser-3.9.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_=3122594437481b86139dc678c4f034c7
diff --git a/metadata/md5-cache/dev-ruby/ruby_smb-0.0.12 b/metadata/md5-cache/dev-ruby/ruby_smb-0.0.12
index 55b9946a3a50..4b23b8375a94 100644
--- a/metadata/md5-cache/dev-ruby/ruby_smb-0.0.12
+++ b/metadata/md5-cache/dev-ruby/ruby_smb-0.0.12
@@ -12,5 +12,5 @@ RESTRICT=test
 SLOT=0.0.12
 SRC_URI=mirror://rubygems/ruby_smb-0.0.12.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_=a88028c262dccdca1767ff18fd3dfad1
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.5.2 b/metadata/md5-cache/dev-ruby/rubygems-2.5.2
index df1d55277670..b80d12a43e1c 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.5.2
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.5.2
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby23] dev-ruby/rdoc[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 )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 DESCRIPTION=Centralized Ruby extension management system
 EAPI=5
 HOMEPAGE=https://rubygems.org/
-IUSE=server test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
+IUSE=server test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby MIT )
 PDEPEND=server? ( >=dev-ruby/builder-2.1 )
-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 )
-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 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-2.5.2.tgz
 _eclass_exported_funcs=pkg_postinst:- 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	prefix	df8265631f8bf5f5df387e9b987121f9	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	prefix	df8265631f8bf5f5df387e9b987121f9	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=306f958bc5a606522e75aa9458230299
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.6.12 b/metadata/md5-cache/dev-ruby/rubygems-2.6.12
index 3b6a64676bc7..7e7bdba155a2 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.6.12
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.6.12
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=Centralized Ruby extension management system
 EAPI=6
 HOMEPAGE=https://rubygems.org/
-IUSE=server test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=server test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby MIT )
 PDEPEND=server? ( >=dev-ruby/builder-2.1 )
-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_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-2.6.12.tgz
 _eclass_exported_funcs=pkg_postinst:- 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	prefix	df8265631f8bf5f5df387e9b987121f9	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	prefix	df8265631f8bf5f5df387e9b987121f9	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=88c7f2d26d031550dc53d807f29b8254
diff --git a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.1 b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.1
index d48035d23317..31cf9ef5b686 100644
--- a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.1
+++ b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=Ruby/NTLM provides message creator and parser for the NTLM authentication.
 EAPI=5
 HOMEPAGE=https://github.com/winrb/rubyntlm
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-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/rubyntlm-0.6.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_=855a20854ae4721bc4c9f0b6130f2717
diff --git a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.2 b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.2
index 8b17e80e6722..f459393ffe2f 100644
--- a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.2
+++ b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby/NTLM provides message creator and parser for the NTLM authentication.
 EAPI=6
 HOMEPAGE=https://github.com/winrb/rubyntlm
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubyntlm-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_=8acb39757e61bd6bdaacbcc5793468bd
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5 b/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5
index 4496bad6e853..067a1aaaa4b3 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) 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? ( 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A Ruby port of the SmartyPants PHP library
 EAPI=5
 HOMEPAGE=http://chneukirchen.org/repos/rubypants/README
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 x86
 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/rubypants-0.2.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_=dbbed420df32635afd83b2cd3bf3b756
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.5.0 b/metadata/md5-cache/dev-ruby/rubypants-0.5.0
index dbe2d40b9ba3..3bb0c183fc1f 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.5.0
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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? ( 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? ( 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=A Ruby port of the SmartyPants PHP library
 EAPI=5
 HOMEPAGE=http://chneukirchen.org/repos/rubypants/README
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~x86
 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/rubypants-0.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_=09ffc9a5cd72bc431a45f3ddbba54975
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.5.1 b/metadata/md5-cache/dev-ruby/rubypants-0.5.1
index 547bd849357b..6c5de677a909 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.5.1
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.5.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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? ( 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? ( 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=A Ruby port of the SmartyPants PHP library
 EAPI=5
 HOMEPAGE=http://chneukirchen.org/repos/rubypants/README
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~x86
 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/rubypants-0.5.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_=09ffc9a5cd72bc431a45f3ddbba54975
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.6.0 b/metadata/md5-cache/dev-ruby/rubypants-0.6.0
index 21bc4fc798c0..d565a2f39962 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.6.0
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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? ( 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? ( 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=A Ruby port of the SmartyPants PHP library
 EAPI=5
 HOMEPAGE=http://chneukirchen.org/repos/rubypants/README
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~x86
 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/rubypants-0.6.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_=a98b4912ff979799cfc51c89bce8f708
diff --git a/metadata/md5-cache/dev-ruby/rubytest-0.8.1 b/metadata/md5-cache/dev-ruby/rubytest-0.8.1
index 7100d33abaf4..5f0d8c9ade4f 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-0.8.1
+++ b/metadata/md5-cache/dev-ruby/rubytest-0.8.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/ae[ruby_targets_ruby21] dev-ruby/qed[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/ae[ruby_targets_ruby22] dev-ruby/qed[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ae[ruby_targets_ruby23] dev-ruby/qed[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/ansi[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ansi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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/ae[ruby_targets_ruby22] dev-ruby/qed[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ae[ruby_targets_ruby23] dev-ruby/qed[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/ansi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=Ruby Test is a universal test harness for Ruby
 EAPI=5
 HOMEPAGE=https://rubyworks.github.io/rubytest/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/ansi[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ansi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[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/ansi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[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/rubytest-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_=6b7ae70dee8415f462e7f2006c0d4242
diff --git a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0 b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
index 6085bb8f06d4..d9be7001b96f 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
+++ b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/ansi[ruby_targets_ruby21] >=dev-ruby/rubytest-0.8.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ansi[ruby_targets_ruby22] >=dev-ruby/rubytest-0.8.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[ruby_targets_ruby23] >=dev-ruby/rubytest-0.8.0[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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-ruby/ansi[ruby_targets_ruby22] >=dev-ruby/rubytest-0.8.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[ruby_targets_ruby23] >=dev-ruby/rubytest-0.8.0[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=Rubytest CLI is a command-line interface for Rubytest
 EAPI=5
 HOMEPAGE=https://rubyworks.github.io/rubytest-cli/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/ansi[ruby_targets_ruby21] >=dev-ruby/rubytest-0.8.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ansi[ruby_targets_ruby22] >=dev-ruby/rubytest-0.8.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[ruby_targets_ruby23] >=dev-ruby/rubytest-0.8.0[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/ansi[ruby_targets_ruby22] >=dev-ruby/rubytest-0.8.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[ruby_targets_ruby23] >=dev-ruby/rubytest-0.8.0[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/rubytest-cli-0.2.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_=7924778cd9a67f0410f1dab089c55510
diff --git a/metadata/md5-cache/dev-ruby/rubytter-1.5.1 b/metadata/md5-cache/dev-ruby/rubytter-1.5.1
index 871c59b178d9..d1f3f4c8ad90 100644
--- a/metadata/md5-cache/dev-ruby/rubytter-1.5.1
+++ b/metadata/md5-cache/dev-ruby/rubytter-1.5.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/json-1.1.3[ruby_targets_ruby21] >=dev-ruby/oauth-0.3.6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.1.3[ruby_targets_ruby22] >=dev-ruby/oauth-0.3.6[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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_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? ( ruby_targets_ruby22? ( >=dev-ruby/json-1.1.3[ruby_targets_ruby22] >=dev-ruby/oauth-0.3.6[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Rubytter is a simple twitter library
 EAPI=5
 HOMEPAGE=https://wiki.github.com/jugyo/rubytter
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/json-1.1.3[ruby_targets_ruby21] >=dev-ruby/oauth-0.3.6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.1.3[ruby_targets_ruby22] >=dev-ruby/oauth-0.3.6[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/json-1.1.3[ruby_targets_ruby22] >=dev-ruby/oauth-0.3.6[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/rubytter-1.5.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_=2bee9dae453528082a585912fea5b582
diff --git a/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r1 b/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r1
index bfaa889fce52..30b6aacb30a9 100644
--- a/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r1
+++ b/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/json-1.1.3:*[ruby_targets_ruby21] >=dev-ruby/oauth-0.3.6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.1.3:*[ruby_targets_ruby22] >=dev-ruby/oauth-0.3.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.1.3:*[ruby_targets_ruby23] >=dev-ruby/oauth-0.3.6[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: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-ruby/json-1.1.3:*[ruby_targets_ruby22] >=dev-ruby/oauth-0.3.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.1.3:*[ruby_targets_ruby23] >=dev-ruby/oauth-0.3.6[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: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=Rubytter is a simple twitter library
 EAPI=5
 HOMEPAGE=https://wiki.github.com/jugyo/rubytter
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/json-1.1.3:*[ruby_targets_ruby21] >=dev-ruby/oauth-0.3.6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.1.3:*[ruby_targets_ruby22] >=dev-ruby/oauth-0.3.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.1.3:*[ruby_targets_ruby23] >=dev-ruby/oauth-0.3.6[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/json-1.1.3:*[ruby_targets_ruby22] >=dev-ruby/oauth-0.3.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.1.3:*[ruby_targets_ruby23] >=dev-ruby/oauth-0.3.6[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/rubytter-1.5.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_=86fdb99f76e09a80282eb1d12fa1be22
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-1.2.1 b/metadata/md5-cache/dev-ruby/rubyzip-1.2.1
index 671b7e32b037..935dfad9fa62 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-1.2.1
+++ b/metadata/md5-cache/dev-ruby/rubyzip-1.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-arch/zip ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( app-arch/zip ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A ruby library for reading and writing zip files
 EAPI=5
 HOMEPAGE=https://github.com/rubyzip/rubyzip
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v1.2.1.tar.gz -> rubyzip-1.2.1-git.tgz
 _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_=e62db23b062d94182d2f8738e61202b9
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4
index 80a37557a31c..e221cf4b9992 100644
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4
+++ b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/hashie[ruby_targets_ruby21] dev-ruby/heredoc_unindent[ruby_targets_ruby21] dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hashie[ruby_targets_ruby22] dev-ruby/heredoc_unindent[ruby_targets_ruby22] dev-ruby/rspec:2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[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/hashie[ruby_targets_ruby22] dev-ruby/heredoc_unindent[ruby_targets_ruby22] dev-ruby/rspec:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Parse YAML safely, alternative implementation of YAML.load
 EAPI=5
 HOMEPAGE=https://dtao.github.com/safe_yaml
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/safe_yaml-1.0.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_=5b8722ae1bbc8b20ec21a9da25a055a3
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r2 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r2
index 71a92170e04e..9708583255ef 100644
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r2
+++ b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/hashie[ruby_targets_ruby21] dev-ruby/heredoc_unindent[ruby_targets_ruby21] dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hashie[ruby_targets_ruby22] dev-ruby/heredoc_unindent[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[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/hashie[ruby_targets_ruby22] dev-ruby/heredoc_unindent[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Parse YAML safely, alternative implementation of YAML.load
 EAPI=5
 HOMEPAGE=https://dtao.github.com/safe_yaml
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/safe_yaml-1.0.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_=f7c45e4f9dd4d2bdb129604d07b136a2
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r3 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r3
index e76a1395c054..1d514449d4a8 100644
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r3
+++ b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/hashie[ruby_targets_ruby21] dev-ruby/heredoc_unindent[ruby_targets_ruby21] dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hashie[ruby_targets_ruby22] dev-ruby/heredoc_unindent[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hashie[ruby_targets_ruby23] dev-ruby/heredoc_unindent[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/hashie[ruby_targets_ruby24] dev-ruby/heredoc_unindent[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/hashie[ruby_targets_ruby22] dev-ruby/heredoc_unindent[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/hashie[ruby_targets_ruby23] dev-ruby/heredoc_unindent[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/hashie[ruby_targets_ruby24] dev-ruby/heredoc_unindent[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Parse YAML safely, alternative implementation of YAML.load
 EAPI=5
 HOMEPAGE=https://dtao.github.com/safe_yaml
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/safe_yaml-1.0.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_=61905230cff0f19245a8332ecf2ac17a
diff --git a/metadata/md5-cache/dev-ruby/samuel-0.3.3-r2 b/metadata/md5-cache/dev-ruby/samuel-0.3.3-r2
index 0d98d17b5826..d02847df0059 100644
--- a/metadata/md5-cache/dev-ruby/samuel-0.3.3-r2
+++ b/metadata/md5-cache/dev-ruby/samuel-0.3.3-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/shoulda-2.11.3[ruby_targets_ruby21] >=dev-ruby/fakeweb-1.3[ruby_targets_ruby21] >=dev-ruby/httpclient-2.2.3[ruby_targets_ruby21] dev-ruby/mocha:0.14[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/shoulda-2.11.3[ruby_targets_ruby22] >=dev-ruby/fakeweb-1.3[ruby_targets_ruby22] >=dev-ruby/httpclient-2.2.3[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] dev-ruby/test-unit: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/shoulda-2.11.3[ruby_targets_ruby22] >=dev-ruby/fakeweb-1.3[ruby_targets_ruby22] >=dev-ruby/httpclient-2.2.3[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] dev-ruby/test-unit: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=An automatic logger for HTTP requests in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/chrisk/samuel
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/samuel-0.3.3.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_=a1ad6876cd94d920f6a689f65efe72fc
diff --git a/metadata/md5-cache/dev-ruby/sanitize-2.1.0 b/metadata/md5-cache/dev-ruby/sanitize-2.1.0
index 3f6fa25b4ad5..08e3a13f3f64 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-2.1.0
+++ b/metadata/md5-cache/dev-ruby/sanitize-2.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[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=Sanitize is a whitelist-based HTML sanitizer
 EAPI=5
 HOMEPAGE=https://github.com/rgrove/sanitize
-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 ~x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.4.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/nokogiri-1.4.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.4.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/sanitize-2.1.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_=b56163d66ab08e248a15cb788bf86572
diff --git a/metadata/md5-cache/dev-ruby/sanitize-4.4.0 b/metadata/md5-cache/dev-ruby/sanitize-4.4.0
index 2d721595b55b..3b39fc1df4fe 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-4.4.0
+++ b/metadata/md5-cache/dev-ruby/sanitize-4.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby21] =dev-ruby/crass-1.0*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby21] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby22] =dev-ruby/crass-1.0*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby22] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby23] =dev-ruby/crass-1.0*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby23] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby22] =dev-ruby/crass-1.0*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby22] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby23] =dev-ruby/crass-1.0*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby23] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[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=Sanitize is a whitelist-based HTML sanitizer
 EAPI=5
 HOMEPAGE=https://github.com/rgrove/sanitize
-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 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby21] =dev-ruby/crass-1.0*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby21] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby22] =dev-ruby/crass-1.0*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby22] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby23] =dev-ruby/crass-1.0*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby23] =dev-ruby/nokogumbo-1.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/crass-1.0.2[ruby_targets_ruby22] =dev-ruby/crass-1.0*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby22] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby23] =dev-ruby/crass-1.0*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby23] =dev-ruby/nokogumbo-1.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=4
 SRC_URI=https://github.com/rgrove/sanitize/archive/v4.4.0.tar.gz -> sanitize-4.4.0.tar.gz
 _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_=9f3949c86d159d6bbf965339e2e442d8
diff --git a/metadata/md5-cache/dev-ruby/sanitize-4.5.0 b/metadata/md5-cache/dev-ruby/sanitize-4.5.0
index 76326f66230d..20f8e2f97ed2 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-4.5.0
+++ b/metadata/md5-cache/dev-ruby/sanitize-4.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby21] =dev-ruby/crass-1.0*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby21] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby22] =dev-ruby/crass-1.0*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby22] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby23] =dev-ruby/crass-1.0*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby23] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby22] =dev-ruby/crass-1.0*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby22] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby23] =dev-ruby/crass-1.0*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby23] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[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=Sanitize is a whitelist-based HTML sanitizer
 EAPI=6
 HOMEPAGE=https://github.com/rgrove/sanitize
-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 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby21] =dev-ruby/crass-1.0*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby21] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby22] =dev-ruby/crass-1.0*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby22] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby23] =dev-ruby/crass-1.0*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby23] =dev-ruby/nokogumbo-1.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/crass-1.0.2[ruby_targets_ruby22] =dev-ruby/crass-1.0*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby22] =dev-ruby/nokogumbo-1.4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby23] =dev-ruby/crass-1.0*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] >=dev-ruby/nokogumbo-1.4.1[ruby_targets_ruby23] =dev-ruby/nokogumbo-1.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=4
 SRC_URI=https://github.com/rgrove/sanitize/archive/v4.5.0.tar.gz -> sanitize-4.5.0.tar.gz
 _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_=9f5ec8a332b327302fec0464b2bbab29
diff --git a/metadata/md5-cache/dev-ruby/sass-3.2.19-r2 b/metadata/md5-cache/dev-ruby/sass-3.2.19-r2
index 109681964199..cc9f3b353675 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.2.19-r2
+++ b/metadata/md5-cache/dev-ruby/sass-3.2.19-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/listen-0.7.2:0[ruby_targets_ruby21] !!<dev-ruby/haml-3.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/listen-0.7.2:0[ruby_targets_ruby22] !!<dev-ruby/haml-3.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-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? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/listen-0.7.2:0[ruby_targets_ruby22] !!<dev-ruby/haml-3.1[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=An extension of CSS3, adding nested rules, variables, mixins and more
 EAPI=5
 HOMEPAGE=http://sass-lang.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/listen-0.7.2:0[ruby_targets_ruby21] !!<dev-ruby/haml-3.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/listen-0.7.2:0[ruby_targets_ruby22] !!<dev-ruby/haml-3.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/listen-0.7.2:0[ruby_targets_ruby22] !!<dev-ruby/haml-3.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/sass-3.2.19.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_=1c33282f1538e25529b3ccc61ef9524b
diff --git a/metadata/md5-cache/dev-ruby/sass-3.4.15 b/metadata/md5-cache/dev-ruby/sass-3.4.15
index 5c323a125a9a..721f3fdb09e2 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.4.15
+++ b/metadata/md5-cache/dev-ruby/sass-3.4.15
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby21] !!<dev-ruby/haml-3.1[ruby_targets_ruby21] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby21] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!<dev-ruby/haml-3.1[ruby_targets_ruby22] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby22] !!<dev-ruby/sass-3.3.14-r1:3.3[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? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!<dev-ruby/haml-3.1[ruby_targets_ruby22] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby22] !!<dev-ruby/sass-3.3.14-r1:3.3[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=An extension of CSS3, adding nested rules, variables, mixins and more
 EAPI=5
 HOMEPAGE=http://sass-lang.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby21] !!<dev-ruby/haml-3.1[ruby_targets_ruby21] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby21] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!<dev-ruby/haml-3.1[ruby_targets_ruby22] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby22] !!<dev-ruby/sass-3.3.14-r1:3.3[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/listen-1.3.1:1[ruby_targets_ruby22] !!<dev-ruby/haml-3.1[ruby_targets_ruby22] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby22] !!<dev-ruby/sass-3.3.14-r1:3.3[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=3.4
 SRC_URI=mirror://rubygems/sass-3.4.15.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_=9e2730ce27e6819bf35750e8e50fcf68
diff --git a/metadata/md5-cache/dev-ruby/sass-3.4.23 b/metadata/md5-cache/dev-ruby/sass-3.4.23
index 6b78d3587caa..c909da512554 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.4.23
+++ b/metadata/md5-cache/dev-ruby/sass-3.4.23
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby21] !!<dev-ruby/haml-3.1[ruby_targets_ruby21] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby21] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!<dev-ruby/haml-3.1[ruby_targets_ruby22] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby22] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby23] !!<dev-ruby/haml-3.1[ruby_targets_ruby23] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby23] !!<dev-ruby/sass-3.3.14-r1:3.3[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? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!<dev-ruby/haml-3.1[ruby_targets_ruby22] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby22] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby23] !!<dev-ruby/haml-3.1[ruby_targets_ruby23] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby23] !!<dev-ruby/sass-3.3.14-r1:3.3[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=An extension of CSS3, adding nested rules, variables, mixins, and more
 EAPI=5
 HOMEPAGE=http://sass-lang.com/
-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 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby21] !!<dev-ruby/haml-3.1[ruby_targets_ruby21] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby21] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!<dev-ruby/haml-3.1[ruby_targets_ruby22] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby22] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby23] !!<dev-ruby/haml-3.1[ruby_targets_ruby23] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby23] !!<dev-ruby/sass-3.3.14-r1:3.3[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/listen-1.3.1:1[ruby_targets_ruby22] !!<dev-ruby/haml-3.1[ruby_targets_ruby22] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby22] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby23] !!<dev-ruby/haml-3.1[ruby_targets_ruby23] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby23] !!<dev-ruby/sass-3.3.14-r1:3.3[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=3.4
 SRC_URI=mirror://rubygems/sass-3.4.23.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_=29d5f82d17524f4b632a7a1836f63382
diff --git a/metadata/md5-cache/dev-ruby/sass-3.4.24 b/metadata/md5-cache/dev-ruby/sass-3.4.24
index f6584fe1d4b9..ee2abadb8ce1 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.4.24
+++ b/metadata/md5-cache/dev-ruby/sass-3.4.24
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby21] !!<dev-ruby/haml-3.1[ruby_targets_ruby21] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby21] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!<dev-ruby/haml-3.1[ruby_targets_ruby22] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby22] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby23] !!<dev-ruby/haml-3.1[ruby_targets_ruby23] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby23] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby24] !!<dev-ruby/haml-3.1[ruby_targets_ruby24] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby24] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!<dev-ruby/haml-3.1[ruby_targets_ruby22] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby22] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby23] !!<dev-ruby/haml-3.1[ruby_targets_ruby23] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby23] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby24] !!<dev-ruby/haml-3.1[ruby_targets_ruby24] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby24] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An extension of CSS3, adding nested rules, variables, mixins, and more
 EAPI=6
 HOMEPAGE=http://sass-lang.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby21] !!<dev-ruby/haml-3.1[ruby_targets_ruby21] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby21] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!<dev-ruby/haml-3.1[ruby_targets_ruby22] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby22] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby23] !!<dev-ruby/haml-3.1[ruby_targets_ruby23] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby23] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby24] !!<dev-ruby/haml-3.1[ruby_targets_ruby24] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby24] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!<dev-ruby/haml-3.1[ruby_targets_ruby22] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby22] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby23] !!<dev-ruby/haml-3.1[ruby_targets_ruby23] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby23] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby24] !!<dev-ruby/haml-3.1[ruby_targets_ruby24] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby24] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3.4
 SRC_URI=mirror://rubygems/sass-3.4.24.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_=c358a36c563dc787b3f6353b70133269
diff --git a/metadata/md5-cache/dev-ruby/sass-3.4.25 b/metadata/md5-cache/dev-ruby/sass-3.4.25
index 7fcd24baa9f9..4f1f90bbccfe 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.4.25
+++ b/metadata/md5-cache/dev-ruby/sass-3.4.25
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby21] !!<dev-ruby/haml-3.1[ruby_targets_ruby21] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby21] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!<dev-ruby/haml-3.1[ruby_targets_ruby22] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby22] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby23] !!<dev-ruby/haml-3.1[ruby_targets_ruby23] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby23] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby24] !!<dev-ruby/haml-3.1[ruby_targets_ruby24] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby24] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!<dev-ruby/haml-3.1[ruby_targets_ruby22] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby22] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby23] !!<dev-ruby/haml-3.1[ruby_targets_ruby23] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby23] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby24] !!<dev-ruby/haml-3.1[ruby_targets_ruby24] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby24] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An extension of CSS3, adding nested rules, variables, mixins, and more
 EAPI=6
 HOMEPAGE=http://sass-lang.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby21] !!<dev-ruby/haml-3.1[ruby_targets_ruby21] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby21] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!<dev-ruby/haml-3.1[ruby_targets_ruby22] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby22] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby23] !!<dev-ruby/haml-3.1[ruby_targets_ruby23] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby23] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby24] !!<dev-ruby/haml-3.1[ruby_targets_ruby24] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby24] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!<dev-ruby/haml-3.1[ruby_targets_ruby22] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby22] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby23] !!<dev-ruby/haml-3.1[ruby_targets_ruby23] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby23] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby24] !!<dev-ruby/haml-3.1[ruby_targets_ruby24] !!<dev-ruby/sass-3.2.19-r1:0[ruby_targets_ruby24] !!<dev-ruby/sass-3.3.14-r1:3.3[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3.4
 SRC_URI=mirror://rubygems/sass-3.4.25.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_=10c57563958510e8bd5c25ccf19d19a1
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-4.0.5 b/metadata/md5-cache/dev-ruby/sass-rails-4.0.5
index 956dbb5c28d6..861f75634f1c 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-4.0.5
+++ b/metadata/md5-cache/dev-ruby/sass-rails-4.0.5
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sass-3.2.2:0[ruby_targets_ruby21] =dev-ruby/railties-4*[ruby_targets_ruby21] =dev-ruby/sprockets-rails-2*[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sass-3.2.2:0[ruby_targets_ruby22] =dev-ruby/railties-4*[ruby_targets_ruby22] =dev-ruby/sprockets-rails-2*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/sass-3.2.2:0[ruby_targets_ruby22] =dev-ruby/railties-4*[ruby_targets_ruby22] =dev-ruby/sprockets-rails-2*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8: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=Official Ruby-on-Rails Integration with Sass
 EAPI=5
 HOMEPAGE=https://github.com/rails/sass-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sass-3.2.2:0[ruby_targets_ruby21] =dev-ruby/railties-4*[ruby_targets_ruby21] =dev-ruby/sprockets-rails-2*[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sass-3.2.2:0[ruby_targets_ruby22] =dev-ruby/railties-4*[ruby_targets_ruby22] =dev-ruby/sprockets-rails-2*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8: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/sass-3.2.2:0[ruby_targets_ruby22] =dev-ruby/railties-4*[ruby_targets_ruby22] =dev-ruby/sprockets-rails-2*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8: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 )
 RESTRICT=test
 SLOT=4.0
 SRC_URI=mirror://rubygems/sass-rails-4.0.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_=8487ba22117c0c5be5458b20469716af
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.4-r1 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.4-r1
index a2d7a6ae0e60..bdeb2591ba5d 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.4-r1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby21] =dev-ruby/sass-3*:*[ruby_targets_ruby21] =dev-ruby/railties-4*:*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby21] <dev-ruby/sprockets-4:*[ruby_targets_ruby21] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby21] <dev-ruby/tilt-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[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=Official Ruby-on-Rails Integration with Sass
 EAPI=5
 HOMEPAGE=https://github.com/rails/sass-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby21] =dev-ruby/sass-3*:*[ruby_targets_ruby21] =dev-ruby/railties-4*:*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby21] <dev-ruby/sprockets-4:*[ruby_targets_ruby21] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby21] <dev-ruby/tilt-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[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/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.4.tar.gz -> sass-rails-5.0.4.tar.gz
 _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_=b7e1eb0c75eefae2773a4b415356d22c
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.5 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.5
index b5336a6c5534..7a54c42266ab 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.5
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.5
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby21] =dev-ruby/sass-3*:*[ruby_targets_ruby21] =dev-ruby/railties-4*:*[ruby_targets_ruby21] <dev-ruby/railties-6:*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby21] <dev-ruby/sprockets-4:*[ruby_targets_ruby21] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby21] <dev-ruby/tilt-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[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=Official Ruby-on-Rails Integration with Sass
 EAPI=5
 HOMEPAGE=https://github.com/rails/sass-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby21] =dev-ruby/sass-3*:*[ruby_targets_ruby21] =dev-ruby/railties-4*:*[ruby_targets_ruby21] <dev-ruby/railties-6:*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby21] <dev-ruby/sprockets-4:*[ruby_targets_ruby21] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby21] <dev-ruby/tilt-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[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/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.5.tar.gz -> sass-rails-5.0.5.tar.gz
 _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_=3bb4e79c908ac798bd84f63b25d22330
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r1 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r1
index 1ac4229099f7..4f897da6caf6 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby21] =dev-ruby/sass-3*:*[ruby_targets_ruby21] =dev-ruby/railties-4*:*[ruby_targets_ruby21] <dev-ruby/railties-6:*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby21] <dev-ruby/sprockets-4:*[ruby_targets_ruby21] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby21] <dev-ruby/tilt-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[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=Official Ruby-on-Rails Integration with Sass
 EAPI=5
 HOMEPAGE=https://github.com/rails/sass-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby21] =dev-ruby/sass-3*:*[ruby_targets_ruby21] =dev-ruby/railties-4*:*[ruby_targets_ruby21] <dev-ruby/railties-6:*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby21] <dev-ruby/sprockets-4:*[ruby_targets_ruby21] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby21] <dev-ruby/tilt-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[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/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.5.tar.gz -> sass-rails-5.0.5.tar.gz
 _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_=dbd16df933ab1feba044c2fab5d6e735
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r2 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r2
index 60ae364519b3..9892a7f1f77e 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r2
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r2
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby21] =dev-ruby/sass-3*:*[ruby_targets_ruby21] =dev-ruby/railties-4*:*[ruby_targets_ruby21] <dev-ruby/railties-6:*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby21] <dev-ruby/sprockets-4:*[ruby_targets_ruby21] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby21] <dev-ruby/tilt-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby23] =dev-ruby/sass-3*:*[ruby_targets_ruby23] =dev-ruby/railties-4*:*[ruby_targets_ruby23] <dev-ruby/railties-6:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby23] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby23] <dev-ruby/sprockets-4:*[ruby_targets_ruby23] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby23] =dev-ruby/sass-3*:*[ruby_targets_ruby23] =dev-ruby/railties-4*:*[ruby_targets_ruby23] <dev-ruby/railties-6:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby23] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby23] <dev-ruby/sprockets-4:*[ruby_targets_ruby23] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[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=Official Ruby-on-Rails Integration with Sass
 EAPI=5
 HOMEPAGE=https://github.com/rails/sass-rails
-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 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby21] =dev-ruby/sass-3*:*[ruby_targets_ruby21] =dev-ruby/railties-4*:*[ruby_targets_ruby21] <dev-ruby/railties-6:*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby21] <dev-ruby/sprockets-4:*[ruby_targets_ruby21] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby21] <dev-ruby/tilt-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby23] =dev-ruby/sass-3*:*[ruby_targets_ruby23] =dev-ruby/railties-4*:*[ruby_targets_ruby23] <dev-ruby/railties-6:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby23] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby23] <dev-ruby/sprockets-4:*[ruby_targets_ruby23] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[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/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby23] =dev-ruby/sass-3*:*[ruby_targets_ruby23] =dev-ruby/railties-4*:*[ruby_targets_ruby23] <dev-ruby/railties-6:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby23] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby23] <dev-ruby/sprockets-4:*[ruby_targets_ruby23] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[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=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.5.tar.gz -> sass-rails-5.0.5.tar.gz
 _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_=c5113d995fd40701af7be747f65b3e28
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.6 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.6
index a08745e0e7b7..284fc495c92d 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.6
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.6
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby21] =dev-ruby/sass-3*:*[ruby_targets_ruby21] =dev-ruby/railties-4*:*[ruby_targets_ruby21] <dev-ruby/railties-6:*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby21] <dev-ruby/sprockets-4:*[ruby_targets_ruby21] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby21] <dev-ruby/tilt-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby23] =dev-ruby/sass-3*:*[ruby_targets_ruby23] =dev-ruby/railties-4*:*[ruby_targets_ruby23] <dev-ruby/railties-6:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby23] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby23] <dev-ruby/sprockets-4:*[ruby_targets_ruby23] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby23] =dev-ruby/sass-3*:*[ruby_targets_ruby23] =dev-ruby/railties-4*:*[ruby_targets_ruby23] <dev-ruby/railties-6:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby23] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby23] <dev-ruby/sprockets-4:*[ruby_targets_ruby23] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[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=Official Ruby-on-Rails Integration with Sass
 EAPI=5
 HOMEPAGE=https://github.com/rails/sass-rails
-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 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby21] =dev-ruby/sass-3*:*[ruby_targets_ruby21] =dev-ruby/railties-4*:*[ruby_targets_ruby21] <dev-ruby/railties-6:*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby21] <dev-ruby/sprockets-4:*[ruby_targets_ruby21] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby21] <dev-ruby/tilt-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby23] =dev-ruby/sass-3*:*[ruby_targets_ruby23] =dev-ruby/railties-4*:*[ruby_targets_ruby23] <dev-ruby/railties-6:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby23] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby23] <dev-ruby/sprockets-4:*[ruby_targets_ruby23] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[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/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby23] =dev-ruby/sass-3*:*[ruby_targets_ruby23] =dev-ruby/railties-4*:*[ruby_targets_ruby23] <dev-ruby/railties-6:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby23] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby23] <dev-ruby/sprockets-4:*[ruby_targets_ruby23] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[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=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.6.tar.gz -> sass-rails-5.0.6.tar.gz
 _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_=24ee16f5069e1e4205dfaa6191df6f45
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.6-r1 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.6-r1
index bdb792180c6d..3e2320a37e1c 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.6-r1
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby21] =dev-ruby/sass-3*:*[ruby_targets_ruby21] >=dev-ruby/railties-4:*[ruby_targets_ruby21] <dev-ruby/railties-6:*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby21] <dev-ruby/sprockets-4:*[ruby_targets_ruby21] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby21] <dev-ruby/tilt-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] >=dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby23] =dev-ruby/sass-3*:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-6:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby23] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby23] <dev-ruby/sprockets-4:*[ruby_targets_ruby23] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby24] =dev-ruby/sass-3*:*[ruby_targets_ruby24] >=dev-ruby/railties-4:*[ruby_targets_ruby24] <dev-ruby/railties-6:*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby24] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby24] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby24] <dev-ruby/sprockets-4:*[ruby_targets_ruby24] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby24] <dev-ruby/tilt-3:*[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] >=dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby23] =dev-ruby/sass-3*:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-6:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby23] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby23] <dev-ruby/sprockets-4:*[ruby_targets_ruby23] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby24] =dev-ruby/sass-3*:*[ruby_targets_ruby24] >=dev-ruby/railties-4:*[ruby_targets_ruby24] <dev-ruby/railties-6:*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby24] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby24] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby24] <dev-ruby/sprockets-4:*[ruby_targets_ruby24] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby24] <dev-ruby/tilt-3:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Official Ruby-on-Rails Integration with Sass
 EAPI=5
 HOMEPAGE=https://github.com/rails/sass-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby21] =dev-ruby/sass-3*:*[ruby_targets_ruby21] >=dev-ruby/railties-4:*[ruby_targets_ruby21] <dev-ruby/railties-6:*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby21] <dev-ruby/sprockets-4:*[ruby_targets_ruby21] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby21] <dev-ruby/tilt-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] >=dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby23] =dev-ruby/sass-3*:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-6:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby23] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby23] <dev-ruby/sprockets-4:*[ruby_targets_ruby23] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby24] =dev-ruby/sass-3*:*[ruby_targets_ruby24] >=dev-ruby/railties-4:*[ruby_targets_ruby24] <dev-ruby/railties-6:*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby24] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby24] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby24] <dev-ruby/sprockets-4:*[ruby_targets_ruby24] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby24] <dev-ruby/tilt-3:*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] >=dev-ruby/railties-4:*[ruby_targets_ruby22] <dev-ruby/railties-6:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby23] =dev-ruby/sass-3*:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-6:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby23] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby23] <dev-ruby/sprockets-4:*[ruby_targets_ruby23] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby24] =dev-ruby/sass-3*:*[ruby_targets_ruby24] >=dev-ruby/railties-4:*[ruby_targets_ruby24] <dev-ruby/railties-6:*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby24] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby24] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby24] <dev-ruby/sprockets-4:*[ruby_targets_ruby24] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby24] <dev-ruby/tilt-3:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.6.tar.gz -> sass-rails-5.0.6.tar.gz
 _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_=c807cf158069c14d235acc352cb70fd8
diff --git a/metadata/md5-cache/dev-ruby/sawyer-0.8.1 b/metadata/md5-cache/dev-ruby/sawyer-0.8.1
index 5ac63d8515d2..ef710af0d000 100644
--- a/metadata/md5-cache/dev-ruby/sawyer-0.8.1
+++ b/metadata/md5-cache/dev-ruby/sawyer-0.8.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( <dev-ruby/faraday-1.0[ruby_targets_ruby21] >=dev-ruby/addressable-2.3.5[ruby_targets_ruby21] <dev-ruby/addressable-2.6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( <dev-ruby/faraday-1.0[ruby_targets_ruby22] >=dev-ruby/addressable-2.3.5[ruby_targets_ruby22] <dev-ruby/addressable-2.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/faraday-1.0[ruby_targets_ruby23] >=dev-ruby/addressable-2.3.5[ruby_targets_ruby23] <dev-ruby/addressable-2.6[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/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=test? ( ruby_targets_ruby22? ( <dev-ruby/faraday-1.0[ruby_targets_ruby22] >=dev-ruby/addressable-2.3.5[ruby_targets_ruby22] <dev-ruby/addressable-2.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/faraday-1.0[ruby_targets_ruby23] >=dev-ruby/addressable-2.3.5[ruby_targets_ruby23] <dev-ruby/addressable-2.6[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/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=Secret User Agent of HTTP
 EAPI=5
 HOMEPAGE=https://github.com/lostisland/sawyer
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( <dev-ruby/faraday-1.0[ruby_targets_ruby21] >=dev-ruby/addressable-2.3.5[ruby_targets_ruby21] <dev-ruby/addressable-2.6[ruby_targets_ruby21] ) ruby_targets_ruby22? ( <dev-ruby/faraday-1.0[ruby_targets_ruby22] >=dev-ruby/addressable-2.3.5[ruby_targets_ruby22] <dev-ruby/addressable-2.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/faraday-1.0[ruby_targets_ruby23] >=dev-ruby/addressable-2.3.5[ruby_targets_ruby23] <dev-ruby/addressable-2.6[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/faraday-1.0[ruby_targets_ruby22] >=dev-ruby/addressable-2.3.5[ruby_targets_ruby22] <dev-ruby/addressable-2.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/faraday-1.0[ruby_targets_ruby23] >=dev-ruby/addressable-2.3.5[ruby_targets_ruby23] <dev-ruby/addressable-2.6[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/sawyer-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_=ed204aca0adf80775751e1b5d1796728
diff --git a/metadata/md5-cache/dev-ruby/sdoc-0.4.1 b/metadata/md5-cache/dev-ruby/sdoc-0.4.1
index ff3c8572ff70..f4ffc1529418 100644
--- a/metadata/md5-cache/dev-ruby/sdoc-0.4.1
+++ b/metadata/md5-cache/dev-ruby/sdoc-0.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby21] =dev-ruby/rdoc-4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby22] =dev-ruby/rdoc-4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby23] =dev-ruby/rdoc-4*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:0[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby22] =dev-ruby/rdoc-4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby23] =dev-ruby/rdoc-4*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:0[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=rdoc generator html with javascript search index
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/sdoc
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby21] =dev-ruby/rdoc-4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby22] =dev-ruby/rdoc-4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby23] =dev-ruby/rdoc-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/json-1.7:0[ruby_targets_ruby22] =dev-ruby/rdoc-4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby23] =dev-ruby/rdoc-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/sdoc-0.4.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_=2ec794fd2c697ad7561e453493125d7d
diff --git a/metadata/md5-cache/dev-ruby/sdoc-0.4.2 b/metadata/md5-cache/dev-ruby/sdoc-0.4.2
index b8acf01b386c..d4727c43431d 100644
--- a/metadata/md5-cache/dev-ruby/sdoc-0.4.2
+++ b/metadata/md5-cache/dev-ruby/sdoc-0.4.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby21] =dev-ruby/rdoc-4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby22] =dev-ruby/rdoc-4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby23] =dev-ruby/rdoc-4*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:0[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby22] =dev-ruby/rdoc-4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby23] =dev-ruby/rdoc-4*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:0[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=rdoc generator html with javascript search index
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/sdoc
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby21] =dev-ruby/rdoc-4*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby22] =dev-ruby/rdoc-4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby23] =dev-ruby/rdoc-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/json-1.7:0[ruby_targets_ruby22] =dev-ruby/rdoc-4*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby23] =dev-ruby/rdoc-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/sdoc-0.4.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_=2ec794fd2c697ad7561e453493125d7d
diff --git a/metadata/md5-cache/dev-ruby/seed-fu-2.3.6 b/metadata/md5-cache/dev-ruby/seed-fu-2.3.6
index 05b2d3d4983e..621b06b31ebf 100644
--- a/metadata/md5-cache/dev-ruby/seed-fu-2.3.6
+++ b/metadata/md5-cache/dev-ruby/seed-fu-2.3.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activerecord-3.1:*[ruby_targets_ruby21] >=dev-ruby/activesupport-3.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activerecord-3.1:*[ruby_targets_ruby22] >=dev-ruby/activesupport-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activerecord-3.1:*[ruby_targets_ruby23] >=dev-ruby/activesupport-3.1:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sqlite3[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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-ruby/activerecord-3.1:*[ruby_targets_ruby22] >=dev-ruby/activesupport-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activerecord-3.1:*[ruby_targets_ruby23] >=dev-ruby/activesupport-3.1:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sqlite3[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=Advanced seed data handling for Rails
 EAPI=5
 HOMEPAGE=https://github.com/mbleigh/seed-fu
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activerecord-3.1:*[ruby_targets_ruby21] >=dev-ruby/activesupport-3.1:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activerecord-3.1:*[ruby_targets_ruby22] >=dev-ruby/activesupport-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activerecord-3.1:*[ruby_targets_ruby23] >=dev-ruby/activesupport-3.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/activerecord-3.1:*[ruby_targets_ruby22] >=dev-ruby/activesupport-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activerecord-3.1:*[ruby_targets_ruby23] >=dev-ruby/activesupport-3.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=https://github.com/mbleigh/seed-fu/archive/v.2.3.6.tar.gz -> seed-fu-2.3.6.tar.gz
 _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_=4bd9f49482c98e4316bd324884a88553
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.53.4-r1 b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.53.4-r1
index 6986ef8ac017..75577c421d90 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.53.4-r1
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.53.4-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip: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] ) 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-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip: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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=This gem provides Ruby bindings for WebDriver
 EAPI=5
 HOMEPAGE=http://gemcutter.org/gems/selenium-webdriver
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip: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.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip: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/selenium-webdriver-2.53.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_=81b4be5d1785a49f411ab02021b68e6f
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.3.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.3.0
index 1ac3b824ce91..0196a76d1aed 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.3.0
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip: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] ) 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-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip: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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=This gem provides Ruby bindings for WebDriver
 EAPI=5
 HOMEPAGE=https://github.com/seleniumhq/selenium
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip: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.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip: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=3
 SRC_URI=mirror://rubygems/selenium-webdriver-3.3.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_=4cef6faab64da716d25a16974e41fe78
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.3 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.3
index 767404be1343..fe00b8e34e7d 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.3
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=This gem provides Ruby bindings for WebDriver
 EAPI=6
 HOMEPAGE=https://github.com/seleniumhq/selenium
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/selenium-webdriver-3.4.3.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_=f35f8f9252624d162e5188f02989dd1f
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.4 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.4
index b55b4e07b0ae..2d0f6465cf8d 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.4
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=This gem provides Ruby bindings for WebDriver
 EAPI=6
 HOMEPAGE=https://github.com/seleniumhq/selenium
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/selenium-webdriver-3.4.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_=2acc02fc3b988258314b038148daf08f
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.5.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.5.0
index ecf09cb151d6..dcc90cd56f36 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.5.0
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=This gem provides Ruby bindings for WebDriver
 EAPI=6
 HOMEPAGE=https://github.com/seleniumhq/selenium
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/selenium-webdriver-3.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_=2acc02fc3b988258314b038148daf08f
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.5.1 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.5.1
index 80e3954b4dd0..268be74abbd4 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.5.1
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.5.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=This gem provides Ruby bindings for WebDriver
 EAPI=6
 HOMEPAGE=https://github.com/seleniumhq/selenium
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/selenium-webdriver-3.5.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_=2acc02fc3b988258314b038148daf08f
diff --git a/metadata/md5-cache/dev-ruby/semantic_puppet-0.1.3 b/metadata/md5-cache/dev-ruby/semantic_puppet-0.1.3
index 791e8a428ac5..564add815bf5 100644
--- a/metadata/md5-cache/dev-ruby/semantic_puppet-0.1.3
+++ b/metadata/md5-cache/dev-ruby/semantic_puppet-0.1.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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: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=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: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=Library of tools for working with Semantic Versions and module dependencies
 EAPI=5
 HOMEPAGE=https://github.com/puppetlabs/semantic_puppet
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~x86 ~amd64
 LICENSE=Apache-2.0
-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/semantic_puppet-0.1.3.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_=19bfa0d833618223c554e0a86a51172e
diff --git a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.0 b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.0
index 4b54d960a402..702c221f0ec3 100644
--- a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.0
+++ b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/gettext-setup-0.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.3[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.3[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=Library of tools for working with Semantic Versions and module dependencies
 EAPI=6
 HOMEPAGE=https://github.com/puppetlabs/semantic_puppet
-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
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/gettext-setup-0.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.3[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/gettext-setup-0.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.3[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/semantic_puppet-1.0.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_=60716f7bd6e52f009d419d5ae9e660cd
diff --git a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.1-r1 b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.1-r1
index 40cf85301e89..2b27645b18a7 100644
--- a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/gettext-setup-0.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.3[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.3[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=Library of tools for working with Semantic Versions and module dependencies
 EAPI=6
 HOMEPAGE=https://github.com/puppetlabs/semantic_puppet
-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
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/gettext-setup-0.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.3[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/gettext-setup-0.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.3[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/semantic_puppet-1.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_=33ce6f529fb4d4d145531e45e1f892da
diff --git a/metadata/md5-cache/dev-ruby/semver2-3.4.2 b/metadata/md5-cache/dev-ruby/semver2-3.4.2
index 0d529dc3450f..8998a89a39a5 100644
--- a/metadata/md5-cache/dev-ruby/semver2-3.4.2
+++ b/metadata/md5-cache/dev-ruby/semver2-3.4.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=maintain versions as per http://semver.org
 EAPI=6
 HOMEPAGE=https://github.com/haf/semver
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/haf/semver/archive/v3.4.2.tar.gz -> semver2-3.4.2.tar.gz
 _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_=f9e0cd84ef0bb95d239396f6b4355eb5
diff --git a/metadata/md5-cache/dev-ruby/serialport-1.3.1 b/metadata/md5-cache/dev-ruby/serialport-1.3.1
index c9c4b543fadc..34bcfabf770b 100644
--- a/metadata/md5-cache/dev-ruby/serialport-1.3.1
+++ b/metadata/md5-cache/dev-ruby/serialport-1.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) 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? ( 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=a library for serial port (rs232) access in ruby
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/ruby-serialport/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-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/serialport-1.3.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_=5a82d6016e86b4b3bc896f00b8fdb09e
diff --git a/metadata/md5-cache/dev-ruby/session-3.1.2 b/metadata/md5-cache/dev-ruby/session-3.1.2
index 57153eb82e99..39aeef79d997 100644
--- a/metadata/md5-cache/dev-ruby/session-3.1.2
+++ b/metadata/md5-cache/dev-ruby/session-3.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( || ( sys-apps/coreutils sys-freebsd/freebsd-bin ) ) 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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( || ( sys-apps/coreutils sys-freebsd/freebsd-bin ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A set of classes to drive external programs via pipe
 EAPI=5
 HOMEPAGE=http://codeforpeople.com/lib/ruby/session/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Ruby
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/session-3.1.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_=81f2b52a0f88f51cfa3eb25f0a09e007
diff --git a/metadata/md5-cache/dev-ruby/session-3.2.0 b/metadata/md5-cache/dev-ruby/session-3.2.0
index c117f5bcb8e1..4b043669803d 100644
--- a/metadata/md5-cache/dev-ruby/session-3.2.0
+++ b/metadata/md5-cache/dev-ruby/session-3.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( || ( sys-apps/coreutils sys-freebsd/freebsd-bin ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( || ( sys-apps/coreutils sys-freebsd/freebsd-bin ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A set of classes to drive external programs via pipe
 EAPI=5
 HOMEPAGE=http://codeforpeople.com/lib/ruby/session/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/session-3.2.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_=b9413d808e60ea72669f2a441220b132
diff --git a/metadata/md5-cache/dev-ruby/settingslogic-2.0.9 b/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
index 77bfa841760a..5ccfe0a84f3a 100644
--- a/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
+++ b/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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=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=A simple configuration / settings solution that uses an ERB enabled YAML file
 EAPI=5
 HOMEPAGE=https://github.com/binarylogic/settingslogic
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 LICENSE=MIT
-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/settingslogic-2.0.9.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_=25ae44c0cbb3efc2720062dda3c2caa2
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.10.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.10.0
index 547a02fccb55..a7f24457071b 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.10.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.10.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby21] dev-ruby/hoe-seattlerb[ruby_targets_ruby21] >=dev-ruby/minitest-5.5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby24] dev-ruby/hoe-seattlerb[ruby_targets_ruby24] >=dev-ruby/minitest-5.5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby24] dev-ruby/hoe-seattlerb[ruby_targets_ruby24] >=dev-ruby/minitest-5.5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
 EAPI=6
 HOMEPAGE=https://www.zenspider.com/projects/sexp_processor.html
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=mirror://rubygems/sexp_processor-4.10.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_=becc77c2bb16365105e84302cc722a4b
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.7.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.7.0
index afae049bc257..1f9367057aed 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.7.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby21] dev-ruby/hoe-seattlerb[ruby_targets_ruby21] >=dev-ruby/minitest-5.5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby24] dev-ruby/hoe-seattlerb[ruby_targets_ruby24] >=dev-ruby/minitest-5.5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby24] dev-ruby/hoe-seattlerb[ruby_targets_ruby24] >=dev-ruby/minitest-5.5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
 EAPI=5
 HOMEPAGE=http://www.zenspider.com/ZSS/Products/ParseTree/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=mirror://rubygems/sexp_processor-4.7.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_=4148ee20013c0926916b34bb73647e20
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.8.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.8.0
index 3f254ea80ef7..6c9e2ca7253e 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.8.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.8.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby21] dev-ruby/hoe-seattlerb[ruby_targets_ruby21] >=dev-ruby/minitest-5.5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby24] dev-ruby/hoe-seattlerb[ruby_targets_ruby24] >=dev-ruby/minitest-5.5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby24] dev-ruby/hoe-seattlerb[ruby_targets_ruby24] >=dev-ruby/minitest-5.5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
 EAPI=5
 HOMEPAGE=http://www.zenspider.com/ZSS/Products/ParseTree/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=mirror://rubygems/sexp_processor-4.8.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_=95efa1b7eef0034a088b6626dcfe0a09
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.9.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.9.0
index aa3d190d7c72..0bf2cbcb912f 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.9.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.9.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby21] dev-ruby/hoe-seattlerb[ruby_targets_ruby21] >=dev-ruby/minitest-5.5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby24] dev-ruby/hoe-seattlerb[ruby_targets_ruby24] >=dev-ruby/minitest-5.5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby24] dev-ruby/hoe-seattlerb[ruby_targets_ruby24] >=dev-ruby/minitest-5.5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
 EAPI=5
 HOMEPAGE=https://www.zenspider.com/projects/sexp_processor.html
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=mirror://rubygems/sexp_processor-4.9.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_=5751fb00d27ed1b4ddf859a79bf90997
diff --git a/metadata/md5-cache/dev-ruby/sfl-2.2-r1 b/metadata/md5-cache/dev-ruby/sfl-2.2-r1
index fbcb91f1bb8c..84cbefdfc097 100644
--- a/metadata/md5-cache/dev-ruby/sfl-2.2-r1
+++ b/metadata/md5-cache/dev-ruby/sfl-2.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) 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_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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Library providing spawn() which is almost perfectly compatible with ruby 1.9's
 EAPI=5
 HOMEPAGE=https://github.com/ujihisa/spawn-for-legacy
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=|| ( Ruby BSD-2 )
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sfl-2.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_=83fd84635c4c3b74a77a8b30cb573b93
diff --git a/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r2 b/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r2
index d2e605efe5de..733abcad4f5a 100644
--- a/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r2
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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? ( 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? ( 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=A very simple library to use URL shortening services such as TinyURL or RubyURL
 EAPI=5
 HOMEPAGE=http://shorturl.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=amd64 ~ppc x86 ~x86-fbsd ~x86-macos
 LICENSE=MIT
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/shorturl-1.0.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_=df60d03436bf1f1a110567f071fc63f4
diff --git a/metadata/md5-cache/dev-ruby/shotgun-0.9.1 b/metadata/md5-cache/dev-ruby/shotgun-0.9.1
index 4fbea6b7a705..a8544f60d040 100644
--- a/metadata/md5-cache/dev-ruby/shotgun-0.9.1
+++ b/metadata/md5-cache/dev-ruby/shotgun-0.9.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/rack[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[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=test? ( ruby_targets_ruby22? ( dev-ruby/rack[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[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=Forking implementation of rackup
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/shotgun
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/rack[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack[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/rack[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/shotgun-0.9.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_=0c4a4c116848d4d08ced74a3910cda9f
diff --git a/metadata/md5-cache/dev-ruby/shotgun-0.9.2 b/metadata/md5-cache/dev-ruby/shotgun-0.9.2
index 8a5b423fe0a0..33d13cb6a2ed 100644
--- a/metadata/md5-cache/dev-ruby/shotgun-0.9.2
+++ b/metadata/md5-cache/dev-ruby/shotgun-0.9.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[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=test? ( ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[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=Forking implementation of rackup
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/shotgun
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[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/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[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/shotgun-0.9.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_=2d132931f5efa23b9812bdbaea450ba0
diff --git a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2 b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
index 776b86ecd649..4fd198943122 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
+++ b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Making tests easy on the fingers and eyes
 EAPI=5
 HOMEPAGE=http://thoughtbot.com/projects/shoulda
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/thoughtbot/shoulda/tarball/v2.11.3 -> shoulda-2.11.3.tar.gz
 _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_=2ab3fdb9eb1b6be6c7a9993e576f6f14
diff --git a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r2 b/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r2
index 897eb72dac02..289ea70f9d77 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r2
+++ b/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r2
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby21] >=dev-ruby/shoulda-matchers-1.4.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby22] >=dev-ruby/shoulda-matchers-1.4.1:0[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby22] >=dev-ruby/shoulda-matchers-1.4.1:0[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=Making tests easy on the fingers and eyes
 EAPI=5
 HOMEPAGE=http://thoughtbot.com/projects/shoulda
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby21] >=dev-ruby/shoulda-matchers-1.4.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby22] >=dev-ruby/shoulda-matchers-1.4.1:0[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/shoulda-context-1.0.1[ruby_targets_ruby22] >=dev-ruby/shoulda-matchers-1.4.1:0[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=3
 SRC_URI=https://github.com/thoughtbot/shoulda/archive/v3.5.0.tar.gz -> shoulda-3.5.0.tar.gz
 _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_=982751ef6d528f98feb82435aedde0b0
diff --git a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r3 b/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r3
index f5054a1673ac..0e14c833c71e 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r3
+++ b/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r3
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby21] >=dev-ruby/shoulda-matchers-1.4.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby22] >=dev-ruby/shoulda-matchers-1.4.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby23] >=dev-ruby/shoulda-matchers-1.4.1:0[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby22] >=dev-ruby/shoulda-matchers-1.4.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby23] >=dev-ruby/shoulda-matchers-1.4.1:0[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=Making tests easy on the fingers and eyes
 EAPI=5
 HOMEPAGE=http://thoughtbot.com/projects/shoulda
-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 ~hppa ~ppc
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby21] >=dev-ruby/shoulda-matchers-1.4.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby22] >=dev-ruby/shoulda-matchers-1.4.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby23] >=dev-ruby/shoulda-matchers-1.4.1:0[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/shoulda-context-1.0.1[ruby_targets_ruby22] >=dev-ruby/shoulda-matchers-1.4.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby23] >=dev-ruby/shoulda-matchers-1.4.1:0[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=3
 SRC_URI=https://github.com/thoughtbot/shoulda/archive/v3.5.0.tar.gz -> shoulda-3.5.0.tar.gz
 _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_=215faf756ec96a78188cc407168212d7
diff --git a/metadata/md5-cache/dev-ruby/shoulda-context-1.2.1 b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.1
index eea36fcd7bcf..9de5640910eb 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-context-1.2.1
+++ b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] <dev-ruby/mocha-1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] <dev-ruby/mocha-1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] <dev-ruby/mocha-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? ( 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/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/test-unit:2[ruby_targets_ruby22] <dev-ruby/mocha-1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] <dev-ruby/mocha-1[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/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=Context framework extracted from Shoulda
 EAPI=5
 HOMEPAGE=http://thoughtbot.com/projects/shoulda
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64
 LICENSE=MIT
-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/shoulda-context-1.2.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_=cdc6f8d6dd1e376f2df312f110966215
diff --git a/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2 b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2
index 7f7fc6aecfb3..538fbe3c8433 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2
+++ b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] <dev-ruby/mocha-1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] <dev-ruby/mocha-1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] <dev-ruby/mocha-1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] <dev-ruby/mocha-1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] <dev-ruby/mocha-1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] <dev-ruby/mocha-1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] <dev-ruby/mocha-1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Context framework extracted from Shoulda
 EAPI=5
 HOMEPAGE=http://thoughtbot.com/projects/shoulda
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/shoulda-context-1.2.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_=a0220ecfc9fe3fecf91520a32a71fda7
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0-r1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0-r1
index b207b8a48c80..c990e3db5a72 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0[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] ) 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-ruby/activesupport-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Making tests easy on the fingers and eyes
 EAPI=5
 HOMEPAGE=https://github.com/thoughtbot/shoulda-matchers
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0[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/activesupport-3.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0[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/shoulda-matchers-2.8.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_=220ccb2a8e82ba841522f475c5cb428c
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1-r1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1-r1
index d1dfe7eb6bdc..7b7c2f911416 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.0.0:*[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] ) 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-ruby/activesupport-4.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.0.0:*[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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Making tests easy on the fingers and eyes
 EAPI=5
 HOMEPAGE=https://github.com/thoughtbot/shoulda-matchers
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.0.0:*[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/activesupport-4.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.0.0:*[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=3
 SRC_URI=mirror://rubygems/shoulda-matchers-3.1.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_=fe0970d7dbac7b682c56482842ae5a4d
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.2 b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.2
index 3baab6d4e926..73aeacc2236f 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.2
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Making tests easy on the fingers and eyes
 EAPI=6
 HOMEPAGE=https://github.com/thoughtbot/shoulda-matchers
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/shoulda-matchers-3.1.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_=995b9d80141fb28c84779ad67f9baead
diff --git a/metadata/md5-cache/dev-ruby/sigar-0.7.3 b/metadata/md5-cache/dev-ruby/sigar-0.7.3
index c69305cd0070..5bf07f0209a6 100644
--- a/metadata/md5-cache/dev-ruby/sigar-0.7.3
+++ b/metadata/md5-cache/dev-ruby/sigar-0.7.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) 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? ( 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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=System Information Gatherer And Reporter
 EAPI=5
 HOMEPAGE=http://sigar.hyperic.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-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/sigar-0.7.3.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_=f617354410bc519718ce334b6ac775e3
diff --git a/metadata/md5-cache/dev-ruby/simple-rss-1.3.1-r1 b/metadata/md5-cache/dev-ruby/simple-rss-1.3.1-r1
index e1e567adf7f2..499ff48b97e3 100644
--- a/metadata/md5-cache/dev-ruby/simple-rss-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/simple-rss-1.3.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A simple, flexible, extensible, and liberal RSS and Atom reader for Ruby
 EAPI=5
 HOMEPAGE=http://simple-rss.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2
-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/simple-rss-1.3.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_=12fa2a722b87a25f4f0475cd8677250c
diff --git a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1 b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
index 8195db00b887..530e6e2c1408 100644
--- a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
+++ b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Simply builds and verifies OAuth headers
 EAPI=5
 HOMEPAGE=https://github.com/laserlemon/simple_oauth
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/laserlemon/simple_oauth/archive/v0.3.1.tar.gz -> simple_oauth-0.3.1.tar.gz
 _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_=5154a40af41ec1a567390030bb4f9cab
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.13.0 b/metadata/md5-cache/dev-ruby/simplecov-0.13.0
index 5fca7add1ce8..4368fa64260e 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.13.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.13.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby21] <dev-ruby/json-3:0[ruby_targets_ruby21] dev-ruby/simplecov-html:0.10[ruby_targets_ruby21] >=dev-ruby/docile-1.1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] >=dev-ruby/docile-1.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] >=dev-ruby/docile-1.1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/test-unit: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] >=dev-ruby/docile-1.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] >=dev-ruby/docile-1.1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/test-unit: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=Code coverage with a configuration library and merging across test suites
 EAPI=5
 HOMEPAGE=https://www.ruby-toolbox.com/projects/simplecov https://github.com/colszowka/simplecov
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby21] <dev-ruby/json-3:0[ruby_targets_ruby21] dev-ruby/simplecov-html:0.10[ruby_targets_ruby21] >=dev-ruby/docile-1.1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] >=dev-ruby/docile-1.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] >=dev-ruby/docile-1.1.0[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/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] >=dev-ruby/docile-1.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] >=dev-ruby/docile-1.1.0[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.8
 SRC_URI=mirror://rubygems/simplecov-0.13.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_=beba26760782ee2a6d34800079e7aa09
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.14.0 b/metadata/md5-cache/dev-ruby/simplecov-0.14.0
index b997cde77e58..ec2ca03159a3 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.14.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.14.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby21] <dev-ruby/json-3:0[ruby_targets_ruby21] dev-ruby/simplecov-html:0.10[ruby_targets_ruby21] >=dev-ruby/docile-1.1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] >=dev-ruby/docile-1.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] >=dev-ruby/docile-1.1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/test-unit: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] >=dev-ruby/docile-1.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] >=dev-ruby/docile-1.1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/test-unit: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=Code coverage with a configuration library and merging across test suites
 EAPI=5
 HOMEPAGE=https://www.ruby-toolbox.com/projects/simplecov https://github.com/colszowka/simplecov
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby21] <dev-ruby/json-3:0[ruby_targets_ruby21] dev-ruby/simplecov-html:0.10[ruby_targets_ruby21] >=dev-ruby/docile-1.1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] >=dev-ruby/docile-1.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] >=dev-ruby/docile-1.1.0[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/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] >=dev-ruby/docile-1.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] >=dev-ruby/docile-1.1.0[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.8
 SRC_URI=mirror://rubygems/simplecov-0.14.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_=beba26760782ee2a6d34800079e7aa09
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.14.1 b/metadata/md5-cache/dev-ruby/simplecov-0.14.1
index a547bd633235..d8ee0a61aa38 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.14.1
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.14.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby21] <dev-ruby/json-3:0[ruby_targets_ruby21] dev-ruby/simplecov-html:0.10[ruby_targets_ruby21] >=dev-ruby/docile-1.1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] >=dev-ruby/docile-1.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] >=dev-ruby/docile-1.1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/test-unit: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] >=dev-ruby/docile-1.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] >=dev-ruby/docile-1.1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/test-unit: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=Code coverage with a configuration library and merging across test suites
 EAPI=5
 HOMEPAGE=https://www.ruby-toolbox.com/projects/simplecov https://github.com/colszowka/simplecov
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby21] <dev-ruby/json-3:0[ruby_targets_ruby21] dev-ruby/simplecov-html:0.10[ruby_targets_ruby21] >=dev-ruby/docile-1.1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] >=dev-ruby/docile-1.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] >=dev-ruby/docile-1.1.0[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/json-1.8:0[ruby_targets_ruby22] <dev-ruby/json-3:0[ruby_targets_ruby22] dev-ruby/simplecov-html:0.10[ruby_targets_ruby22] >=dev-ruby/docile-1.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby23] <dev-ruby/json-3:0[ruby_targets_ruby23] dev-ruby/simplecov-html:0.10[ruby_targets_ruby23] >=dev-ruby/docile-1.1.0[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.8
 SRC_URI=mirror://rubygems/simplecov-0.14.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_=beba26760782ee2a6d34800079e7aa09
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.10.1 b/metadata/md5-cache/dev-ruby/simplecov-html-0.10.1
index 0685dd3cc0ef..447417edf203 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.10.1
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.10.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Generates a HTML report of your SimpleCov ruby code coverage results
 EAPI=6
 HOMEPAGE=https://github.com/colszowka/simplecov
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.10
 SRC_URI=mirror://rubygems/simplecov-html-0.10.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_=96c4bce7d02946ee6c2df98669fcaae2
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.10.2 b/metadata/md5-cache/dev-ruby/simplecov-html-0.10.2
index 800297e16091..495369fb6f7c 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.10.2
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.10.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Generates a HTML report of your SimpleCov ruby code coverage results
 EAPI=6
 HOMEPAGE=https://github.com/colszowka/simplecov
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.10
 SRC_URI=mirror://rubygems/simplecov-html-0.10.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_=96c4bce7d02946ee6c2df98669fcaae2
diff --git a/metadata/md5-cache/dev-ruby/sinatra-1.4.7 b/metadata/md5-cache/dev-ruby/sinatra-1.4.7
index 719f567fbec3..08a18526bb95 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-1.4.7
+++ b/metadata/md5-cache/dev-ruby/sinatra-1.4.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/rack-1*:*[ruby_targets_ruby21] >=dev-ruby/rack-1.5:*[ruby_targets_ruby21] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby21] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby21] <dev-ruby/tilt-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rack-1*:*[ruby_targets_ruby22] >=dev-ruby/rack-1.5:*[ruby_targets_ruby22] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby22] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rack-1*:*[ruby_targets_ruby23] >=dev-ruby/rack-1.5:*[ruby_targets_ruby23] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby23] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby21] dev-ruby/erubis[ruby_targets_ruby21] dev-ruby/builder[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/builder[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/builder[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=test? ( ruby_targets_ruby22? ( =dev-ruby/rack-1*:*[ruby_targets_ruby22] >=dev-ruby/rack-1.5:*[ruby_targets_ruby22] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby22] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rack-1*:*[ruby_targets_ruby23] >=dev-ruby/rack-1.5:*[ruby_targets_ruby23] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby23] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/builder[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/builder[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=A DSL for quickly creating web applications in Ruby with minimal effort
 EAPI=5
 HOMEPAGE=http://www.sinatrarb.com/
-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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rack-1*:*[ruby_targets_ruby21] >=dev-ruby/rack-1.5:*[ruby_targets_ruby21] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby21] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby21] <dev-ruby/tilt-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rack-1*:*[ruby_targets_ruby22] >=dev-ruby/rack-1.5:*[ruby_targets_ruby22] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby22] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rack-1*:*[ruby_targets_ruby23] >=dev-ruby/rack-1.5:*[ruby_targets_ruby23] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby23] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[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/rack-1*:*[ruby_targets_ruby22] >=dev-ruby/rack-1.5:*[ruby_targets_ruby22] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby22] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rack-1*:*[ruby_targets_ruby23] >=dev-ruby/rack-1.5:*[ruby_targets_ruby23] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby23] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[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/sinatra-1.4.7.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_=36a8dab83e37ca07748359af78c6f43e
diff --git a/metadata/md5-cache/dev-ruby/sinatra-1.4.8 b/metadata/md5-cache/dev-ruby/sinatra-1.4.8
index f2156ea06339..9446b314ef98 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-1.4.8
+++ b/metadata/md5-cache/dev-ruby/sinatra-1.4.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/rack-1*:*[ruby_targets_ruby21] >=dev-ruby/rack-1.5:*[ruby_targets_ruby21] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby21] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby21] <dev-ruby/tilt-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rack-1*:*[ruby_targets_ruby22] >=dev-ruby/rack-1.5:*[ruby_targets_ruby22] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby22] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rack-1*:*[ruby_targets_ruby23] >=dev-ruby/rack-1.5:*[ruby_targets_ruby23] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby23] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rack-1*:*[ruby_targets_ruby24] >=dev-ruby/rack-1.5:*[ruby_targets_ruby24] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby24] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby24] <dev-ruby/tilt-3:*[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby21] dev-ruby/erubis[ruby_targets_ruby21] dev-ruby/builder[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/builder[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/builder[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby24] dev-ruby/erubis[ruby_targets_ruby24] dev-ruby/builder[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/rack-1*:*[ruby_targets_ruby22] >=dev-ruby/rack-1.5:*[ruby_targets_ruby22] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby22] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rack-1*:*[ruby_targets_ruby23] >=dev-ruby/rack-1.5:*[ruby_targets_ruby23] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby23] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rack-1*:*[ruby_targets_ruby24] >=dev-ruby/rack-1.5:*[ruby_targets_ruby24] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby24] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby24] <dev-ruby/tilt-3:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/builder[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/builder[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby24] dev-ruby/erubis[ruby_targets_ruby24] dev-ruby/builder[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A DSL for quickly creating web applications in Ruby with minimal effort
 EAPI=6
 HOMEPAGE=http://www.sinatrarb.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rack-1*:*[ruby_targets_ruby21] >=dev-ruby/rack-1.5:*[ruby_targets_ruby21] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby21] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby21] <dev-ruby/tilt-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rack-1*:*[ruby_targets_ruby22] >=dev-ruby/rack-1.5:*[ruby_targets_ruby22] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby22] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rack-1*:*[ruby_targets_ruby23] >=dev-ruby/rack-1.5:*[ruby_targets_ruby23] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby23] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rack-1*:*[ruby_targets_ruby24] >=dev-ruby/rack-1.5:*[ruby_targets_ruby24] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby24] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby24] <dev-ruby/tilt-3:*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( =dev-ruby/rack-1*:*[ruby_targets_ruby22] >=dev-ruby/rack-1.5:*[ruby_targets_ruby22] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby22] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby22] <dev-ruby/tilt-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rack-1*:*[ruby_targets_ruby23] >=dev-ruby/rack-1.5:*[ruby_targets_ruby23] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby23] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby23] <dev-ruby/tilt-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rack-1*:*[ruby_targets_ruby24] >=dev-ruby/rack-1.5:*[ruby_targets_ruby24] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby24] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby24] <dev-ruby/tilt-3:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/sinatra-1.4.8.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_=02ef27fe3d03ac62782361aab9b5bfa5
diff --git a/metadata/md5-cache/dev-ruby/six-0.2.0 b/metadata/md5-cache/dev-ruby/six-0.2.0
index e8302a1c4336..7a33b164e103 100644
--- a/metadata/md5-cache/dev-ruby/six-0.2.0
+++ b/metadata/md5-cache/dev-ruby/six-0.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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=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=An ultra lite authorization library
 EAPI=5
 HOMEPAGE=https://github.com/randx/six
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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=https://github.com/randx/six/archive/v0.2.0.tar.gz -> six-0.2.0.tar.gz
 _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_=b89ec959d09c58ed20f73b7d777d4649
diff --git a/metadata/md5-cache/dev-ruby/slim-3.0.7-r1 b/metadata/md5-cache/dev-ruby/slim-3.0.7-r1
index 6305d6221d92..f353e89fe391 100644
--- a/metadata/md5-cache/dev-ruby/slim-3.0.7-r1
+++ b/metadata/md5-cache/dev-ruby/slim-3.0.7-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby21] <dev-ruby/tilt-2.1:*[ruby_targets_ruby21] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby22] <dev-ruby/tilt-2.1:*[ruby_targets_ruby22] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] dev-ruby/redcarpet[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/sass[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sass[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sass[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby22] <dev-ruby/tilt-2.1:*[ruby_targets_ruby22] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] dev-ruby/redcarpet[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sass[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sass[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A template language aiming to reduce the syntax to the essential parts
 EAPI=5
 HOMEPAGE=http://slim-lang.com/
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 arm ppc ppc64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby21] <dev-ruby/tilt-2.1:*[ruby_targets_ruby21] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby22] <dev-ruby/tilt-2.1:*[ruby_targets_ruby22] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[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/tilt-1.3.3:*[ruby_targets_ruby22] <dev-ruby/tilt-2.1:*[ruby_targets_ruby22] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[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/slim-3.0.7.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_=2437a6e93304f87371beaef24eb8c5b7
diff --git a/metadata/md5-cache/dev-ruby/slim-3.0.8 b/metadata/md5-cache/dev-ruby/slim-3.0.8
index 4c095e726483..b6b38f4b4461 100644
--- a/metadata/md5-cache/dev-ruby/slim-3.0.8
+++ b/metadata/md5-cache/dev-ruby/slim-3.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby21] <dev-ruby/tilt-2.1:*[ruby_targets_ruby21] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby22] <dev-ruby/tilt-2.1:*[ruby_targets_ruby22] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby24] <dev-ruby/tilt-2.1:*[ruby_targets_ruby24] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] dev-ruby/redcarpet[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/sass[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sass[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sass[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/sass[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby22] <dev-ruby/tilt-2.1:*[ruby_targets_ruby22] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby24] <dev-ruby/tilt-2.1:*[ruby_targets_ruby24] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] dev-ruby/redcarpet[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sass[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sass[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/sass[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A template language aiming to reduce the syntax to the essential parts
 EAPI=6
 HOMEPAGE=http://slim-lang.com/
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby21] <dev-ruby/tilt-2.1:*[ruby_targets_ruby21] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby22] <dev-ruby/tilt-2.1:*[ruby_targets_ruby22] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby24] <dev-ruby/tilt-2.1:*[ruby_targets_ruby24] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby22] <dev-ruby/tilt-2.1:*[ruby_targets_ruby22] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby24] <dev-ruby/tilt-2.1:*[ruby_targets_ruby24] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/slim-3.0.8.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_=f5df3f44fe3413f92c13a3bf6d3398ba
diff --git a/metadata/md5-cache/dev-ruby/slop-3.6.0 b/metadata/md5-cache/dev-ruby/slop-3.6.0
index ceea0c2894e7..f220a8beb554 100644
--- a/metadata/md5-cache/dev-ruby/slop-3.6.0
+++ b/metadata/md5-cache/dev-ruby/slop-3.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A simple option parser with an easy to remember syntax and friendly API
 EAPI=5
 HOMEPAGE=https://github.com/injekt/slop
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/injekt/slop/archive/v3.6.0.tar.gz -> slop-3.6.0.tgz
 _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_=50cf0fdb49a7bf8d8cde5b506dbfbaf2
diff --git a/metadata/md5-cache/dev-ruby/slop-4.4.1 b/metadata/md5-cache/dev-ruby/slop-4.4.1
index 755c3f5b821d..7d6b90e2f84e 100644
--- a/metadata/md5-cache/dev-ruby/slop-4.4.1
+++ b/metadata/md5-cache/dev-ruby/slop-4.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[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/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[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=A simple option parser with an easy to remember syntax and friendly API
 EAPI=5
 HOMEPAGE=https://github.com/injekt/slop
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
-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=4
 SRC_URI=https://github.com/injekt/slop/archive/v4.4.1.tar.gz -> slop-4.4.1.tgz
 _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_=412f084a5ae200b6d1f74df93e7f5ce1
diff --git a/metadata/md5-cache/dev-ruby/slop-4.4.3 b/metadata/md5-cache/dev-ruby/slop-4.4.3
index b986242c7a9e..be0985429572 100644
--- a/metadata/md5-cache/dev-ruby/slop-4.4.3
+++ b/metadata/md5-cache/dev-ruby/slop-4.4.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A simple option parser with an easy to remember syntax and friendly API
 EAPI=6
 HOMEPAGE=https://github.com/injekt/slop
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=https://github.com/injekt/slop/archive/v4.4.3.tar.gz -> slop-4.4.3.tgz
 _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_=c3f092ecbe11b8897179b4faee845300
diff --git a/metadata/md5-cache/dev-ruby/slop-4.5.0 b/metadata/md5-cache/dev-ruby/slop-4.5.0
index d36f813239e1..7137e0a9d702 100644
--- a/metadata/md5-cache/dev-ruby/slop-4.5.0
+++ b/metadata/md5-cache/dev-ruby/slop-4.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A simple option parser with an easy to remember syntax and friendly API
 EAPI=6
 HOMEPAGE=https://github.com/injekt/slop
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=https://github.com/injekt/slop/archive/v4.5.0.tar.gz -> slop-4.5.0.tgz
 _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_=c3f092ecbe11b8897179b4faee845300
diff --git a/metadata/md5-cache/dev-ruby/snmplib-1.2.0-r1 b/metadata/md5-cache/dev-ruby/snmplib-1.2.0-r1
index 5a41969398d7..d1e8e3a4e18f 100644
--- a/metadata/md5-cache/dev-ruby/snmplib-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/snmplib-1.2.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-4:0[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/minitest-4:0[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=SNMP library implemented in pure Ruby
 EAPI=5
 HOMEPAGE=http://snmplib.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=amd64 ppc x86
 LICENSE=Ruby
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/snmp-1.2.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_=17b0bfb6d4ddaccbb213bec1578b80b2
diff --git a/metadata/md5-cache/dev-ruby/source_map-3.0.1 b/metadata/md5-cache/dev-ruby/source_map-3.0.1
index 5a086f3c4562..857f7efe36b6 100644
--- a/metadata/md5-cache/dev-ruby/source_map-3.0.1
+++ b/metadata/md5-cache/dev-ruby/source_map-3.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/json[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Provides an API for parsing, and an API for generating source maps in ruby
 EAPI=5
 HOMEPAGE=https://github.com/ConradIrwin/ruby-source_map
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/json[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/json[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/source_map-3.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_=e2d6e8b075be662e84e610dcb84e0200
diff --git a/metadata/md5-cache/dev-ruby/sourcemap-0.1.1 b/metadata/md5-cache/dev-ruby/sourcemap-0.1.1
index d0bbfde6d7a3..c981250a0845 100644
--- a/metadata/md5-cache/dev-ruby/sourcemap-0.1.1
+++ b/metadata/md5-cache/dev-ruby/sourcemap-0.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby source maps
 EAPI=5
 HOMEPAGE=https://github.com/maccman/sourcemap
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/sourcemap-0.1.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_=5ed9b2902540419fd6ea552ad9672280
diff --git a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6 b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
index 356e4e710e26..4095b4c56363 100644
--- a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
+++ b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/tidy_table[ruby_targets_ruby21] dev-ruby/dust[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/tidy_table[ruby_targets_ruby22] dev-ruby/dust[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/tidy_table[ruby_targets_ruby23] dev-ruby/dust[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/tidy_table[ruby_targets_ruby22] dev-ruby/dust[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/tidy_table[ruby_targets_ruby23] dev-ruby/dust[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=Create sparklines, small graphs to be used inline in texts
 EAPI=5
 HOMEPAGE=http://sparklines.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=amd64 x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=dev-ruby/rmagick 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=dev-ruby/rmagick 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/sparklines-0.5.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_=5f76d380bc220b892a04331d72b9ae7c
diff --git a/metadata/md5-cache/dev-ruby/spork-0.9.2-r2 b/metadata/md5-cache/dev-ruby/spork-0.9.2-r2
index d1209e854981..3dfefba7afdf 100644
--- a/metadata/md5-cache/dev-ruby/spork-0.9.2-r2
+++ b/metadata/md5-cache/dev-ruby/spork-0.9.2-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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=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=Spork is Tim Harper's implementation of test server
 EAPI=5
 HOMEPAGE=https://github.com/sporkrb/spork
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=MIT
-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/spork-0.9.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_=f3ff5af72e180eb6a3b1f97a36619b07
diff --git a/metadata/md5-cache/dev-ruby/spreadsheet-0.6.9 b/metadata/md5-cache/dev-ruby/spreadsheet-0.6.9
index 45be91dbbc72..0f43e6e34208 100644
--- a/metadata/md5-cache/dev-ruby/spreadsheet-0.6.9
+++ b/metadata/md5-cache/dev-ruby/spreadsheet-0.6.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/ruby-ole-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-ole-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[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/test-unit:2[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/ruby-ole-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Ruby library to read and write spreadsheet documents
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/spreadsheet
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/ruby-ole-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-ole-1.0[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/ruby-ole-1.0[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/spreadsheet-0.6.9.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_=fe112d638261bb4b4ab91d6f65ecb5a1
diff --git a/metadata/md5-cache/dev-ruby/spring-1.7.2 b/metadata/md5-cache/dev-ruby/spring-1.7.2
index 560808aad20d..02895570af72 100644
--- a/metadata/md5-cache/dev-ruby/spring-1.7.2
+++ b/metadata/md5-cache/dev-ruby/spring-1.7.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/activesupport[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/activesupport[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/activesupport[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=Rails application preloader
 EAPI=5
 HOMEPAGE=https://github.com/rails/spring
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rubygems-2.1.0[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/rubygems-2.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rubygems-2.1.0[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=1.1
 SRC_URI=https://github.com/rails/spring/archive/v1.7.2.tar.gz -> spring-1.7.2.tar.gz
 _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_=73b72a8c8b8c244a29e1dce8d0a5799c
diff --git a/metadata/md5-cache/dev-ruby/spring-2.0.1 b/metadata/md5-cache/dev-ruby/spring-2.0.1
index fda2203b0a6a..9f6e81239b5e 100644
--- a/metadata/md5-cache/dev-ruby/spring-2.0.1
+++ b/metadata/md5-cache/dev-ruby/spring-2.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/activesupport[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/activesupport[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/activesupport[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=Rails application preloader
 EAPI=5
 HOMEPAGE=https://github.com/rails/spring
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.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/activesupport-4.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.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=1.1
 SRC_URI=https://github.com/rails/spring/archive/v2.0.1.tar.gz -> spring-2.0.1.tar.gz
 _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_=52d2a5977cfb466ebc41fdf1ff2822e2
diff --git a/metadata/md5-cache/dev-ruby/spring-2.0.2 b/metadata/md5-cache/dev-ruby/spring-2.0.2
index bb2f6e1fc13c..9dc3a8b98b82 100644
--- a/metadata/md5-cache/dev-ruby/spring-2.0.2
+++ b/metadata/md5-cache/dev-ruby/spring-2.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/activesupport[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/activesupport[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/activesupport[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=Rails application preloader
 EAPI=6
 HOMEPAGE=https://github.com/rails/spring
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.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/activesupport-4.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.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=1.1
 SRC_URI=https://github.com/rails/spring/archive/v2.0.2.tar.gz -> spring-2.0.2.tar.gz
 _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_=d7c7e47701c44c423cea54dbbb84f2a7
diff --git a/metadata/md5-cache/dev-ruby/sprockets-2.12.3-r1 b/metadata/md5-cache/dev-ruby/sprockets-2.12.3-r1
index 3ae950bd3029..6efcc6b51b07 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-2.12.3-r1
+++ b/metadata/md5-cache/dev-ruby/sprockets-2.12.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/hike-1*:0[ruby_targets_ruby21] >=dev-ruby/hike-1.2:0[ruby_targets_ruby21] =dev-ruby/multi_json-1*[ruby_targets_ruby21] =dev-ruby/rack-1*:*[ruby_targets_ruby21] =dev-ruby/tilt-1*:0[ruby_targets_ruby21] >=dev-ruby/tilt-1.3.1:0[ruby_targets_ruby21] !!<dev-ruby/sprockets-2.2.2-r1:2.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/hike-1*:0[ruby_targets_ruby22] >=dev-ruby/hike-1.2:0[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] =dev-ruby/rack-1*:*[ruby_targets_ruby22] =dev-ruby/tilt-1*:0[ruby_targets_ruby22] >=dev-ruby/tilt-1.3.1:0[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.2.2-r1:2.2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] =dev-ruby/coffee-script-2*[ruby_targets_ruby21] =dev-ruby/execjs-2*[ruby_targets_ruby21] =dev-ruby/sass-3*[ruby_targets_ruby21] >=dev-ruby/sass-3.1[ruby_targets_ruby21] dev-ruby/uglifier[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] =dev-ruby/coffee-script-2*[ruby_targets_ruby22] =dev-ruby/execjs-2*[ruby_targets_ruby22] =dev-ruby/sass-3*[ruby_targets_ruby22] >=dev-ruby/sass-3.1[ruby_targets_ruby22] dev-ruby/uglifier[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=test? ( ruby_targets_ruby22? ( =dev-ruby/hike-1*:0[ruby_targets_ruby22] >=dev-ruby/hike-1.2:0[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] =dev-ruby/rack-1*:*[ruby_targets_ruby22] =dev-ruby/tilt-1*:0[ruby_targets_ruby22] >=dev-ruby/tilt-1.3.1:0[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.2.2-r1:2.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] =dev-ruby/coffee-script-2*[ruby_targets_ruby22] =dev-ruby/execjs-2*[ruby_targets_ruby22] =dev-ruby/sass-3*[ruby_targets_ruby22] >=dev-ruby/sass-3.1[ruby_targets_ruby22] dev-ruby/uglifier[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=Ruby library for compiling and serving web assets
 EAPI=5
 HOMEPAGE=https://github.com/sstephenson/sprockets
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/hike-1*:0[ruby_targets_ruby21] >=dev-ruby/hike-1.2:0[ruby_targets_ruby21] =dev-ruby/multi_json-1*[ruby_targets_ruby21] =dev-ruby/rack-1*:*[ruby_targets_ruby21] =dev-ruby/tilt-1*:0[ruby_targets_ruby21] >=dev-ruby/tilt-1.3.1:0[ruby_targets_ruby21] !!<dev-ruby/sprockets-2.2.2-r1:2.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/hike-1*:0[ruby_targets_ruby22] >=dev-ruby/hike-1.2:0[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] =dev-ruby/rack-1*:*[ruby_targets_ruby22] =dev-ruby/tilt-1*:0[ruby_targets_ruby22] >=dev-ruby/tilt-1.3.1:0[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.2.2-r1:2.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/hike-1*:0[ruby_targets_ruby22] >=dev-ruby/hike-1.2:0[ruby_targets_ruby22] =dev-ruby/multi_json-1*[ruby_targets_ruby22] =dev-ruby/rack-1*:*[ruby_targets_ruby22] =dev-ruby/tilt-1*:0[ruby_targets_ruby22] >=dev-ruby/tilt-1.3.1:0[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.2.2-r1:2.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=2
 SRC_URI=https://github.com/sstephenson/sprockets/archive/v2.12.3.tar.gz -> sprockets-2.12.3-git.tgz
 _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_=bb378d667fb05578d7f580c05523e517
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.4.1 b/metadata/md5-cache/dev-ruby/sprockets-3.4.1
index 9228de1a628e..0d2d21065a76 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.4.1
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/rack-1*:*[ruby_targets_ruby21] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rack-1*:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] =dev-ruby/coffee-script-2*[ruby_targets_ruby21] =dev-ruby/execjs-2*[ruby_targets_ruby21] =dev-ruby/sass-3*[ruby_targets_ruby21] >=dev-ruby/sass-3.1[ruby_targets_ruby21] dev-ruby/uglifier[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] =dev-ruby/coffee-script-2*[ruby_targets_ruby22] =dev-ruby/execjs-2*[ruby_targets_ruby22] =dev-ruby/sass-3*[ruby_targets_ruby22] >=dev-ruby/sass-3.1[ruby_targets_ruby22] dev-ruby/uglifier[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=test? ( ruby_targets_ruby22? ( =dev-ruby/rack-1*:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] =dev-ruby/coffee-script-2*[ruby_targets_ruby22] =dev-ruby/execjs-2*[ruby_targets_ruby22] =dev-ruby/sass-3*[ruby_targets_ruby22] >=dev-ruby/sass-3.1[ruby_targets_ruby22] dev-ruby/uglifier[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=Ruby library for compiling and serving web assets
 EAPI=5
 HOMEPAGE=https://github.com/rails/sprockets
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/rack-1*:*[ruby_targets_ruby21] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rack-1*:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1: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/rack-1*:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1: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=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.4.1.tar.gz -> sprockets-3.4.1-git.tgz
 _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_=74fcb69ff2646ce152eb28a535623aa7
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.5.2 b/metadata/md5-cache/dev-ruby/sprockets-3.5.2
index f42d183b7afc..28125fd45358 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.5.2
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.5.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby21] =dev-ruby/rack-1*:*[ruby_targets_ruby21] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] =dev-ruby/rack-1*:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] =dev-ruby/coffee-script-2*[ruby_targets_ruby21] =dev-ruby/execjs-2*[ruby_targets_ruby21] =dev-ruby/sass-3*[ruby_targets_ruby21] >=dev-ruby/sass-3.1[ruby_targets_ruby21] dev-ruby/uglifier[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] =dev-ruby/coffee-script-2*[ruby_targets_ruby22] =dev-ruby/execjs-2*[ruby_targets_ruby22] =dev-ruby/sass-3*[ruby_targets_ruby22] >=dev-ruby/sass-3.1[ruby_targets_ruby22] dev-ruby/uglifier[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=test? ( ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] =dev-ruby/rack-1*:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] =dev-ruby/coffee-script-2*[ruby_targets_ruby22] =dev-ruby/execjs-2*[ruby_targets_ruby22] =dev-ruby/sass-3*[ruby_targets_ruby22] >=dev-ruby/sass-3.1[ruby_targets_ruby22] dev-ruby/uglifier[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=Ruby library for compiling and serving web assets
 EAPI=5
 HOMEPAGE=https://github.com/rails/sprockets
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby21] =dev-ruby/rack-1*:*[ruby_targets_ruby21] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] =dev-ruby/rack-1*:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1: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/concurrent-ruby:1[ruby_targets_ruby22] =dev-ruby/rack-1*:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1: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=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.5.2.tar.gz -> sprockets-3.5.2-git.tgz
 _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_=9acb322823b7ae59e2a0a185b1e4fad3
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.6.3 b/metadata/md5-cache/dev-ruby/sprockets-3.6.3
index d9904934c623..228de3940c88 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.6.3
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.6.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby21] >=dev-ruby/rack-1:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] >=dev-ruby/rack-1:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] >=dev-ruby/rack-1:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] =dev-ruby/coffee-script-2*[ruby_targets_ruby21] =dev-ruby/execjs-2*[ruby_targets_ruby21] =dev-ruby/sass-3*[ruby_targets_ruby21] >=dev-ruby/sass-3.1[ruby_targets_ruby21] dev-ruby/uglifier[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] =dev-ruby/coffee-script-2*[ruby_targets_ruby22] =dev-ruby/execjs-2*[ruby_targets_ruby22] =dev-ruby/sass-3*[ruby_targets_ruby22] >=dev-ruby/sass-3.1[ruby_targets_ruby22] dev-ruby/uglifier[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] =dev-ruby/coffee-script-2*[ruby_targets_ruby23] =dev-ruby/execjs-2*[ruby_targets_ruby23] =dev-ruby/sass-3*[ruby_targets_ruby23] >=dev-ruby/sass-3.1[ruby_targets_ruby23] dev-ruby/uglifier[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=test? ( ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] >=dev-ruby/rack-1:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] >=dev-ruby/rack-1:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] =dev-ruby/coffee-script-2*[ruby_targets_ruby22] =dev-ruby/execjs-2*[ruby_targets_ruby22] =dev-ruby/sass-3*[ruby_targets_ruby22] >=dev-ruby/sass-3.1[ruby_targets_ruby22] dev-ruby/uglifier[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] =dev-ruby/coffee-script-2*[ruby_targets_ruby23] =dev-ruby/execjs-2*[ruby_targets_ruby23] =dev-ruby/sass-3*[ruby_targets_ruby23] >=dev-ruby/sass-3.1[ruby_targets_ruby23] dev-ruby/uglifier[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=Ruby library for compiling and serving web assets
 EAPI=5
 HOMEPAGE=https://github.com/rails/sprockets
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby21] >=dev-ruby/rack-1:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] >=dev-ruby/rack-1:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] >=dev-ruby/rack-1:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] !!<dev-ruby/sprockets-2.12.3-r1: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/concurrent-ruby:1[ruby_targets_ruby22] >=dev-ruby/rack-1:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] >=dev-ruby/rack-1:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] !!<dev-ruby/sprockets-2.12.3-r1: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=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.6.3.tar.gz -> sprockets-3.6.3-git.tgz
 _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_=611cab020aa1154a3f9bf274dade6c5d
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.7.0 b/metadata/md5-cache/dev-ruby/sprockets-3.7.0
index e12d7aeb15e7..09b02cffe673 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.7.0
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby21] >=dev-ruby/rack-1:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] >=dev-ruby/rack-1:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] >=dev-ruby/rack-1:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] =dev-ruby/coffee-script-2*[ruby_targets_ruby21] =dev-ruby/execjs-2*[ruby_targets_ruby21] =dev-ruby/sass-3*[ruby_targets_ruby21] >=dev-ruby/sass-3.1[ruby_targets_ruby21] dev-ruby/uglifier[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] =dev-ruby/coffee-script-2*[ruby_targets_ruby22] =dev-ruby/execjs-2*[ruby_targets_ruby22] =dev-ruby/sass-3*[ruby_targets_ruby22] >=dev-ruby/sass-3.1[ruby_targets_ruby22] dev-ruby/uglifier[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] =dev-ruby/coffee-script-2*[ruby_targets_ruby23] =dev-ruby/execjs-2*[ruby_targets_ruby23] =dev-ruby/sass-3*[ruby_targets_ruby23] >=dev-ruby/sass-3.1[ruby_targets_ruby23] dev-ruby/uglifier[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=test? ( ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] >=dev-ruby/rack-1:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] >=dev-ruby/rack-1:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] =dev-ruby/coffee-script-2*[ruby_targets_ruby22] =dev-ruby/execjs-2*[ruby_targets_ruby22] =dev-ruby/sass-3*[ruby_targets_ruby22] >=dev-ruby/sass-3.1[ruby_targets_ruby22] dev-ruby/uglifier[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] =dev-ruby/coffee-script-2*[ruby_targets_ruby23] =dev-ruby/execjs-2*[ruby_targets_ruby23] =dev-ruby/sass-3*[ruby_targets_ruby23] >=dev-ruby/sass-3.1[ruby_targets_ruby23] dev-ruby/uglifier[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=Ruby library for compiling and serving web assets
 EAPI=5
 HOMEPAGE=https://github.com/rails/sprockets
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby21] >=dev-ruby/rack-1:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] >=dev-ruby/rack-1:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] >=dev-ruby/rack-1:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] !!<dev-ruby/sprockets-2.12.3-r1: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/concurrent-ruby:1[ruby_targets_ruby22] >=dev-ruby/rack-1:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] >=dev-ruby/rack-1:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] !!<dev-ruby/sprockets-2.12.3-r1: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=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.7.0.tar.gz -> sprockets-3.7.0-git.tgz
 _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_=611cab020aa1154a3f9bf274dade6c5d
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.7.1 b/metadata/md5-cache/dev-ruby/sprockets-3.7.1
index 3bbe6bf0c97f..6ff0b66b4371 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.7.1
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.7.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby21] >=dev-ruby/rack-1:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] >=dev-ruby/rack-1:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] >=dev-ruby/rack-1:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby24] >=dev-ruby/rack-1:*[ruby_targets_ruby24] <dev-ruby/rack-3:*[ruby_targets_ruby24] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] =dev-ruby/coffee-script-2*[ruby_targets_ruby21] =dev-ruby/execjs-2*[ruby_targets_ruby21] =dev-ruby/sass-3*[ruby_targets_ruby21] >=dev-ruby/sass-3.1[ruby_targets_ruby21] dev-ruby/uglifier[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] =dev-ruby/coffee-script-2*[ruby_targets_ruby22] =dev-ruby/execjs-2*[ruby_targets_ruby22] =dev-ruby/sass-3*[ruby_targets_ruby22] >=dev-ruby/sass-3.1[ruby_targets_ruby22] dev-ruby/uglifier[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] =dev-ruby/coffee-script-2*[ruby_targets_ruby23] =dev-ruby/execjs-2*[ruby_targets_ruby23] =dev-ruby/sass-3*[ruby_targets_ruby23] >=dev-ruby/sass-3.1[ruby_targets_ruby23] dev-ruby/uglifier[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/json[ruby_targets_ruby24] dev-ruby/rack-test[ruby_targets_ruby24] =dev-ruby/coffee-script-2*[ruby_targets_ruby24] =dev-ruby/execjs-2*[ruby_targets_ruby24] =dev-ruby/sass-3*[ruby_targets_ruby24] >=dev-ruby/sass-3.1[ruby_targets_ruby24] dev-ruby/uglifier[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] >=dev-ruby/rack-1:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] >=dev-ruby/rack-1:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby24] >=dev-ruby/rack-1:*[ruby_targets_ruby24] <dev-ruby/rack-3:*[ruby_targets_ruby24] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] =dev-ruby/coffee-script-2*[ruby_targets_ruby22] =dev-ruby/execjs-2*[ruby_targets_ruby22] =dev-ruby/sass-3*[ruby_targets_ruby22] >=dev-ruby/sass-3.1[ruby_targets_ruby22] dev-ruby/uglifier[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] =dev-ruby/coffee-script-2*[ruby_targets_ruby23] =dev-ruby/execjs-2*[ruby_targets_ruby23] =dev-ruby/sass-3*[ruby_targets_ruby23] >=dev-ruby/sass-3.1[ruby_targets_ruby23] dev-ruby/uglifier[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/json[ruby_targets_ruby24] dev-ruby/rack-test[ruby_targets_ruby24] =dev-ruby/coffee-script-2*[ruby_targets_ruby24] =dev-ruby/execjs-2*[ruby_targets_ruby24] =dev-ruby/sass-3*[ruby_targets_ruby24] >=dev-ruby/sass-3.1[ruby_targets_ruby24] dev-ruby/uglifier[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby library for compiling and serving web assets
 EAPI=5
 HOMEPAGE=https://github.com/rails/sprockets
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby21] >=dev-ruby/rack-1:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] >=dev-ruby/rack-1:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] >=dev-ruby/rack-1:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby24] >=dev-ruby/rack-1:*[ruby_targets_ruby24] <dev-ruby/rack-3:*[ruby_targets_ruby24] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] >=dev-ruby/rack-1:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] >=dev-ruby/rack-1:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby24] >=dev-ruby/rack-1:*[ruby_targets_ruby24] <dev-ruby/rack-3:*[ruby_targets_ruby24] !!<dev-ruby/sprockets-2.12.3-r1:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.7.1.tar.gz -> sprockets-3.7.1-git.tgz
 _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_=9cf7ffabb3dec7ec4b537b454f8fe256
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.3-r1 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.3-r1
index b4fce2c99fc5..82349669ecf7 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby21] <dev-ruby/sprockets-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby21] >=dev-ruby/railties-4[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby22] >=dev-ruby/railties-4[ruby_targets_ruby22] dev-ruby/test-unit: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby22] >=dev-ruby/railties-4[ruby_targets_ruby22] dev-ruby/test-unit: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=Sprockets implementation for Rails 4.x (and beyond) Asset Pipeline
 EAPI=5
 HOMEPAGE=https://github.com/rails/sprockets-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby21] <dev-ruby/sprockets-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[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/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] <dev-ruby/sprockets-4:*[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=2.3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.3.3.tar.gz -> sprockets-rails-2.3.3.tar.gz
 _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_=4044362cacb614e98646609e34f13aed
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-3.0.4 b/metadata/md5-cache/dev-ruby/sprockets-rails-3.0.4
index 14933cbef9cb..b8e13925cf22 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-3.0.4
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-3.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby21] dev-ruby/sprockets:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby21] >=dev-ruby/railties-4[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby22] >=dev-ruby/railties-4[ruby_targets_ruby22] dev-ruby/test-unit: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby22] >=dev-ruby/railties-4[ruby_targets_ruby22] dev-ruby/test-unit: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=Sprockets implementation for Rails 4.x (and beyond) Asset Pipeline
 EAPI=5
 HOMEPAGE=https://github.com/rails/sprockets-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby21] dev-ruby/sprockets:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[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/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[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=3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v3.0.4.tar.gz -> sprockets-rails-3.0.4.tar.gz
 _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_=a87688907e6d1fbb7fa94c65905bab4a
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-3.0.4-r1 b/metadata/md5-cache/dev-ruby/sprockets-rails-3.0.4-r1
index e3b676726574..4381afc17c60 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-3.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-3.0.4-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby21] dev-ruby/sprockets:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby21] >=dev-ruby/railties-4[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby22] >=dev-ruby/railties-4[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby23] >=dev-ruby/railties-4[ruby_targets_ruby23] dev-ruby/test-unit: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby22] >=dev-ruby/railties-4[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby23] >=dev-ruby/railties-4[ruby_targets_ruby23] dev-ruby/test-unit: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=Sprockets implementation for Rails 4.x (and beyond) Asset Pipeline
 EAPI=5
 HOMEPAGE=https://github.com/rails/sprockets-rails
-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 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby21] dev-ruby/sprockets:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[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/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[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=3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v3.0.4.tar.gz -> sprockets-rails-3.0.4.tar.gz
 _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_=0327021202c90e8ca97d0a122e5114ee
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-3.1.1 b/metadata/md5-cache/dev-ruby/sprockets-rails-3.1.1
index 269623a9f190..ab65e1bb9954 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-3.1.1
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-3.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby21] dev-ruby/sprockets:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby21] >=dev-ruby/railties-4[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby22] >=dev-ruby/railties-4[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby23] >=dev-ruby/railties-4[ruby_targets_ruby23] dev-ruby/test-unit: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby22] >=dev-ruby/railties-4[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby23] >=dev-ruby/railties-4[ruby_targets_ruby23] dev-ruby/test-unit: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=Sprockets implementation for Rails 4.x (and beyond) Asset Pipeline
 EAPI=5
 HOMEPAGE=https://github.com/rails/sprockets-rails
-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 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby21] dev-ruby/sprockets:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[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/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[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=3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v3.1.1.tar.gz -> sprockets-rails-3.1.1.tar.gz
 _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_=0327021202c90e8ca97d0a122e5114ee
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0 b/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0
index ff984e29d889..a5c26de8f509 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby21] dev-ruby/sprockets:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby21] >=dev-ruby/railties-4[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby22] >=dev-ruby/railties-4[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby23] >=dev-ruby/railties-4[ruby_targets_ruby23] dev-ruby/test-unit: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby22] >=dev-ruby/railties-4[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby23] >=dev-ruby/railties-4[ruby_targets_ruby23] dev-ruby/test-unit: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=Sprockets implementation for Rails 4.x (and beyond) Asset Pipeline
 EAPI=5
 HOMEPAGE=https://github.com/rails/sprockets-rails
-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 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby21] dev-ruby/sprockets:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[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/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[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=3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v3.2.0.tar.gz -> sprockets-rails-3.2.0.tar.gz
 _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_=28ee8c83247439f0173fa97d7844bdcc
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0-r1 b/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0-r1
index bd6e80051cc4..f468111c3a7f 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby21] dev-ruby/sprockets:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby24] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby24] dev-ruby/sprockets:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby21] >=dev-ruby/railties-4[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby22] >=dev-ruby/railties-4[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby23] >=dev-ruby/railties-4[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby24] >=dev-ruby/railties-4[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby24] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby24] dev-ruby/sprockets:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby22] >=dev-ruby/railties-4[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby23] >=dev-ruby/railties-4[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/actionpack-4[ruby_targets_ruby24] >=dev-ruby/railties-4[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Sprockets implementation for Rails 4.x (and beyond) Asset Pipeline
 EAPI=5
 HOMEPAGE=https://github.com/rails/sprockets-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby21] dev-ruby/sprockets:3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby24] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby24] dev-ruby/sprockets:3[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby22] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby22] dev-ruby/sprockets:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby23] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby23] dev-ruby/sprockets:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/actionpack-4.0:*[ruby_targets_ruby24] >=dev-ruby/activesupport-4.0:*[ruby_targets_ruby24] dev-ruby/sprockets:3[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v3.2.0.tar.gz -> sprockets-rails-3.2.0.tar.gz
 _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_=67ea1de088e8368b02736332b1dc82c8
diff --git a/metadata/md5-cache/dev-ruby/spy-0.4.5 b/metadata/md5-cache/dev-ruby/spy-0.4.5
index c9c73795e801..ee430882058f 100644
--- a/metadata/md5-cache/dev-ruby/spy-0.4.5
+++ b/metadata/md5-cache/dev-ruby/spy-0.4.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A simple opinionated mocking framework
 EAPI=5
 HOMEPAGE=https://github.com/ryanong/spy
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/spy-0.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_=d6d649cdd6f9351e33324923f6d1288e
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.3.11 b/metadata/md5-cache/dev-ruby/sqlite3-1.3.11
index 8532cf438878..b14610f68686 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.3.11
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.3.11
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-db/sqlite-3.6.16:3 ruby_targets_ruby21? ( dev-ruby/rake-compiler[ruby_targets_ruby21] dev-ruby/hoe[ruby_targets_ruby21] doc? ( dev-ruby/redcloth[ruby_targets_ruby21] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake-compiler[ruby_targets_ruby22] dev-ruby/hoe[ruby_targets_ruby22] doc? ( dev-ruby/redcloth[ruby_targets_ruby22] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rake-compiler[ruby_targets_ruby23] dev-ruby/hoe[ruby_targets_ruby23] doc? ( dev-ruby/redcloth[ruby_targets_ruby23] ) test? ( dev-ruby/minitest:5[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=>=dev-db/sqlite-3.6.16:3 ruby_targets_ruby22? ( dev-ruby/rake-compiler[ruby_targets_ruby22] dev-ruby/hoe[ruby_targets_ruby22] doc? ( dev-ruby/redcloth[ruby_targets_ruby22] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rake-compiler[ruby_targets_ruby23] dev-ruby/hoe[ruby_targets_ruby23] doc? ( dev-ruby/redcloth[ruby_targets_ruby23] ) test? ( dev-ruby/minitest:5[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=An extension library to access a SQLite database from Ruby
 EAPI=5
 HOMEPAGE=https://github.com/sparklemotion/sqlite3-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=>=dev-db/sqlite-3.6.16:3 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=>=dev-db/sqlite-3.6.16:3 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/sqlite3-1.3.11.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_=6a296a83b97319abf4e9bb3839fdfa36
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.3.12 b/metadata/md5-cache/dev-ruby/sqlite3-1.3.12
index a9fde561e786..7289d28b1781 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.3.12
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.3.12
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-db/sqlite-3.6.16:3 ruby_targets_ruby21? ( dev-ruby/rake-compiler[ruby_targets_ruby21] dev-ruby/hoe[ruby_targets_ruby21] doc? ( dev-ruby/redcloth[ruby_targets_ruby21] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake-compiler[ruby_targets_ruby22] dev-ruby/hoe[ruby_targets_ruby22] doc? ( dev-ruby/redcloth[ruby_targets_ruby22] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rake-compiler[ruby_targets_ruby23] dev-ruby/hoe[ruby_targets_ruby23] doc? ( dev-ruby/redcloth[ruby_targets_ruby23] ) test? ( dev-ruby/minitest:5[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=>=dev-db/sqlite-3.6.16:3 ruby_targets_ruby22? ( dev-ruby/rake-compiler[ruby_targets_ruby22] dev-ruby/hoe[ruby_targets_ruby22] doc? ( dev-ruby/redcloth[ruby_targets_ruby22] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rake-compiler[ruby_targets_ruby23] dev-ruby/hoe[ruby_targets_ruby23] doc? ( dev-ruby/redcloth[ruby_targets_ruby23] ) test? ( dev-ruby/minitest:5[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=An extension library to access a SQLite database from Ruby
 EAPI=5
 HOMEPAGE=https://github.com/sparklemotion/sqlite3-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=>=dev-db/sqlite-3.6.16:3 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=>=dev-db/sqlite-3.6.16:3 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/sqlite3-1.3.12.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_=58583aea789300af56fbc87f45e6a3d7
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.3.13 b/metadata/md5-cache/dev-ruby/sqlite3-1.3.13
index 3f60d219fecf..069453c57b4c 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.3.13
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.3.13
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-db/sqlite-3.6.16:3 ruby_targets_ruby21? ( dev-ruby/rake-compiler[ruby_targets_ruby21] dev-ruby/hoe[ruby_targets_ruby21] doc? ( dev-ruby/redcloth[ruby_targets_ruby21] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake-compiler[ruby_targets_ruby22] dev-ruby/hoe[ruby_targets_ruby22] doc? ( dev-ruby/redcloth[ruby_targets_ruby22] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rake-compiler[ruby_targets_ruby23] dev-ruby/hoe[ruby_targets_ruby23] doc? ( dev-ruby/redcloth[ruby_targets_ruby23] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/rake-compiler[ruby_targets_ruby24] dev-ruby/hoe[ruby_targets_ruby24] doc? ( dev-ruby/redcloth[ruby_targets_ruby24] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=>=dev-db/sqlite-3.6.16:3 ruby_targets_ruby22? ( dev-ruby/rake-compiler[ruby_targets_ruby22] dev-ruby/hoe[ruby_targets_ruby22] doc? ( dev-ruby/redcloth[ruby_targets_ruby22] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rake-compiler[ruby_targets_ruby23] dev-ruby/hoe[ruby_targets_ruby23] doc? ( dev-ruby/redcloth[ruby_targets_ruby23] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/rake-compiler[ruby_targets_ruby24] dev-ruby/hoe[ruby_targets_ruby24] doc? ( dev-ruby/redcloth[ruby_targets_ruby24] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An extension library to access a SQLite database from Ruby
 EAPI=5
 HOMEPAGE=https://github.com/sparklemotion/sqlite3-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=>=dev-db/sqlite-3.6.16:3 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=dev-db/sqlite-3.6.16:3 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/sqlite3-1.3.13.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_=5d4d897512f00edd54c93fc2c8d83436
diff --git a/metadata/md5-cache/dev-ruby/sshkey-1.8.0 b/metadata/md5-cache/dev-ruby/sshkey-1.8.0
index 9fb406b12abd..69688d52b532 100644
--- a/metadata/md5-cache/dev-ruby/sshkey-1.8.0
+++ b/metadata/md5-cache/dev-ruby/sshkey-1.8.0
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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=SSH private and public key generator in pure Ruby
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/sshkey
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/sshkey-1.8.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_=ca3c182a24041f8ad71674756eac7e93
diff --git a/metadata/md5-cache/dev-ruby/sshkey-1.9.0 b/metadata/md5-cache/dev-ruby/sshkey-1.9.0
index 2c412ea46aee..6b22fbb4508d 100644
--- a/metadata/md5-cache/dev-ruby/sshkey-1.9.0
+++ b/metadata/md5-cache/dev-ruby/sshkey-1.9.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=SSH private and public key generator in pure Ruby
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/sshkey
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/sshkey-1.9.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_=5a83ef18d3b31de297092eb4fe958566
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.11.4 b/metadata/md5-cache/dev-ruby/sshkit-1.11.4
index 0491f107a5de..c66bd256475d 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.11.4
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.11.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/mocha[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/mocha[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=SSHKit makes it easy to write structured, testable SSH commands in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/capistrano/sshkit
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.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/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.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/sshkit-1.11.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_=5215a9cfe1a2f4ae33681ce02d80d12b
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.11.5 b/metadata/md5-cache/dev-ruby/sshkit-1.11.5
index 1f238417683d..32033b67be73 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.11.5
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.11.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/mocha[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/mocha[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=SSHKit makes it easy to write structured, testable SSH commands in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/capistrano/sshkit
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.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/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.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/sshkit-1.11.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_=6568eb3c32aa8596ffa317fb9938b4de
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.12.0 b/metadata/md5-cache/dev-ruby/sshkit-1.12.0
index b1a612d36a75..d9cf27008952 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.12.0
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.12.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/mocha[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/mocha[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=SSHKit makes it easy to write structured, testable SSH commands in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/capistrano/sshkit
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.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/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.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/sshkit-1.12.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_=eb44c20edaf0993021b1adc18c08787c
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.13.1 b/metadata/md5-cache/dev-ruby/sshkit-1.13.1
index 80850405bf23..6bfc9887efae 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.13.1
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.13.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/mocha[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/mocha[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=SSHKit makes it easy to write structured, testable SSH commands in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/capistrano/sshkit
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.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/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.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/sshkit-1.13.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_=eb44c20edaf0993021b1adc18c08787c
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.14.0 b/metadata/md5-cache/dev-ruby/sshkit-1.14.0
index 9d0e62811fa3..d9521a400ca1 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.14.0
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.14.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/mocha[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/mocha[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=SSHKit makes it easy to write structured, testable SSH commands in Ruby
 EAPI=6
 HOMEPAGE=https://github.com/capistrano/sshkit
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.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/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.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/sshkit-1.14.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_=6b360280a0165c881d26c2abe0e322bb
diff --git a/metadata/md5-cache/dev-ruby/stamp-0.6.0 b/metadata/md5-cache/dev-ruby/stamp-0.6.0
index b7a1245b11a5..1ac4bbe1cd6a 100644
--- a/metadata/md5-cache/dev-ruby/stamp-0.6.0
+++ b/metadata/md5-cache/dev-ruby/stamp-0.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/redcarpet[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=ruby_targets_ruby22? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/redcarpet[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=Date and time formatting for humans
 EAPI=5
 HOMEPAGE=https://github.com/jeremyw/stamp
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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=https://github.com/jeremyw/stamp/archive/v0.6.0.tar.gz -> stamp-0.6.0.tar.gz
 _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_=73877c773dda4a5437e2e43717ddd7a8
diff --git a/metadata/md5-cache/dev-ruby/state_machine-1.2.0 b/metadata/md5-cache/dev-ruby/state_machine-1.2.0
index 16f547a647cb..b971382e3282 100644
--- a/metadata/md5-cache/dev-ruby/state_machine-1.2.0
+++ b/metadata/md5-cache/dev-ruby/state_machine-1.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit: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/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit: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=Adds support for creating state machines for attributes on any Ruby class
 EAPI=5
 HOMEPAGE=http://www.pluginaweek.org
-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=MIT
-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/state_machine-1.2.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_=8872405c825721e64bbbffb009dc9b59
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.3.4 b/metadata/md5-cache/dev-ruby/stomp-1.3.4
index 726465cf45b3..572214765c5a 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.3.4
+++ b/metadata/md5-cache/dev-ruby/stomp-1.3.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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_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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Ruby bindings for the stomp messaging protocol
 EAPI=5
 HOMEPAGE=https://github.com/stompgem/stomp
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/stomp-1.3.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_=afcf0f7a99ae84ccb0ebbdd49b53022c
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.4.3 b/metadata/md5-cache/dev-ruby/stomp-1.4.3
index 0bb53a609f87..cfecdd483703 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.4.3
+++ b/metadata/md5-cache/dev-ruby/stomp-1.4.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby bindings for the stomp messaging protocol
 EAPI=5
 HOMEPAGE=https://github.com/stompgem/stomp
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/stomp-1.4.3.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_=f2c844e28cd68495acd44cb6e4545c3a
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.4.4 b/metadata/md5-cache/dev-ruby/stomp-1.4.4
index 08f547ab8f67..ca42fb7c77af 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.4.4
+++ b/metadata/md5-cache/dev-ruby/stomp-1.4.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby bindings for the stomp messaging protocol
 EAPI=6
 HOMEPAGE=https://github.com/stompgem/stomp
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/stomp-1.4.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_=5194cabfdce40fa21402a5c47da90a62
diff --git a/metadata/md5-cache/dev-ruby/stringex-2.7.0 b/metadata/md5-cache/dev-ruby/stringex-2.7.0
index b91985e17910..7ac63f715ad9 100644
--- a/metadata/md5-cache/dev-ruby/stringex-2.7.0
+++ b/metadata/md5-cache/dev-ruby/stringex-2.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby21] dev-ruby/redcloth[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] >=dev-ruby/activerecord-3[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby22] dev-ruby/redcloth[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/activerecord-3[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby23] dev-ruby/redcloth[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/activerecord-3[ruby_targets_ruby23] dev-ruby/sqlite3[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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/i18n-0.6.9:0.6[ruby_targets_ruby22] dev-ruby/redcloth[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/activerecord-3[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby23] dev-ruby/redcloth[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/activerecord-3[ruby_targets_ruby23] dev-ruby/sqlite3[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Extensions for Ruby's String class
 EAPI=5
 HOMEPAGE=https://github.com/rsl/stringex
-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 ~ppc64
 LICENSE=MIT
-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/stringex-2.7.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_=cc81916b0fc547768dccb8353cc11a62
diff --git a/metadata/md5-cache/dev-ruby/stringex-2.7.1 b/metadata/md5-cache/dev-ruby/stringex-2.7.1
index 11c73e699766..26b28b739548 100644
--- a/metadata/md5-cache/dev-ruby/stringex-2.7.1
+++ b/metadata/md5-cache/dev-ruby/stringex-2.7.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby21] dev-ruby/redcloth[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] >=dev-ruby/activerecord-3[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby22] dev-ruby/redcloth[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/activerecord-3[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby23] dev-ruby/redcloth[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/activerecord-3[ruby_targets_ruby23] dev-ruby/sqlite3[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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/i18n-0.6.9:0.6[ruby_targets_ruby22] dev-ruby/redcloth[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/activerecord-3[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby23] dev-ruby/redcloth[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/activerecord-3[ruby_targets_ruby23] dev-ruby/sqlite3[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Extensions for Ruby's String class
 EAPI=5
 HOMEPAGE=https://github.com/rsl/stringex
-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 ~x86
 LICENSE=MIT
-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/stringex-2.7.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_=255fc77d74e86d63ccebe852fa9889ea
diff --git a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1 b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
index 783871f85738..8241d3d5c9c1 100644
--- a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/shoulda[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/shoulda[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/shoulda[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=ruby_targets_ruby22? ( test? ( dev-ruby/shoulda[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/shoulda[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=Subexec spawns an external command with a timeout
 EAPI=5
 HOMEPAGE=https://github.com/nulayer/subexec
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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=https://github.com/nulayer/subexec/archive/v0.2.3.tar.gz -> subexec-0.2.3.tgz
 _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_=2d9873e5fd422102b17b610dc033e04d
diff --git a/metadata/md5-cache/dev-ruby/syntax-1.2.0-r1 b/metadata/md5-cache/dev-ruby/syntax-1.2.0-r1
index 6d874b84c2f3..88a1ffe960e8 100644
--- a/metadata/md5-cache/dev-ruby/syntax-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/syntax-1.2.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Syntax highlighting for sourcecode and HTML
 EAPI=5
 HOMEPAGE=https://github.com/dblock/syntax
-IUSE=test doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=test doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-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=https://github.com/dblock/syntax/archive/v1.2.0.tar.gz -> syntax-1.2.0.tar.gz
 _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_=ec5f37f4d54009570b62763b784cbf45
diff --git a/metadata/md5-cache/dev-ruby/syntax-1.2.1 b/metadata/md5-cache/dev-ruby/syntax-1.2.1
index 1b25b41dbf71..f2a6fc9dfb32 100644
--- a/metadata/md5-cache/dev-ruby/syntax-1.2.1
+++ b/metadata/md5-cache/dev-ruby/syntax-1.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Syntax highlighting for sourcecode and HTML
 EAPI=5
 HOMEPAGE=https://github.com/dblock/syntax
-IUSE=test doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/dblock/syntax/archive/v1.2.1.tar.gz -> syntax-1.2.1.tar.gz
 _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_=95830951d39e97fe1b5ef4348e9cf945
diff --git a/metadata/md5-cache/dev-ruby/syntax-1.2.2 b/metadata/md5-cache/dev-ruby/syntax-1.2.2
index 7f639dfadc4d..9f5afc79900f 100644
--- a/metadata/md5-cache/dev-ruby/syntax-1.2.2
+++ b/metadata/md5-cache/dev-ruby/syntax-1.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Syntax highlighting for sourcecode and HTML
 EAPI=6
 HOMEPAGE=https://github.com/dblock/syntax
-IUSE=test doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/dblock/syntax/archive/v1.2.2.tar.gz -> syntax-1.2.2.tar.gz
 _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_=3f00cb2174223e29789001e961771952
diff --git a/metadata/md5-cache/dev-ruby/syslogger-1.6.4 b/metadata/md5-cache/dev-ruby/syslogger-1.6.4
index 75c80caebfa2..ac3e68c93a10 100644
--- a/metadata/md5-cache/dev-ruby/syslogger-1.6.4
+++ b/metadata/md5-cache/dev-ruby/syslogger-1.6.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( >=dev-ruby/rdoc-2.4.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/rdoc-2.4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/rdoc-2.4.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? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=ruby_targets_ruby22? ( doc? ( >=dev-ruby/rdoc-2.4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/rdoc-2.4.2[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Drop-in replacement for the standard Logger, that logs to the syslog
 EAPI=5
 HOMEPAGE=https://github.com/crohr/syslogger
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/syslogger-1.6.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_=0fee2aba52c288ac98fd9caa073b6e59
diff --git a/metadata/md5-cache/dev-ruby/systemu-2.6.5 b/metadata/md5-cache/dev-ruby/systemu-2.6.5
index 6ab888731c5d..6e50c668c3dd 100644
--- a/metadata/md5-cache/dev-ruby/systemu-2.6.5
+++ b/metadata/md5-cache/dev-ruby/systemu-2.6.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Universal capture of STDOUT and STDERR and handling of child process PID
 EAPI=5
 HOMEPAGE=http://codeforpeople.com/lib/ruby/systemu/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=amd64 x86
 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/systemu-2.6.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_=2f51e52e1cf0a9116f3eae51ecfdd5d3
diff --git a/metadata/md5-cache/dev-ruby/tdiff-0.3.3-r1 b/metadata/md5-cache/dev-ruby/tdiff-0.3.3-r1
index 120f2bf6170b..6b2c6b178994 100644
--- a/metadata/md5-cache/dev-ruby/tdiff-0.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/tdiff-0.3.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Calculates the differences between two tree-like structures
 EAPI=5
 HOMEPAGE=https://github.com/postmodern/tdiff
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/tdiff-0.3.3.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_=4b0e1988b3a316a1935d7197b1c83e42
diff --git a/metadata/md5-cache/dev-ruby/temple-0.6.10 b/metadata/md5-cache/dev-ruby/temple-0.6.10
index d56273bbcfb0..2e0f21c11d27 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.6.10
+++ b/metadata/md5-cache/dev-ruby/temple-0.6.10
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] dev-ruby/tilt[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] dev-ruby/tilt[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] dev-ruby/tilt[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] dev-ruby/tilt[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] dev-ruby/tilt[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] dev-ruby/tilt[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] dev-ruby/tilt[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An abstraction and a framework for compiling templates to pure Ruby
 EAPI=5
 HOMEPAGE=https://github.com/judofyr/temple
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/temple-0.6.10.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_=06bcfafc757216424535e9cfa34ec95c
diff --git a/metadata/md5-cache/dev-ruby/temple-0.7.7 b/metadata/md5-cache/dev-ruby/temple-0.7.7
index dffa8ac17f02..2804e0ef646d 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.7.7
+++ b/metadata/md5-cache/dev-ruby/temple-0.7.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] dev-ruby/erubis[ruby_targets_ruby21] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] >=dev-ruby/tilt-2.0.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] ) 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/bacon[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] >=dev-ruby/tilt-2.0.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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=An abstraction and a framework for compiling templates to pure Ruby
 EAPI=5
 HOMEPAGE=https://github.com/judofyr/temple
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=MIT
-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.7
 SRC_URI=mirror://rubygems/temple-0.7.7.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_=4953170bae6e9e930722cdf370521d92
diff --git a/metadata/md5-cache/dev-ruby/temple-0.8.0 b/metadata/md5-cache/dev-ruby/temple-0.8.0
index b526085690be..b8557e5f3dfd 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.8.0
+++ b/metadata/md5-cache/dev-ruby/temple-0.8.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] dev-ruby/erubis[ruby_targets_ruby21] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] dev-ruby/erubis[ruby_targets_ruby24] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] dev-ruby/erubis[ruby_targets_ruby24] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An abstraction and a framework for compiling templates to pure Ruby
 EAPI=5
 HOMEPAGE=https://github.com/judofyr/temple
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 arm ~arm64 ppc ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.7
 SRC_URI=mirror://rubygems/temple-0.8.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_=6b8d2b0850d5782c8f91193c03d9ea01
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1
index 3034906c9b38..72634fad4c21 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Small Ruby library that colors strings using ANSI escape sequences
 EAPI=5
 HOMEPAGE=http://term-ansicolor.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/term-ansicolor-1.2.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_=5bd681015b358da6464e171cae85d786
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.6.0 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.6.0
index 019742458a2b..fd6e2fd59c1a 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.6.0
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/tins-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/tins-1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tins-1.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/tins-1.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/tins-1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tins-1.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/tins-1.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Small Ruby library that colors strings using ANSI escape sequences
 EAPI=5
 HOMEPAGE=https://flori.github.io/term-ansicolor/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/tins-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/tins-1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tins-1.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/tins-1.0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/tins-1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tins-1.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/tins-1.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/term-ansicolor-1.6.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_=5680931179e5edcbeda64e1d6135747f
diff --git a/metadata/md5-cache/dev-ruby/termcolor-1.2.2 b/metadata/md5-cache/dev-ruby/termcolor-1.2.2
index 25412cdfafc8..1121caa99b6a 100644
--- a/metadata/md5-cache/dev-ruby/termcolor-1.2.2
+++ b/metadata/md5-cache/dev-ruby/termcolor-1.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=a library for ANSI color formatting like HTML for output in terminal
 EAPI=5
 HOMEPAGE=http://termcolor.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/termcolor-1.2.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_=57efcfdb643ae0c2fe6111574ca17a32
diff --git a/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r3 b/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r3
index ed2760974c30..fd87c81e4ef6 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r3
+++ b/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r3
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/hoe-1.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/hoe-1.5.1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/hoe-1.5.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Nathaniel Talbott's originial test-unit
 EAPI=5
 HOMEPAGE=http://test-unit.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/hoe-1.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/hoe-1.5.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/hoe-1.5.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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/test-unit-1.2.3.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_=04bcdaf813de8b3100b41cc278c938a3
diff --git a/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2 b/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2
index 2077ae5153dc..5d0fc1d60cc4 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2
+++ b/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/yard[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? ( doc? ( dev-ruby/yard[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=An improved version of the Test::Unit framework from Ruby 1.8
 EAPI=5
 HOMEPAGE=http://test-unit.rubyforge.org/
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Ruby
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-2.5.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_=2a98d7b610631dafcef6dd19c60aafab
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.1.9 b/metadata/md5-cache/dev-ruby/test-unit-3.1.9
index b8a2879fe3f5..0e8b9067a31f 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.1.9
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.1.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/power_assert[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/power_assert[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/power_assert[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? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/power_assert[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/power_assert[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=An xUnit family unit testing framework for Ruby
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/test-unit
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby GPL-2 ) PSF-2
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/power_assert[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/power_assert[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/power_assert[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/power_assert[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/power_assert[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=2
 SRC_URI=mirror://rubygems/test-unit-3.1.9.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_=afe7dbf4a6a6611327ff97903aaa677d
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.2.4 b/metadata/md5-cache/dev-ruby/test-unit-3.2.4
index fee80eed8216..4c8d211cb1f6 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.2.4
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.2.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/power_assert[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/power_assert[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/power_assert[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/power_assert[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/power_assert[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/power_assert[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/power_assert[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An xUnit family unit testing framework for Ruby
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/test-unit
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby GPL-2 ) PSF-2
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/power_assert[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/power_assert[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/power_assert[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/power_assert[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/power_assert[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/power_assert[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/power_assert[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-3.2.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_=8eecc345abb229f97c10e865f7a807a7
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.2.5 b/metadata/md5-cache/dev-ruby/test-unit-3.2.5
index 0188ed7f48ae..2b47242e62e4 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.2.5
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.2.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/power_assert[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/power_assert[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/power_assert[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/power_assert[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/power_assert[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/power_assert[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/power_assert[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=An xUnit family unit testing framework for Ruby
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/test-unit
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby GPL-2 ) PSF-2
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/power_assert[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/power_assert[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/power_assert[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/power_assert[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/power_assert[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/power_assert[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/power_assert[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-3.2.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_=8eecc345abb229f97c10e865f7a807a7
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1
index 326a43ff811a..d1faf12fb5d6 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby21] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby22] >=dev-ruby/test-unit-2.5.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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby22] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=RR adapter for Test::Unit
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/test-unit/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby21] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby22] >=dev-ruby/test-unit-2.5.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/rr-1.1.1[ruby_targets_ruby22] >=dev-ruby/test-unit-2.5.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/test-unit-rr-1.0.3.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_=7fa00004162514c5363f5894dcc5139c
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
index 685549fd5d09..09ac891c21fd 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby21] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby22] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby23] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby24] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby22] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby23] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby24] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=RR adapter for Test::Unit
 EAPI=5
 HOMEPAGE=https://github.com/test-unit/test-unit-rr
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby21] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby22] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby23] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby24] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby22] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby23] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby24] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/test-unit-rr-1.0.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_=5fd716b9a488c9cbd1c74902e26e19c8
diff --git a/metadata/md5-cache/dev-ruby/test_construct-2.0.1 b/metadata/md5-cache/dev-ruby/test_construct-2.0.1
index 23a1c9843332..a3237d46b56c 100644
--- a/metadata/md5-cache/dev-ruby/test_construct-2.0.1
+++ b/metadata/md5-cache/dev-ruby/test_construct-2.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.0.8[ruby_targets_ruby21] >=dev-ruby/mocha-0.14.0[ruby_targets_ruby21] dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.0.8[ruby_targets_ruby22] >=dev-ruby/mocha-0.14.0[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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/minitest-5.0.8[ruby_targets_ruby22] >=dev-ruby/mocha-0.14.0[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Creates temporary files and directories for testing
 EAPI=5
 HOMEPAGE=https://github.com/bhb/test_construct
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/test_construct-2.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_=7d9f72d6ea0c92bde8899b609a2a3286
diff --git a/metadata/md5-cache/dev-ruby/test_construct-2.0.1-r1 b/metadata/md5-cache/dev-ruby/test_construct-2.0.1-r1
index 9663706d9d3c..b3f91fda8af5 100644
--- a/metadata/md5-cache/dev-ruby/test_construct-2.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/test_construct-2.0.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.0.8[ruby_targets_ruby21] >=dev-ruby/mocha-0.14.0[ruby_targets_ruby21] dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.0.8[ruby_targets_ruby22] >=dev-ruby/mocha-0.14.0[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.0.8[ruby_targets_ruby23] >=dev-ruby/mocha-0.14.0[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.0.8[ruby_targets_ruby24] >=dev-ruby/mocha-0.14.0[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.0.8[ruby_targets_ruby22] >=dev-ruby/mocha-0.14.0[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.0.8[ruby_targets_ruby23] >=dev-ruby/mocha-0.14.0[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.0.8[ruby_targets_ruby24] >=dev-ruby/mocha-0.14.0[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Creates temporary files and directories for testing
 EAPI=5
 HOMEPAGE=https://github.com/bhb/test_construct
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/test_construct-2.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_=6171e000c25baa297b424f0bc66f2506
diff --git a/metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2 b/metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2
index ef7595c9613d..3c49768ed2c2 100644
--- a/metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2
+++ b/metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Simply adds a declarative test method syntax to test/unit
 EAPI=5
 HOMEPAGE=https://github.com/svenfuchs/test_declarative
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/svenfuchs/test_declarative/tarball/v0.0.5 -> test_declarative-0.0.5.tgz
 _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_=0c421e363e66b05e913230167851b13a
diff --git a/metadata/md5-cache/dev-ruby/text-1.3.1 b/metadata/md5-cache/dev-ruby/text-1.3.1
index db19da2ab985..eb6c6483ee0c 100644
--- a/metadata/md5-cache/dev-ruby/text-1.3.1
+++ b/metadata/md5-cache/dev-ruby/text-1.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A collection of text algorithms
 EAPI=5
 HOMEPAGE=https://github.com/threedaymonk/text
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/text-1.3.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_=82f778f4253550d281c028323befa308
diff --git a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2 b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
index a1786fe06d16..43ee8be27f46 100644
--- a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
+++ b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby21] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby22] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby23] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby23] dev-ruby/test-unit: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? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby22] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby23] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby23] dev-ruby/test-unit:2[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Hyphenates words according to the rules of the language the word is written in
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/text-format
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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/text-hyphen-1.4.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_=12fb8e9ecc65b0c0fd4ea60317e38eb3
diff --git a/metadata/md5-cache/dev-ruby/textpow-1.4.0 b/metadata/md5-cache/dev-ruby/textpow-1.4.0
index 5579ab3481df..04b041a5002e 100644
--- a/metadata/md5-cache/dev-ruby/textpow-1.4.0
+++ b/metadata/md5-cache/dev-ruby/textpow-1.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/plist-3.0.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? ( 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: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-ruby/plist-3.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/plist-3.0.1[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: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=A library to parse and process Textmate bundles
 EAPI=5
 HOMEPAGE=http://textpow.rubyforge.org/
-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 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/plist-3.0.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/plist-3.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/plist-3.0.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=https://github.com/grosser/textpow/archive/v1.4.0.tar.gz -> textpow-1.4.0.tar.gz
 _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_=3bce8734d97b01927a11f5131e089d03
diff --git a/metadata/md5-cache/dev-ruby/thor-0.19.1 b/metadata/md5-cache/dev-ruby/thor-0.19.1
index 51073289cc01..3b0f72cbca27 100644
--- a/metadata/md5-cache/dev-ruby/thor-0.19.1
+++ b/metadata/md5-cache/dev-ruby/thor-0.19.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/fakeweb-1.3[ruby_targets_ruby21] dev-ruby/childlabor[ruby_targets_ruby21] ) ) 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: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=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: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=A scripting framework that replaces rake and sake
 EAPI=5
 HOMEPAGE=http://whatisthor.com/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-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=https://github.com/erikhuda/thor/archive/v0.19.1.tar.gz -> thor-git-0.19.1.tgz
 _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_=2dd97647d68c8b57497f5c0a4aaab801
diff --git a/metadata/md5-cache/dev-ruby/thor-0.19.4 b/metadata/md5-cache/dev-ruby/thor-0.19.4
index 0416fdfc4fa4..c6740df8e8b1 100644
--- a/metadata/md5-cache/dev-ruby/thor-0.19.4
+++ b/metadata/md5-cache/dev-ruby/thor-0.19.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/childlabor[ruby_targets_ruby21] dev-ruby/webmock:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/childlabor[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/childlabor[ruby_targets_ruby23] dev-ruby/webmock:0[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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/childlabor[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/childlabor[ruby_targets_ruby23] dev-ruby/webmock:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A scripting framework that replaces rake and sake
 EAPI=6
 HOMEPAGE=http://whatisthor.com/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/erikhuda/thor/archive/v0.19.4.tar.gz -> thor-git-0.19.4.tgz
 _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_=7f2a7d3285b17e52f1f4ba5b48b3475a
diff --git a/metadata/md5-cache/dev-ruby/thor-0.20.0 b/metadata/md5-cache/dev-ruby/thor-0.20.0
index e4fd7796a075..b84430918578 100644
--- a/metadata/md5-cache/dev-ruby/thor-0.20.0
+++ b/metadata/md5-cache/dev-ruby/thor-0.20.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/childlabor[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/childlabor[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/childlabor[ruby_targets_ruby23] dev-ruby/webmock[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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/childlabor[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/childlabor[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A scripting framework that replaces rake and sake
 EAPI=6
 HOMEPAGE=http://whatisthor.com/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/erikhuda/thor/archive/v0.20.0.tar.gz -> thor-git-0.20.0.tgz
 _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_=fac35e726df4c0e1e91950c5483f9c22
diff --git a/metadata/md5-cache/dev-ruby/thread_order-1.1.0 b/metadata/md5-cache/dev-ruby/thread_order-1.1.0
index e31c3d8d25ea..cdeada41f15d 100644
--- a/metadata/md5-cache/dev-ruby/thread_order-1.1.0
+++ b/metadata/md5-cache/dev-ruby/thread_order-1.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Test helper for ordering threaded code
 EAPI=5
 HOMEPAGE=https://github.com/JoshCheek/thread_order
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/thread_order-1.1.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_=f4df54226cf675bf43c5aabc4ba55408
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.3.5 b/metadata/md5-cache/dev-ruby/thread_safe-0.3.5
index bf1adc54eb22..69825ab185a8 100644
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.3.5
+++ b/metadata/md5-cache/dev-ruby/thread_safe-0.3.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/atomic-1.1.16[ruby_targets_ruby21] >=dev-ruby/minitest-4[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/atomic-1.1.16[ruby_targets_ruby22] >=dev-ruby/minitest-4[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/atomic-1.1.16[ruby_targets_ruby23] >=dev-ruby/minitest-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/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/atomic-1.1.16[ruby_targets_ruby22] >=dev-ruby/minitest-4[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/atomic-1.1.16[ruby_targets_ruby23] >=dev-ruby/minitest-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/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=A collection of thread-safe versions of common core Ruby classes
 EAPI=5
 HOMEPAGE=https://github.com/ruby-concurrency/thread_safe
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-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/thread_safe-0.3.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_=dd5fc0fef25e1fe289518b1556b9e56a
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6 b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
index 3e5ca097c140..32009ff800bd 100644
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
+++ b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/atomic-1.1.16[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/atomic-1.1.16[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/atomic-1.1.16[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/atomic-1.1.16[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/atomic-1.1.16[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/atomic-1.1.16[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/atomic-1.1.16[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A collection of thread-safe versions of common core Ruby classes
 EAPI=5
 HOMEPAGE=https://github.com/ruby-concurrency/thread_safe
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/thread_safe-0.3.6.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_=791bbf96b48c9edb8e2b433ef012ecee
diff --git a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3 b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3
index adbb68eaa695..3525bc56c886 100644
--- a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3
+++ b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=W3C HTML Tidy library implemented as a Ruby extension
 EAPI=5
 HOMEPAGE=https://github.com/carld/tidy
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=HTML-Tidy
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/tidy-ext-0.1.14.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_=f9ded367faaeeec5f4552a41a6bd40ae
diff --git a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4 b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
index 5e4d94d8c67b..d6125da2dd62 100644
--- a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
+++ b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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: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=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: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=Tool to convert an array of struct into an HTML table
 EAPI=5
 HOMEPAGE=https://github.com/topfunky/tidy_table
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=amd64 x86
 LICENSE=MIT
-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/tidy_table-0.0.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_=e316ef325cdaa4634e13a2b32298f770
diff --git a/metadata/md5-cache/dev-ruby/tilt-1.4.1 b/metadata/md5-cache/dev-ruby/tilt-1.4.1
index 35526d6ba0f5..571d8cb5d331 100644
--- a/metadata/md5-cache/dev-ruby/tilt-1.4.1
+++ b/metadata/md5-cache/dev-ruby/tilt-1.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby21] dev-ruby/coffee-script[ruby_targets_ruby21] dev-ruby/erubis[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/coffee-script[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/builder-2.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/builder-2.0.0[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/bluecloth[ruby_targets_ruby22] dev-ruby/coffee-script[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/builder-2.0.0[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=A thin interface over a Ruby template engines to make their usage as generic as possible
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/tilt
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/builder-2.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/builder-2.0.0[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.0.0[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/tilt-1.4.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_=0dda07da030c9bf35b582aba3518d4ff
diff --git a/metadata/md5-cache/dev-ruby/tilt-1.4.1-r2 b/metadata/md5-cache/dev-ruby/tilt-1.4.1-r2
index 82127a40a835..8aba54ee5a3b 100644
--- a/metadata/md5-cache/dev-ruby/tilt-1.4.1-r2
+++ b/metadata/md5-cache/dev-ruby/tilt-1.4.1-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby21] dev-ruby/coffee-script[ruby_targets_ruby21] dev-ruby/erubis[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/radius[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/coffee-script[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/radius[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/builder-2.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/builder-2.0.0[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/bluecloth[ruby_targets_ruby22] dev-ruby/coffee-script[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/radius[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/builder-2.0.0[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=A thin interface over a Ruby template engines to make their usage as generic as possible
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/tilt
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/builder-2.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/builder-2.0.0[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.0.0[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/tilt-1.4.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_=b883ed733963fd55f7b81455e5901ca9
diff --git a/metadata/md5-cache/dev-ruby/tilt-2.0.5 b/metadata/md5-cache/dev-ruby/tilt-2.0.5
index 440a0cc0d9c1..c37ca3294b14 100644
--- a/metadata/md5-cache/dev-ruby/tilt-2.0.5
+++ b/metadata/md5-cache/dev-ruby/tilt-2.0.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby21] dev-ruby/coffee-script[ruby_targets_ruby21] dev-ruby/erubis[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/coffee-script[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/coffee-script[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby24] dev-ruby/coffee-script[ruby_targets_ruby24] dev-ruby/erubis[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/builder-2.0.0:*[ruby_targets_ruby21] !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/builder-2.0.0:*[ruby_targets_ruby22] !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/builder-2.0.0:*[ruby_targets_ruby23] !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.0.0:*[ruby_targets_ruby24] !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/coffee-script[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/coffee-script[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby24] dev-ruby/coffee-script[ruby_targets_ruby24] dev-ruby/erubis[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/builder-2.0.0:*[ruby_targets_ruby22] !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/builder-2.0.0:*[ruby_targets_ruby23] !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.0.0:*[ruby_targets_ruby24] !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Thin interface over template engines to make their usage as generic as possible
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/tilt
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=amd64 arm ~arm64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/builder-2.0.0:*[ruby_targets_ruby21] !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/builder-2.0.0:*[ruby_targets_ruby22] !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/builder-2.0.0:*[ruby_targets_ruby23] !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.0.0:*[ruby_targets_ruby24] !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/builder-2.0.0:*[ruby_targets_ruby22] !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/builder-2.0.0:*[ruby_targets_ruby23] !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.0.0:*[ruby_targets_ruby24] !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/tilt-2.0.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_=255f7c2500b537580d6d330d035fc8ac
diff --git a/metadata/md5-cache/dev-ruby/tilt-2.0.7 b/metadata/md5-cache/dev-ruby/tilt-2.0.7
index 6d8f2ed3697b..8d0d1dbef71c 100644
--- a/metadata/md5-cache/dev-ruby/tilt-2.0.7
+++ b/metadata/md5-cache/dev-ruby/tilt-2.0.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby21] dev-ruby/coffee-script[ruby_targets_ruby21] dev-ruby/erubis[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/coffee-script[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/coffee-script[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby24] dev-ruby/coffee-script[ruby_targets_ruby24] dev-ruby/erubis[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/coffee-script[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/coffee-script[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby24] dev-ruby/coffee-script[ruby_targets_ruby24] dev-ruby/erubis[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Thin interface over template engines to make their usage as generic as possible
 EAPI=6
 HOMEPAGE=https://github.com/rtomayko/tilt
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/tilt-2.0.7.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_=47cff89983791e838919fa679ad95258
diff --git a/metadata/md5-cache/dev-ruby/tilt-2.0.8 b/metadata/md5-cache/dev-ruby/tilt-2.0.8
index 786a828f7f99..3ab279081a4f 100644
--- a/metadata/md5-cache/dev-ruby/tilt-2.0.8
+++ b/metadata/md5-cache/dev-ruby/tilt-2.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby21] dev-ruby/coffee-script[ruby_targets_ruby21] dev-ruby/erubis[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/coffee-script[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/coffee-script[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby24] dev-ruby/coffee-script[ruby_targets_ruby24] dev-ruby/erubis[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/coffee-script[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/coffee-script[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby24] dev-ruby/coffee-script[ruby_targets_ruby24] dev-ruby/erubis[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Thin interface over template engines to make their usage as generic as possible
 EAPI=6
 HOMEPAGE=https://github.com/rtomayko/tilt
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/tilt-2.0.8.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_=47cff89983791e838919fa679ad95258
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.7.1 b/metadata/md5-cache/dev-ruby/timecop-0.7.1
index 6c3945187dac..87db03255933 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.7.1
+++ b/metadata/md5-cache/dev-ruby/timecop-0.7.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=A gem providing 'time travel' and 'time freezing' capabilities
 EAPI=5
 HOMEPAGE=https://github.com/travisjeffery/timecop
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/timecop-0.7.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_=32f235d280cfd5ae216b3a097720c316
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.8.1 b/metadata/md5-cache/dev-ruby/timecop-0.8.1
index 9872df4f3e86..965d6a03b7b2 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.8.1
+++ b/metadata/md5-cache/dev-ruby/timecop-0.8.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A gem providing 'time travel' and 'time freezing' capabilities
 EAPI=5
 HOMEPAGE=https://github.com/travisjeffery/timecop
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/timecop-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_=a317bf8a20908cdfa1a3a71d97354e2a
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.0 b/metadata/md5-cache/dev-ruby/timecop-0.9.0
index 6b3be1561a64..0c2eb9d8bcca 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.0
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A gem providing 'time travel' and 'time freezing' capabilities
 EAPI=6
 HOMEPAGE=https://github.com/travisjeffery/timecop
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/timecop-0.9.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_=a4a8bb65c06c7373f5fd417f6f505b5a
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.1 b/metadata/md5-cache/dev-ruby/timecop-0.9.1
index 09f9bea729c8..89ce143e1d93 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.1
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A gem providing 'time travel' and 'time freezing' capabilities
 EAPI=6
 HOMEPAGE=https://github.com/travisjeffery/timecop
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/timecop-0.9.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_=a4a8bb65c06c7373f5fd417f6f505b5a
diff --git a/metadata/md5-cache/dev-ruby/timers-4.1.1 b/metadata/md5-cache/dev-ruby/timers-4.1.1
index f21a494b05b5..2d7e5c1ac568 100644
--- a/metadata/md5-cache/dev-ruby/timers-4.1.1
+++ b/metadata/md5-cache/dev-ruby/timers-4.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/hitimes[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hitimes[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hitimes[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: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-ruby/hitimes[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hitimes[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: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=Pure Ruby one-shot and periodic timers
 EAPI=5
 HOMEPAGE=https://github.com/tarcieri/timers
-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 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/hitimes[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hitimes[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hitimes[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/hitimes[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hitimes[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=4
 SRC_URI=mirror://rubygems/timers-4.1.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_=2084882749881e88a7c98ce3081a16a2
diff --git a/metadata/md5-cache/dev-ruby/timers-4.1.2 b/metadata/md5-cache/dev-ruby/timers-4.1.2
index cc51994ca49a..944229d1a24c 100644
--- a/metadata/md5-cache/dev-ruby/timers-4.1.2
+++ b/metadata/md5-cache/dev-ruby/timers-4.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/hitimes[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hitimes[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hitimes[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hitimes[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/hitimes[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hitimes[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hitimes[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Pure Ruby one-shot and periodic timers
 EAPI=5
 HOMEPAGE=https://github.com/tarcieri/timers
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/hitimes[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hitimes[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hitimes[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hitimes[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/hitimes[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hitimes[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hitimes[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=mirror://rubygems/timers-4.1.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_=9084014d65e644ebb983413e0c51ae07
diff --git a/metadata/md5-cache/dev-ruby/tins-1.13.0 b/metadata/md5-cache/dev-ruby/tins-1.13.0
index a14bafddda5e..306cf5c6c797 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.13.0
+++ b/metadata/md5-cache/dev-ruby/tins-1.13.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=All the stuff that isn't good enough for a real library
 EAPI=5
 HOMEPAGE=https://github.com/flori/tins
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.13.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_=3b54f7b365f5e4bd16881cd57323b9e1
diff --git a/metadata/md5-cache/dev-ruby/tins-1.13.2 b/metadata/md5-cache/dev-ruby/tins-1.13.2
index c32bc5a9b6e2..44503e92f19d 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.13.2
+++ b/metadata/md5-cache/dev-ruby/tins-1.13.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=All the stuff that isn't good enough for a real library
 EAPI=5
 HOMEPAGE=https://github.com/flori/tins
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.13.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_=3b54f7b365f5e4bd16881cd57323b9e1
diff --git a/metadata/md5-cache/dev-ruby/tins-1.13.3 b/metadata/md5-cache/dev-ruby/tins-1.13.3
index 50024adff9db..b5901d918517 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.13.3
+++ b/metadata/md5-cache/dev-ruby/tins-1.13.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=All the stuff that isn't good enough for a real library
 EAPI=6
 HOMEPAGE=https://github.com/flori/tins
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.13.3.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_=210396e6e0a4f8c01de5b0d2206453ff
diff --git a/metadata/md5-cache/dev-ruby/tins-1.14.0 b/metadata/md5-cache/dev-ruby/tins-1.14.0
index 389a12fd2bb7..dbdd3c3653cc 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.14.0
+++ b/metadata/md5-cache/dev-ruby/tins-1.14.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=All the stuff that isn't good enough for a real library
 EAPI=6
 HOMEPAGE=https://github.com/flori/tins
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.14.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_=ac29fb860c94e9af7ea853b7bb11eb48
diff --git a/metadata/md5-cache/dev-ruby/tins-1.15.0 b/metadata/md5-cache/dev-ruby/tins-1.15.0
index c1902cf7cba5..b4e77ee64c74 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.15.0
+++ b/metadata/md5-cache/dev-ruby/tins-1.15.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=All the stuff that isn't good enough for a real library
 EAPI=6
 HOMEPAGE=https://github.com/flori/tins
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.15.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_=ac29fb860c94e9af7ea853b7bb11eb48
diff --git a/metadata/md5-cache/dev-ruby/tins-1.6.0 b/metadata/md5-cache/dev-ruby/tins-1.6.0
index 73194ac65aef..0bfa73312b08 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.6.0
+++ b/metadata/md5-cache/dev-ruby/tins-1.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=All the stuff that isn't good enough for a real library
 EAPI=5
 HOMEPAGE=https://github.com/flori/tins
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.6.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_=85196c7069932a218272e906946de9a6
diff --git a/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0 b/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
index bf560f5e4e90..7747674f0ae9 100644
--- a/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
+++ b/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby bindings for Tokyo Cabinet
 EAPI=5
 HOMEPAGE=http://fallabs.com/tokyocabinet/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=dev-db/tokyocabinet 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=dev-db/tokyocabinet ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/tokyocabinet-1.32.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_=d77dd5e23d39653b5adac2061169312a
diff --git a/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0 b/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
index e53cda9bd88a..7c8cb332bcd9 100644
--- a/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
+++ b/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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? ( 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? ( 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? ( 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=A ruby binding to use totori.dip.jp Web API
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/totoridipjp
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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/totoridipjp-0.1.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_=17c8f7a7d30697566c813080665e0832
diff --git a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2 b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
index 64b952f59e2d..271048bfca71 100644
--- a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[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? ( 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/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[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? ( 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=Provides transaction support at the object level
 EAPI=5
 HOMEPAGE=https://github.com/halostatue/transaction-simple
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=MIT
-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/transaction-simple-1.4.0.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_=3bde7641473cec88c87079847d7b2d51
diff --git a/metadata/md5-cache/dev-ruby/travis-1.8.6-r1 b/metadata/md5-cache/dev-ruby/travis-1.8.6-r1
index 39435d4bbea4..5ee0bf999029 100644
--- a/metadata/md5-cache/dev-ruby/travis-1.8.6-r1
+++ b/metadata/md5-cache/dev-ruby/travis-1.8.6-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-vcs/git ) ruby_targets_ruby21? ( test? ( >dev-ruby/rack-test-0.6[ruby_targets_ruby21] ) >dev-ruby/sinatra-1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( test? ( >dev-ruby/rack-test-0.6[ruby_targets_ruby22] ) >dev-ruby/sinatra-1.3[ruby_targets_ruby22] ) test? ( ruby_targets_ruby21? ( dev-ruby/backports[ruby_targets_ruby21] >dev-ruby/faraday-0.9[ruby_targets_ruby21] >=dev-ruby/faraday_middleware-0.9.1[ruby_targets_ruby21] >dev-ruby/gh-0.13[ruby_targets_ruby21] >dev-ruby/highline-1.6[ruby_targets_ruby21] >dev-ruby/launchy-2.1[ruby_targets_ruby21] >dev-ruby/pusher-client-0.4[ruby_targets_ruby21] >=dev-ruby/typhoeus-0.6.8[ruby_targets_ruby21] =dev-ruby/typhoeus-0*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.9[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.1[ruby_targets_ruby22] >dev-ruby/gh-0.13[ruby_targets_ruby22] >dev-ruby/highline-1.6[ruby_targets_ruby22] >dev-ruby/launchy-2.1[ruby_targets_ruby22] >dev-ruby/pusher-client-0.4[ruby_targets_ruby22] >=dev-ruby/typhoeus-0.6.8[ruby_targets_ruby22] =dev-ruby/typhoeus-0*[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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_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? ( dev-vcs/git ) ruby_targets_ruby22? ( test? ( >dev-ruby/rack-test-0.6[ruby_targets_ruby22] ) >dev-ruby/sinatra-1.3[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.9[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.1[ruby_targets_ruby22] >dev-ruby/gh-0.13[ruby_targets_ruby22] >dev-ruby/highline-1.6[ruby_targets_ruby22] >dev-ruby/launchy-2.1[ruby_targets_ruby22] >dev-ruby/pusher-client-0.4[ruby_targets_ruby22] >=dev-ruby/typhoeus-0.6.8[ruby_targets_ruby22] =dev-ruby/typhoeus-0*[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Travis CI Client (CLI and Ruby library)
 EAPI=5
 HOMEPAGE=https://github.com/travis-ci/travis.rb
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-vcs/git ruby_targets_ruby21? ( dev-ruby/backports[ruby_targets_ruby21] >dev-ruby/faraday-0.9[ruby_targets_ruby21] >=dev-ruby/faraday_middleware-0.9.1[ruby_targets_ruby21] >dev-ruby/gh-0.13[ruby_targets_ruby21] >dev-ruby/highline-1.6[ruby_targets_ruby21] >dev-ruby/launchy-2.1[ruby_targets_ruby21] >dev-ruby/pusher-client-0.4[ruby_targets_ruby21] >=dev-ruby/typhoeus-0.6.8[ruby_targets_ruby21] =dev-ruby/typhoeus-0*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.9[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.1[ruby_targets_ruby22] >dev-ruby/gh-0.13[ruby_targets_ruby22] >dev-ruby/highline-1.6[ruby_targets_ruby22] >dev-ruby/launchy-2.1[ruby_targets_ruby22] >dev-ruby/pusher-client-0.4[ruby_targets_ruby22] >=dev-ruby/typhoeus-0.6.8[ruby_targets_ruby22] =dev-ruby/typhoeus-0*[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=dev-vcs/git ruby_targets_ruby22? ( dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.9[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.1[ruby_targets_ruby22] >dev-ruby/gh-0.13[ruby_targets_ruby22] >dev-ruby/highline-1.6[ruby_targets_ruby22] >dev-ruby/launchy-2.1[ruby_targets_ruby22] >dev-ruby/pusher-client-0.4[ruby_targets_ruby22] >=dev-ruby/typhoeus-0.6.8[ruby_targets_ruby22] =dev-ruby/typhoeus-0*[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/travis-1.8.6.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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=444a8281e2334857e5c26806ec7d6e6a
diff --git a/metadata/md5-cache/dev-ruby/travis-1.8.8 b/metadata/md5-cache/dev-ruby/travis-1.8.8
index 32628410b125..f6ef244323ae 100644
--- a/metadata/md5-cache/dev-ruby/travis-1.8.8
+++ b/metadata/md5-cache/dev-ruby/travis-1.8.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-vcs/git ) ruby_targets_ruby21? ( test? ( >dev-ruby/rack-test-0.6[ruby_targets_ruby21] ) >dev-ruby/sinatra-1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( test? ( >dev-ruby/rack-test-0.6[ruby_targets_ruby22] ) >dev-ruby/sinatra-1.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( test? ( >dev-ruby/rack-test-0.6[ruby_targets_ruby23] ) >dev-ruby/sinatra-1.3[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( dev-ruby/backports[ruby_targets_ruby21] >dev-ruby/faraday-0.9[ruby_targets_ruby21] >=dev-ruby/faraday_middleware-0.9.1[ruby_targets_ruby21] >dev-ruby/gh-0.13[ruby_targets_ruby21] >dev-ruby/highline-1.6[ruby_targets_ruby21] >dev-ruby/launchy-2.1[ruby_targets_ruby21] >dev-ruby/pusher-client-0.4[ruby_targets_ruby21] dev-ruby/typhoeus:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.9[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.1[ruby_targets_ruby22] >dev-ruby/gh-0.13[ruby_targets_ruby22] >dev-ruby/highline-1.6[ruby_targets_ruby22] >dev-ruby/launchy-2.1[ruby_targets_ruby22] >dev-ruby/pusher-client-0.4[ruby_targets_ruby22] dev-ruby/typhoeus:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.9[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.1[ruby_targets_ruby23] >dev-ruby/gh-0.13[ruby_targets_ruby23] >dev-ruby/highline-1.6[ruby_targets_ruby23] >dev-ruby/launchy-2.1[ruby_targets_ruby23] >dev-ruby/pusher-client-0.4[ruby_targets_ruby23] dev-ruby/typhoeus:0[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: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? ( dev-vcs/git ) ruby_targets_ruby22? ( test? ( >dev-ruby/rack-test-0.6[ruby_targets_ruby22] ) >dev-ruby/sinatra-1.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( test? ( >dev-ruby/rack-test-0.6[ruby_targets_ruby23] ) >dev-ruby/sinatra-1.3[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.9[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.1[ruby_targets_ruby22] >dev-ruby/gh-0.13[ruby_targets_ruby22] >dev-ruby/highline-1.6[ruby_targets_ruby22] >dev-ruby/launchy-2.1[ruby_targets_ruby22] >dev-ruby/pusher-client-0.4[ruby_targets_ruby22] dev-ruby/typhoeus:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.9[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.1[ruby_targets_ruby23] >dev-ruby/gh-0.13[ruby_targets_ruby23] >dev-ruby/highline-1.6[ruby_targets_ruby23] >dev-ruby/launchy-2.1[ruby_targets_ruby23] >dev-ruby/pusher-client-0.4[ruby_targets_ruby23] dev-ruby/typhoeus:0[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: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=Travis CI Client (CLI and Ruby library)
 EAPI=5
 HOMEPAGE=https://github.com/travis-ci/travis.rb
-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
 LICENSE=MIT
-RDEPEND=dev-vcs/git ruby_targets_ruby21? ( dev-ruby/backports[ruby_targets_ruby21] >dev-ruby/faraday-0.9[ruby_targets_ruby21] >=dev-ruby/faraday_middleware-0.9.1[ruby_targets_ruby21] >dev-ruby/gh-0.13[ruby_targets_ruby21] >dev-ruby/highline-1.6[ruby_targets_ruby21] >dev-ruby/launchy-2.1[ruby_targets_ruby21] >dev-ruby/pusher-client-0.4[ruby_targets_ruby21] dev-ruby/typhoeus:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.9[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.1[ruby_targets_ruby22] >dev-ruby/gh-0.13[ruby_targets_ruby22] >dev-ruby/highline-1.6[ruby_targets_ruby22] >dev-ruby/launchy-2.1[ruby_targets_ruby22] >dev-ruby/pusher-client-0.4[ruby_targets_ruby22] dev-ruby/typhoeus:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.9[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.1[ruby_targets_ruby23] >dev-ruby/gh-0.13[ruby_targets_ruby23] >dev-ruby/highline-1.6[ruby_targets_ruby23] >dev-ruby/launchy-2.1[ruby_targets_ruby23] >dev-ruby/pusher-client-0.4[ruby_targets_ruby23] dev-ruby/typhoeus:0[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=dev-vcs/git ruby_targets_ruby22? ( dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.9[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.1[ruby_targets_ruby22] >dev-ruby/gh-0.13[ruby_targets_ruby22] >dev-ruby/highline-1.6[ruby_targets_ruby22] >dev-ruby/launchy-2.1[ruby_targets_ruby22] >dev-ruby/pusher-client-0.4[ruby_targets_ruby22] dev-ruby/typhoeus:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.9[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.1[ruby_targets_ruby23] >dev-ruby/gh-0.13[ruby_targets_ruby23] >dev-ruby/highline-1.6[ruby_targets_ruby23] >dev-ruby/launchy-2.1[ruby_targets_ruby23] >dev-ruby/pusher-client-0.4[ruby_targets_ruby23] dev-ruby/typhoeus:0[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/travis-1.8.8.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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=5bc207426465b5e50d191dd3810f341e
diff --git a/metadata/md5-cache/dev-ruby/treetop-1.6.5 b/metadata/md5-cache/dev-ruby/treetop-1.6.5
index 214b8ad61dba..1e4af3331acb 100644
--- a/metadata/md5-cache/dev-ruby/treetop-1.6.5
+++ b/metadata/md5-cache/dev-ruby/treetop-1.6.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/rr-1.0[ruby_targets_ruby21] dev-ruby/activesupport[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rr-1.0[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/polyglot-0.3.1:0[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/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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/rr-1.0[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Treetop is a language for describing languages
 EAPI=5
 HOMEPAGE=https://github.com/cjheath/treetop
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/polyglot-0.3.1:0[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/polyglot-0.3.1:0[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/treetop-1.6.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_=11b42635153338f132bdebcba6d14c46
diff --git a/metadata/md5-cache/dev-ruby/treetop-1.6.8 b/metadata/md5-cache/dev-ruby/treetop-1.6.8
index 6d250fd944e8..fef081311a9a 100644
--- a/metadata/md5-cache/dev-ruby/treetop-1.6.8
+++ b/metadata/md5-cache/dev-ruby/treetop-1.6.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/rr-1.0[ruby_targets_ruby21] dev-ruby/activesupport[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rr-1.0[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rr-1.0[ruby_targets_ruby23] dev-ruby/activesupport[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/polyglot-0.3.1:0[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: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/rr-1.0[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rr-1.0[ruby_targets_ruby23] dev-ruby/activesupport[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/polyglot-0.3.1:0[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: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=Treetop is a language for describing languages
 EAPI=5
 HOMEPAGE=https://github.com/cjheath/treetop
-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 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/polyglot-0.3.1:0[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/polyglot-0.3.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/polyglot-0.3.1:0[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/treetop-1.6.8.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_=5e2020c24eefe535849dcca1f7618374
diff --git a/metadata/md5-cache/dev-ruby/trollop-1.16.2-r4 b/metadata/md5-cache/dev-ruby/trollop-1.16.2-r4
index 9796e62133e0..54fc06a935df 100644
--- a/metadata/md5-cache/dev-ruby/trollop-1.16.2-r4
+++ b/metadata/md5-cache/dev-ruby/trollop-1.16.2-r4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Trollop is a commandline option parser for Ruby
 EAPI=5
 HOMEPAGE=http://trollop.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/trollop-1.16.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_=05ef8a9533933dd77e481be70d0aebae
diff --git a/metadata/md5-cache/dev-ruby/trollop-2.1.2 b/metadata/md5-cache/dev-ruby/trollop-2.1.2
index ef2a11f17fb6..12327fd73544 100644
--- a/metadata/md5-cache/dev-ruby/trollop-2.1.2
+++ b/metadata/md5-cache/dev-ruby/trollop-2.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/chronic[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/chronic[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/chronic[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/chronic[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/chronic[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/chronic[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/chronic[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Trollop is a commandline option parser for Ruby
 EAPI=5
 HOMEPAGE=http://manageiq.github.io/trollop/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/trollop-2.1.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_=0105b02b410f66e062f4b8c0299b7d5a
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.2.1 b/metadata/md5-cache/dev-ruby/ttfunk-1.2.1
index 8ee212764c4c..5d5590b81bec 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.2.1
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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=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=A TrueType font parser written in pure ruby
 EAPI=5
 HOMEPAGE=https://github.com/prawnpdf/ttfunk/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 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=1.2
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.2.1.tar.gz -> ttfunk-1.2.1.tar.gz
 _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_=fe76c5d86d568bdb90244083b9faac2d
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.4.0 b/metadata/md5-cache/dev-ruby/ttfunk-1.4.0
index 1f8fd53cf77b..881642b03cdf 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.4.0
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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=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=A TrueType font parser written in pure ruby
 EAPI=5
 HOMEPAGE=https://github.com/prawnpdf/ttfunk/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 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=1.4
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.4.0.tar.gz -> ttfunk-1.4.0.tar.gz
 _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_=fe76c5d86d568bdb90244083b9faac2d
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.5.0 b/metadata/md5-cache/dev-ruby/ttfunk-1.5.0
index 9268f762aec9..b073d698d8e7 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.5.0
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A TrueType font parser written in pure ruby
 EAPI=5
 HOMEPAGE=https://github.com/prawnpdf/ttfunk/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.5
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.5.0.tar.gz -> ttfunk-1.5.0.tar.gz
 _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_=caad10a92c4a4c0be8747ac3bec025e5
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.5.1 b/metadata/md5-cache/dev-ruby/ttfunk-1.5.1
index 150d4f1026e4..fa064f233fba 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.5.1
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.5.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A TrueType font parser written in pure ruby
 EAPI=5
 HOMEPAGE=https://github.com/prawnpdf/ttfunk/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.5
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.5.1.tar.gz -> ttfunk-1.5.1.tar.gz
 _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_=70f8c00542144fa54c8240d2e836b598
diff --git a/metadata/md5-cache/dev-ruby/turbolinks-2.5.3 b/metadata/md5-cache/dev-ruby/turbolinks-2.5.3
index 9b7cd97ce252..16ac1290beb2 100644
--- a/metadata/md5-cache/dev-ruby/turbolinks-2.5.3
+++ b/metadata/md5-cache/dev-ruby/turbolinks-2.5.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/coffee-rails[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/coffee-rails[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/coffee-rails[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? ( 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-ruby/coffee-rails[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/coffee-rails[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? ( 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=Makes following links in your web application faster
 EAPI=5
 HOMEPAGE=https://github.com/rails/turbolinks
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/coffee-rails[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/coffee-rails[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/coffee-rails[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/coffee-rails[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/coffee-rails[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/turbolinks-2.5.3.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_=f0eed0f809b5f4ec4f1591b2202e6f3c
diff --git a/metadata/md5-cache/dev-ruby/twitter-5.17.0-r1 b/metadata/md5-cache/dev-ruby/twitter-5.17.0-r1
index 5e70e3d9c0d6..e02c10114448 100644
--- a/metadata/md5-cache/dev-ruby/twitter-5.17.0-r1
+++ b/metadata/md5-cache/dev-ruby/twitter-5.17.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby21] >=dev-ruby/equalizer-0.0.10[ruby_targets_ruby21] =dev-ruby/faraday-0*[ruby_targets_ruby21] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby21] dev-ruby/http:1.0[ruby_targets_ruby21] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby21] >=dev-ruby/json-1.8:0[ruby_targets_ruby21] >=dev-ruby/memoizable-0.4.0[ruby_targets_ruby21] >=dev-ruby/naught-1.0[ruby_targets_ruby21] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby21] >=dev-ruby/simple_oauth-0.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby22] >=dev-ruby/equalizer-0.0.10[ruby_targets_ruby22] =dev-ruby/faraday-0*[ruby_targets_ruby22] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby22] dev-ruby/http:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] >=dev-ruby/json-1.8:0[ruby_targets_ruby22] >=dev-ruby/memoizable-0.4.0[ruby_targets_ruby22] >=dev-ruby/naught-1.0[ruby_targets_ruby22] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby23] >=dev-ruby/equalizer-0.0.10[ruby_targets_ruby23] =dev-ruby/faraday-0*[ruby_targets_ruby23] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby23] dev-ruby/http:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] >=dev-ruby/json-1.8:0[ruby_targets_ruby23] >=dev-ruby/memoizable-0.4.0[ruby_targets_ruby23] >=dev-ruby/naught-1.0[ruby_targets_ruby23] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby23] >=dev-ruby/simple_oauth-0.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] dev-ruby/webmock:0[ruby_targets_ruby21] >=dev-ruby/timecop-0.6.1[ruby_targets_ruby21] ) doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] >=dev-ruby/timecop-0.6.1[ruby_targets_ruby22] ) doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/webmock:0[ruby_targets_ruby23] >=dev-ruby/timecop-0.6.1[ruby_targets_ruby23] ) doc? ( dev-ruby/yard[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby22] >=dev-ruby/equalizer-0.0.10[ruby_targets_ruby22] =dev-ruby/faraday-0*[ruby_targets_ruby22] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby22] dev-ruby/http:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] >=dev-ruby/json-1.8:0[ruby_targets_ruby22] >=dev-ruby/memoizable-0.4.0[ruby_targets_ruby22] >=dev-ruby/naught-1.0[ruby_targets_ruby22] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby23] >=dev-ruby/equalizer-0.0.10[ruby_targets_ruby23] =dev-ruby/faraday-0*[ruby_targets_ruby23] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby23] dev-ruby/http:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] >=dev-ruby/json-1.8:0[ruby_targets_ruby23] >=dev-ruby/memoizable-0.4.0[ruby_targets_ruby23] >=dev-ruby/naught-1.0[ruby_targets_ruby23] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby23] >=dev-ruby/simple_oauth-0.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] >=dev-ruby/timecop-0.6.1[ruby_targets_ruby22] ) doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/webmock:0[ruby_targets_ruby23] >=dev-ruby/timecop-0.6.1[ruby_targets_ruby23] ) doc? ( dev-ruby/yard[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=Ruby wrapper around the Twitter API
 EAPI=5
 HOMEPAGE=https://sferik.github.com/twitter/
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby21] >=dev-ruby/equalizer-0.0.10[ruby_targets_ruby21] =dev-ruby/faraday-0*[ruby_targets_ruby21] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby21] dev-ruby/http:1.0[ruby_targets_ruby21] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby21] >=dev-ruby/json-1.8:0[ruby_targets_ruby21] >=dev-ruby/memoizable-0.4.0[ruby_targets_ruby21] >=dev-ruby/naught-1.0[ruby_targets_ruby21] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby21] >=dev-ruby/simple_oauth-0.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby22] >=dev-ruby/equalizer-0.0.10[ruby_targets_ruby22] =dev-ruby/faraday-0*[ruby_targets_ruby22] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby22] dev-ruby/http:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] >=dev-ruby/json-1.8:0[ruby_targets_ruby22] >=dev-ruby/memoizable-0.4.0[ruby_targets_ruby22] >=dev-ruby/naught-1.0[ruby_targets_ruby22] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby23] >=dev-ruby/equalizer-0.0.10[ruby_targets_ruby23] =dev-ruby/faraday-0*[ruby_targets_ruby23] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby23] dev-ruby/http:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] >=dev-ruby/json-1.8:0[ruby_targets_ruby23] >=dev-ruby/memoizable-0.4.0[ruby_targets_ruby23] >=dev-ruby/naught-1.0[ruby_targets_ruby23] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby23] >=dev-ruby/simple_oauth-0.3.0[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/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby22] >=dev-ruby/equalizer-0.0.10[ruby_targets_ruby22] =dev-ruby/faraday-0*[ruby_targets_ruby22] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby22] dev-ruby/http:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] >=dev-ruby/json-1.8:0[ruby_targets_ruby22] >=dev-ruby/memoizable-0.4.0[ruby_targets_ruby22] >=dev-ruby/naught-1.0[ruby_targets_ruby22] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby23] >=dev-ruby/equalizer-0.0.10[ruby_targets_ruby23] =dev-ruby/faraday-0*[ruby_targets_ruby23] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby23] dev-ruby/http:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] >=dev-ruby/json-1.8:0[ruby_targets_ruby23] >=dev-ruby/memoizable-0.4.0[ruby_targets_ruby23] >=dev-ruby/naught-1.0[ruby_targets_ruby23] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby23] >=dev-ruby/simple_oauth-0.3.0[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=5
 SRC_URI=https://github.com/sferik/twitter/archive/v5.17.0.tar.gz -> twitter-5.17.0.tar.gz
 _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_=192c366ff7a825f1429d66d01a4bdd2c
diff --git a/metadata/md5-cache/dev-ruby/twitter-6.1.0 b/metadata/md5-cache/dev-ruby/twitter-6.1.0
index 6978b6eeec36..a855f62d9e98 100644
--- a/metadata/md5-cache/dev-ruby/twitter-6.1.0
+++ b/metadata/md5-cache/dev-ruby/twitter-6.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.5[ruby_targets_ruby21] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby21] =dev-ruby/equalizer-0.0.11[ruby_targets_ruby21] =dev-ruby/faraday-0.11*[ruby_targets_ruby21] >=dev-ruby/http-2.1:2.0[ruby_targets_ruby21] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby21] >=dev-ruby/memoizable-0.4.2[ruby_targets_ruby21] >=dev-ruby/naught-1.1[ruby_targets_ruby21] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby21] >=dev-ruby/simple_oauth-0.3.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.5[ruby_targets_ruby22] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby22] =dev-ruby/equalizer-0.0.11[ruby_targets_ruby22] =dev-ruby/faraday-0.11*[ruby_targets_ruby22] >=dev-ruby/http-2.1:2.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] >=dev-ruby/memoizable-0.4.2[ruby_targets_ruby22] >=dev-ruby/naught-1.1[ruby_targets_ruby22] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.3.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.5[ruby_targets_ruby23] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby23] =dev-ruby/equalizer-0.0.11[ruby_targets_ruby23] =dev-ruby/faraday-0.11*[ruby_targets_ruby23] >=dev-ruby/http-2.1:2.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] >=dev-ruby/memoizable-0.4.2[ruby_targets_ruby23] >=dev-ruby/naught-1.1[ruby_targets_ruby23] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby23] >=dev-ruby/simple_oauth-0.3.1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] dev-ruby/webmock:2[ruby_targets_ruby21] >=dev-ruby/timecop-0.6.1[ruby_targets_ruby21] ) doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/webmock:2[ruby_targets_ruby22] >=dev-ruby/timecop-0.6.1[ruby_targets_ruby22] ) doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/webmock:2[ruby_targets_ruby23] >=dev-ruby/timecop-0.6.1[ruby_targets_ruby23] ) doc? ( dev-ruby/yard[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.5[ruby_targets_ruby22] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby22] =dev-ruby/equalizer-0.0.11[ruby_targets_ruby22] =dev-ruby/faraday-0.11*[ruby_targets_ruby22] >=dev-ruby/http-2.1:2.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] >=dev-ruby/memoizable-0.4.2[ruby_targets_ruby22] >=dev-ruby/naught-1.1[ruby_targets_ruby22] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.3.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.5[ruby_targets_ruby23] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby23] =dev-ruby/equalizer-0.0.11[ruby_targets_ruby23] =dev-ruby/faraday-0.11*[ruby_targets_ruby23] >=dev-ruby/http-2.1:2.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] >=dev-ruby/memoizable-0.4.2[ruby_targets_ruby23] >=dev-ruby/naught-1.1[ruby_targets_ruby23] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby23] >=dev-ruby/simple_oauth-0.3.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/webmock:2[ruby_targets_ruby22] >=dev-ruby/timecop-0.6.1[ruby_targets_ruby22] ) doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/webmock:2[ruby_targets_ruby23] >=dev-ruby/timecop-0.6.1[ruby_targets_ruby23] ) doc? ( dev-ruby/yard[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) 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=Ruby wrapper around the Twitter API
 EAPI=5
 HOMEPAGE=https://sferik.github.com/twitter/
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.5[ruby_targets_ruby21] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby21] =dev-ruby/equalizer-0.0.11[ruby_targets_ruby21] =dev-ruby/faraday-0.11*[ruby_targets_ruby21] >=dev-ruby/http-2.1:2.0[ruby_targets_ruby21] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby21] >=dev-ruby/memoizable-0.4.2[ruby_targets_ruby21] >=dev-ruby/naught-1.1[ruby_targets_ruby21] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby21] >=dev-ruby/simple_oauth-0.3.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.5[ruby_targets_ruby22] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby22] =dev-ruby/equalizer-0.0.11[ruby_targets_ruby22] =dev-ruby/faraday-0.11*[ruby_targets_ruby22] >=dev-ruby/http-2.1:2.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] >=dev-ruby/memoizable-0.4.2[ruby_targets_ruby22] >=dev-ruby/naught-1.1[ruby_targets_ruby22] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.3.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.5[ruby_targets_ruby23] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby23] =dev-ruby/equalizer-0.0.11[ruby_targets_ruby23] =dev-ruby/faraday-0.11*[ruby_targets_ruby23] >=dev-ruby/http-2.1:2.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] >=dev-ruby/memoizable-0.4.2[ruby_targets_ruby23] >=dev-ruby/naught-1.1[ruby_targets_ruby23] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby23] >=dev-ruby/simple_oauth-0.3.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/addressable-2.5[ruby_targets_ruby22] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby22] =dev-ruby/equalizer-0.0.11[ruby_targets_ruby22] =dev-ruby/faraday-0.11*[ruby_targets_ruby22] >=dev-ruby/http-2.1:2.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] >=dev-ruby/memoizable-0.4.2[ruby_targets_ruby22] >=dev-ruby/naught-1.1[ruby_targets_ruby22] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby22] >=dev-ruby/simple_oauth-0.3.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.5[ruby_targets_ruby23] >=dev-ruby/buftok-0.2.0[ruby_targets_ruby23] =dev-ruby/equalizer-0.0.11[ruby_targets_ruby23] =dev-ruby/faraday-0.11*[ruby_targets_ruby23] >=dev-ruby/http-2.1:2.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] >=dev-ruby/memoizable-0.4.2[ruby_targets_ruby23] >=dev-ruby/naught-1.1[ruby_targets_ruby23] =dev-ruby/simple_oauth-0.3*[ruby_targets_ruby23] >=dev-ruby/simple_oauth-0.3.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=6
 SRC_URI=https://github.com/sferik/twitter/archive/v6.1.0.tar.gz -> twitter-6.1.0.tar.gz
 _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_=fd1c456e5bf18c65ecbc2935d77d1cd5
diff --git a/metadata/md5-cache/dev-ruby/twitter-text-1.14.2 b/metadata/md5-cache/dev-ruby/twitter-text-1.14.2
index cf600e7d5f30..f78fff831ff7 100644
--- a/metadata/md5-cache/dev-ruby/twitter-text-1.14.2
+++ b/metadata/md5-cache/dev-ruby/twitter-text-1.14.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/unf-0.1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/unf-0.1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/unf-0.1*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.10[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: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-ruby/unf-0.1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/unf-0.1*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.10[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: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=Text handling for Twitter
 EAPI=5
 HOMEPAGE=https://github.com/twitter/twitter-text
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/unf-0.1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/unf-0.1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/unf-0.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/unf-0.1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/unf-0.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/twitter-text-1.14.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_=9fe31a40d5798e3b445e542d412a74ab
diff --git a/metadata/md5-cache/dev-ruby/twitter-text-1.14.5 b/metadata/md5-cache/dev-ruby/twitter-text-1.14.5
index 076220a3f8a5..92b16980885e 100644
--- a/metadata/md5-cache/dev-ruby/twitter-text-1.14.5
+++ b/metadata/md5-cache/dev-ruby/twitter-text-1.14.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/unf-0.1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/unf-0.1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/unf-0.1*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.10[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: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-ruby/unf-0.1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/unf-0.1*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.10[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: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=Text handling for Twitter
 EAPI=5
 HOMEPAGE=https://github.com/twitter/twitter-text
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/unf-0.1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/unf-0.1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/unf-0.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/unf-0.1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/unf-0.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/twitter-text-1.14.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_=4192237f5d6929cf711065ba405b3d9b
diff --git a/metadata/md5-cache/dev-ruby/twitter-text-1.14.6 b/metadata/md5-cache/dev-ruby/twitter-text-1.14.6
index 43acda61a56f..52e84f8863d6 100644
--- a/metadata/md5-cache/dev-ruby/twitter-text-1.14.6
+++ b/metadata/md5-cache/dev-ruby/twitter-text-1.14.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/unf-0.1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/unf-0.1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/unf-0.1*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.10[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: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-ruby/unf-0.1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/unf-0.1*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.10[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: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=Text handling for Twitter
 EAPI=6
 HOMEPAGE=https://github.com/twitter/twitter-text
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/unf-0.1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/unf-0.1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/unf-0.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/unf-0.1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/unf-0.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/twitter-text-1.14.6.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_=2283512db4e106e677b71a0408cc9fe1
diff --git a/metadata/md5-cache/dev-ruby/twitter-text-1.14.7 b/metadata/md5-cache/dev-ruby/twitter-text-1.14.7
index fbeae601e226..5651a7f85aea 100644
--- a/metadata/md5-cache/dev-ruby/twitter-text-1.14.7
+++ b/metadata/md5-cache/dev-ruby/twitter-text-1.14.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/unf-0.1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/unf-0.1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/unf-0.1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/unf-0.1*[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/unf-0.1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/unf-0.1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/unf-0.1*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Text handling for Twitter
 EAPI=6
 HOMEPAGE=https://github.com/twitter/twitter-text
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( =dev-ruby/unf-0.1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/unf-0.1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/unf-0.1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/unf-0.1*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( =dev-ruby/unf-0.1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/unf-0.1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/unf-0.1*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/twitter-text-1.14.7.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_=b26a61d52f61b57321f3a3a946467154
diff --git a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1 b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
index 0556f6301b91..730f50e423ee 100644
--- a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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: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=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: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=Gem provides enforced-type functionality to Arrays
 EAPI=5
 HOMEPAGE=https://github.com/yaauie/typed-array
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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/typed-array-0.1.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_=656eb75bdaf11031ba71fb5a0ce53385
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-0.6.9 b/metadata/md5-cache/dev-ruby/typhoeus-0.6.9
index 5b3d85193e98..becfc5060cb0 100644
--- a/metadata/md5-cache/dev-ruby/typhoeus-0.6.9
+++ b/metadata/md5-cache/dev-ruby/typhoeus-0.6.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/ethon-0.7.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ethon-0.7.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ethon-0.7.1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] >=dev-ruby/faraday-0.9[ruby_targets_ruby21] >=dev-ruby/sinatra-1.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] >=dev-ruby/faraday-0.9[ruby_targets_ruby22] >=dev-ruby/sinatra-1.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] >=dev-ruby/faraday-0.9[ruby_targets_ruby23] >=dev-ruby/sinatra-1.3[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-ruby/ethon-0.7.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ethon-0.7.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] >=dev-ruby/faraday-0.9[ruby_targets_ruby22] >=dev-ruby/sinatra-1.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] >=dev-ruby/faraday-0.9[ruby_targets_ruby23] >=dev-ruby/sinatra-1.3[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=Runs HTTP requests in parallel while cleanly encapsulating handling logic
 EAPI=5
 HOMEPAGE=http://rubygems.org/gems/typhoeus/
-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-ruby/ethon-0.7.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ethon-0.7.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ethon-0.7.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/ethon-0.7.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ethon-0.7.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/typhoeus-0.6.9.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_=221746b76cfc25ec3ff617db9cb2a1d3
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-1.1.2 b/metadata/md5-cache/dev-ruby/typhoeus-1.1.2
index 173b25537182..7ff936769780 100644
--- a/metadata/md5-cache/dev-ruby/typhoeus-1.1.2
+++ b/metadata/md5-cache/dev-ruby/typhoeus-1.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] >=dev-ruby/faraday-0.9[ruby_targets_ruby21] >=dev-ruby/sinatra-1.3[ruby_targets_ruby21] >=dev-ruby/redis-3.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] >=dev-ruby/faraday-0.9[ruby_targets_ruby22] >=dev-ruby/sinatra-1.3[ruby_targets_ruby22] >=dev-ruby/redis-3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] >=dev-ruby/faraday-0.9[ruby_targets_ruby23] >=dev-ruby/sinatra-1.3[ruby_targets_ruby23] >=dev-ruby/redis-3.0[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] >=dev-ruby/faraday-0.9[ruby_targets_ruby22] >=dev-ruby/sinatra-1.3[ruby_targets_ruby22] >=dev-ruby/redis-3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] >=dev-ruby/faraday-0.9[ruby_targets_ruby23] >=dev-ruby/sinatra-1.3[ruby_targets_ruby23] >=dev-ruby/redis-3.0[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: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=Runs HTTP requests in parallel while cleanly encapsulating handling logic
 EAPI=5
 HOMEPAGE=https://github.com/typhoeus/typhoeus
-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-ruby/ethon-0.9.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ethon-0.9.0[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/ethon-0.9.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ethon-0.9.0[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=1
 SRC_URI=mirror://rubygems/typhoeus-1.1.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_=030afe772f997c09a3a2410e4d9fbfa0
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-0.3.52 b/metadata/md5-cache/dev-ruby/tzinfo-0.3.52
index c60b71511bce..6bb48ff869f5 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-0.3.52
+++ b/metadata/md5-cache/dev-ruby/tzinfo-0.3.52
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Daylight-savings aware timezone library
 EAPI=5
 HOMEPAGE=http://tzinfo.github.io/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha amd64 ~arm ~hppa ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tzinfo-0.3.52.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_=fdc0b3f438e7d92fc8f8c4adbd6a4bc9
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.2 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.2
index 0433a579e357..1b04f3ca6fb0 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.2
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-libs/timezone-data ) test? ( ruby_targets_ruby21? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[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/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=test? ( sys-libs/timezone-data ) test? ( ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[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/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=Daylight-savings aware timezone library
 EAPI=5
 HOMEPAGE=http://tzinfo.github.io/
-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=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=sys-libs/timezone-data ruby_targets_ruby21? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[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=sys-libs/timezone-data ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[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=1
 SRC_URI=mirror://rubygems/tzinfo-1.2.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_=c5fea2d7b1551255c36b81d2be8f215e
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.3 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.3
index 089b9411c133..c9ab8e5c5295 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.3
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-libs/timezone-data ) test? ( ruby_targets_ruby21? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( sys-libs/timezone-data ) test? ( ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Daylight-savings aware timezone library
 EAPI=5
 HOMEPAGE=https://tzinfo.github.io/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=sys-libs/timezone-data ruby_targets_ruby21? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=sys-libs/timezone-data ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/tzinfo-1.2.3.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_=a1d931a2cef6cedc87a1dfed210f8a77
diff --git a/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2 b/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2
index 93e48a5b1f10..b95990df0d93 100644
--- a/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2
+++ b/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=A module to convert ISO/IEC 10646 (Unicode) string and Japanese strings
 EAPI=5
 HOMEPAGE=http://www.yoshidam.net/Ruby.html#uconv
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=~amd64 ppc ppc64 x86
 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_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=http://www.yoshidam.net/uconv-0.6.1.tar.gz
 _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-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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=48a114f0a16b7307e491f749e0bad656
diff --git a/metadata/md5-cache/dev-ruby/uglifier-2.7.2 b/metadata/md5-cache/dev-ruby/uglifier-2.7.2
index 63bf1579c169..c82f49b845e3 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-2.7.2
+++ b/metadata/md5-cache/dev-ruby/uglifier-2.7.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby21] >=dev-ruby/json-1.8.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] >=dev-ruby/json-1.8.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] >=dev-ruby/json-1.8.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24] >=dev-ruby/json-1.8.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/source_map[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/source_map[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/source_map[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/source_map[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] >=dev-ruby/json-1.8.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] >=dev-ruby/json-1.8.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24] >=dev-ruby/json-1.8.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/source_map[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/source_map[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/source_map[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby wrapper for UglifyJS JavaScript compressor
 EAPI=5
 HOMEPAGE=https://github.com/lautis/uglifier
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby21] >=dev-ruby/json-1.8.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] >=dev-ruby/json-1.8.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] >=dev-ruby/json-1.8.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24] >=dev-ruby/json-1.8.0:*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] >=dev-ruby/json-1.8.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] >=dev-ruby/json-1.8.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24] >=dev-ruby/json-1.8.0:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/uglifier-2.7.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_=514e0dfc7f0695895fc00d9e3500a0d2
diff --git a/metadata/md5-cache/dev-ruby/uglifier-3.0.4 b/metadata/md5-cache/dev-ruby/uglifier-3.0.4
index 0958dceea750..b43bf51f992a 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-3.0.4
+++ b/metadata/md5-cache/dev-ruby/uglifier-3.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sourcemap[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sourcemap[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=Ruby wrapper for UglifyJS JavaScript compressor
 EAPI=5
 HOMEPAGE=https://github.com/lautis/uglifier
-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 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[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/execjs-0.3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[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=3
 SRC_URI=https://github.com/lautis/uglifier/archive/v3.0.4.tar.gz -> uglifier-3.0.4.tar.gz
 _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_=354cd6c5218387ced6b9b8e4143a3cc5
diff --git a/metadata/md5-cache/dev-ruby/uglifier-3.2.0 b/metadata/md5-cache/dev-ruby/uglifier-3.2.0
index 82fc1b889d46..6b3f1a417e66 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-3.2.0
+++ b/metadata/md5-cache/dev-ruby/uglifier-3.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby wrapper for UglifyJS JavaScript compressor
 EAPI=5
 HOMEPAGE=https://github.com/lautis/uglifier
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/lautis/uglifier/archive/v3.2.0.tar.gz -> uglifier-3.2.0.tar.gz
 _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_=8bb995ec3da2d626ac86ffe8deeaeb99
diff --git a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1 b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
index 6b58c8f260be..0848eaf309a3 100644
--- a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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_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? ( ruby_targets_ruby22? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A syntax highlighting engine based on Textpow
 EAPI=5
 HOMEPAGE=https://github.com/grosser/ultraviolet
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/textpow-1.3.0[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/textpow-1.3.0[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/ultraviolet-1.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_=a0e402cc6c7957d511f5e1a4122f8baf
diff --git a/metadata/md5-cache/dev-ruby/unf-0.1.4 b/metadata/md5-cache/dev-ruby/unf-0.1.4
index 21ba0d7f1857..aecad596e4a2 100644
--- a/metadata/md5-cache/dev-ruby/unf-0.1.4
+++ b/metadata/md5-cache/dev-ruby/unf-0.1.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/unf_ext[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/unf_ext[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/unf_ext[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/unf_ext[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] dev-ruby/shoulda[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] dev-ruby/shoulda[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] dev-ruby/shoulda[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] dev-ruby/shoulda[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/unf_ext[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/unf_ext[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/unf_ext[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] dev-ruby/shoulda[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] dev-ruby/shoulda[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] dev-ruby/shoulda[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A wrapper library to bring Unicode Normalization Form support to Ruby/JRuby
 EAPI=5
 HOMEPAGE=https://github.com/knu/ruby-unf
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/unf_ext[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/unf_ext[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/unf_ext[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/unf_ext[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/unf_ext[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/unf_ext[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/unf_ext[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf-0.1.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_=a8e2da7e7d4c880714e7dd1c928b126a
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.1 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.1
index 50ce65635a08..c4de30114cfa 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.1
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] dev-ruby/shoulda[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] dev-ruby/shoulda[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[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/test-unit-2.5.1-r1[ruby_targets_ruby22] dev-ruby/shoulda[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Unicode Normalization Form support library for CRuby
 EAPI=5
 HOMEPAGE=http://sourceforge.jp/projects/unf/
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 doc test
 KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf_ext-0.0.7.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_=4c3ea3430868482dd981381715d56b58
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.2 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.2
index ee8103b6d9a4..c00276f5c7fe 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.2
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Unicode Normalization Form support library for CRuby
 EAPI=5
 HOMEPAGE=http://sourceforge.jp/projects/unf/
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf_ext-0.0.7.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_=42f94146bfc0a342b82ea0eaae784c73
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.3 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.3
index 14953a36b9bc..6de75f8113aa 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.3
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Unicode Normalization Form support library for CRuby
 EAPI=5
 HOMEPAGE=https://github.com/knu/ruby-unf_ext
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf_ext-0.0.7.3.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_=e8f9097c2af2e59c8598e786ae344ec4
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.4 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.4
index 0655c971031c..d30445d348b6 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.4
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Unicode Normalization Form support library for CRuby
 EAPI=6
 HOMEPAGE=https://github.com/knu/ruby-unf_ext
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf_ext-0.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_=1be006d557d6b9a120e5d348d679473b
diff --git a/metadata/md5-cache/dev-ruby/unindent-1.0 b/metadata/md5-cache/dev-ruby/unindent-1.0
index 624b11aaf16a..aa1cbdb72299 100644
--- a/metadata/md5-cache/dev-ruby/unindent-1.0
+++ b/metadata/md5-cache/dev-ruby/unindent-1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/nanotest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/nanotest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nanotest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/nanotest[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/nanotest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nanotest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/nanotest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby method to unindent strings
 EAPI=5
 HOMEPAGE=https://github.com/mynyml/unindent
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 arm ~arm64 ppc ppc64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/unindent-1.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_=0736f2f08e2088d0b01690dc84ba95e0
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1 b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1
index 592effe94284..86aa2027758b 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=Simple library to generate UUIDs
 EAPI=5
 HOMEPAGE=https://github.com/sporkmonger/uuidtools
-IUSE=doc elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=amd64 x86 ~x86-macos
 LICENSE=MIT
-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/uuidtools-2.1.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_=12476790942cedd4126cbd1d3b3ec743
diff --git a/metadata/md5-cache/dev-ruby/vcard-0.2.13 b/metadata/md5-cache/dev-ruby/vcard-0.2.13
index 4400e0f38ec4..d19a086ea0fc 100644
--- a/metadata/md5-cache/dev-ruby/vcard-0.2.13
+++ b/metadata/md5-cache/dev-ruby/vcard-0.2.13
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit: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] ) 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/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit: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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Ruby vcard support extracted from Vpim
 EAPI=5
 HOMEPAGE=https://github.com/qoobaa/vcard
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64
 LICENSE=GPL-3
-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/vcard-0.2.13.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_=c2d25c22109c27f09eedf4cf7e641dd5
diff --git a/metadata/md5-cache/dev-ruby/vcard-0.2.14 b/metadata/md5-cache/dev-ruby/vcard-0.2.14
index e03f5064d031..af08aa3ecd15 100644
--- a/metadata/md5-cache/dev-ruby/vcard-0.2.14
+++ b/metadata/md5-cache/dev-ruby/vcard-0.2.14
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit: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] ) 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/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit: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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Ruby vcard support extracted from Vpim
 EAPI=5
 HOMEPAGE=https://github.com/qoobaa/vcard
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64
 LICENSE=GPL-3
-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/vcard-0.2.14.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_=c2d25c22109c27f09eedf4cf7e641dd5
diff --git a/metadata/md5-cache/dev-ruby/vcard-0.2.15 b/metadata/md5-cache/dev-ruby/vcard-0.2.15
index 630433170bb3..5c64da442f6a 100644
--- a/metadata/md5-cache/dev-ruby/vcard-0.2.15
+++ b/metadata/md5-cache/dev-ruby/vcard-0.2.15
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit: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] ) 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/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit: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] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Ruby vcard support extracted from Vpim
 EAPI=5
 HOMEPAGE=https://github.com/qoobaa/vcard
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64
 LICENSE=GPL-3
-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/vcard-0.2.15.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_=c2d25c22109c27f09eedf4cf7e641dd5
diff --git a/metadata/md5-cache/dev-ruby/vcr-1.11.3 b/metadata/md5-cache/dev-ruby/vcr-1.11.3
index 39fab9ac46c3..b3cc96bff36d 100644
--- a/metadata/md5-cache/dev-ruby/vcr-1.11.3
+++ b/metadata/md5-cache/dev-ruby/vcr-1.11.3
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Records your test suite's HTTP interactions and replay them during test runs
 EAPI=5
 HOMEPAGE=https://github.com/myronmarston/vcr/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://rubygems/vcr-1.11.3.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_=23be80526b24a5c251ded123d5b18652
diff --git a/metadata/md5-cache/dev-ruby/vcr-2.9.3 b/metadata/md5-cache/dev-ruby/vcr-2.9.3
index 5813660c519a..fb4fb22c5247 100644
--- a/metadata/md5-cache/dev-ruby/vcr-2.9.3
+++ b/metadata/md5-cache/dev-ruby/vcr-2.9.3
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Records your test suite's HTTP interactions and replay them during test runs
 EAPI=5
 HOMEPAGE=https://github.com/myronmarston/vcr/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://rubygems/vcr-2.9.3.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_=ffbe8706bbf02063c00e9ed9b747f9e2
diff --git a/metadata/md5-cache/dev-ruby/vcr-3.0.3 b/metadata/md5-cache/dev-ruby/vcr-3.0.3
index 5eac78d221a4..e828b96e71e9 100644
--- a/metadata/md5-cache/dev-ruby/vcr-3.0.3
+++ b/metadata/md5-cache/dev-ruby/vcr-3.0.3
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Records your test suite's HTTP interactions and replay them during test runs
 EAPI=5
 HOMEPAGE=https://github.com/vcr/vcr/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=3
 SRC_URI=https://github.com/vcr/vcr/archive/v3.0.3.tar.gz -> vcr-3.0.3.tar.gz
 _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_=7424c601e46a055511b66f6ae48b1842
diff --git a/metadata/md5-cache/dev-ruby/virtus-1.0.5 b/metadata/md5-cache/dev-ruby/virtus-1.0.5
index 3c216599d936..33170e2bf32c 100644
--- a/metadata/md5-cache/dev-ruby/virtus-1.0.5
+++ b/metadata/md5-cache/dev-ruby/virtus-1.0.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby21] <dev-ruby/axiom-types-1[ruby_targets_ruby21] >=dev-ruby/coercible-1.0[ruby_targets_ruby21] <dev-ruby/coercible-2[ruby_targets_ruby21] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby21] <dev-ruby/descendants_tracker-1[ruby_targets_ruby21] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby21] <dev-ruby/equalizer-1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby22] <dev-ruby/axiom-types-1[ruby_targets_ruby22] >=dev-ruby/coercible-1.0[ruby_targets_ruby22] <dev-ruby/coercible-2[ruby_targets_ruby22] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby22] <dev-ruby/descendants_tracker-1[ruby_targets_ruby22] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby22] <dev-ruby/equalizer-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby23] <dev-ruby/axiom-types-1[ruby_targets_ruby23] >=dev-ruby/coercible-1.0[ruby_targets_ruby23] <dev-ruby/coercible-2[ruby_targets_ruby23] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby23] <dev-ruby/descendants_tracker-1[ruby_targets_ruby23] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby23] <dev-ruby/equalizer-1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/inflecto[ruby_targets_ruby21] dev-ruby/bogus[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/inflecto[ruby_targets_ruby22] dev-ruby/bogus[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/inflecto[ruby_targets_ruby23] dev-ruby/bogus[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/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby22] <dev-ruby/axiom-types-1[ruby_targets_ruby22] >=dev-ruby/coercible-1.0[ruby_targets_ruby22] <dev-ruby/coercible-2[ruby_targets_ruby22] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby22] <dev-ruby/descendants_tracker-1[ruby_targets_ruby22] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby22] <dev-ruby/equalizer-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby23] <dev-ruby/axiom-types-1[ruby_targets_ruby23] >=dev-ruby/coercible-1.0[ruby_targets_ruby23] <dev-ruby/coercible-2[ruby_targets_ruby23] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby23] <dev-ruby/descendants_tracker-1[ruby_targets_ruby23] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby23] <dev-ruby/equalizer-1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/inflecto[ruby_targets_ruby22] dev-ruby/bogus[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/inflecto[ruby_targets_ruby23] dev-ruby/bogus[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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=Attributes on Steroids for Plain Old Ruby Objects
 EAPI=6
 HOMEPAGE=https://github.com/solnic/virtus https://rubygems.org/gems/virtus
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby21] <dev-ruby/axiom-types-1[ruby_targets_ruby21] >=dev-ruby/coercible-1.0[ruby_targets_ruby21] <dev-ruby/coercible-2[ruby_targets_ruby21] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby21] <dev-ruby/descendants_tracker-1[ruby_targets_ruby21] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby21] <dev-ruby/equalizer-1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby22] <dev-ruby/axiom-types-1[ruby_targets_ruby22] >=dev-ruby/coercible-1.0[ruby_targets_ruby22] <dev-ruby/coercible-2[ruby_targets_ruby22] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby22] <dev-ruby/descendants_tracker-1[ruby_targets_ruby22] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby22] <dev-ruby/equalizer-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby23] <dev-ruby/axiom-types-1[ruby_targets_ruby23] >=dev-ruby/coercible-1.0[ruby_targets_ruby23] <dev-ruby/coercible-2[ruby_targets_ruby23] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby23] <dev-ruby/descendants_tracker-1[ruby_targets_ruby23] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby23] <dev-ruby/equalizer-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/axiom-types-0.1[ruby_targets_ruby22] <dev-ruby/axiom-types-1[ruby_targets_ruby22] >=dev-ruby/coercible-1.0[ruby_targets_ruby22] <dev-ruby/coercible-2[ruby_targets_ruby22] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby22] <dev-ruby/descendants_tracker-1[ruby_targets_ruby22] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby22] <dev-ruby/equalizer-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby23] <dev-ruby/axiom-types-1[ruby_targets_ruby23] >=dev-ruby/coercible-1.0[ruby_targets_ruby23] <dev-ruby/coercible-2[ruby_targets_ruby23] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby23] <dev-ruby/descendants_tracker-1[ruby_targets_ruby23] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby23] <dev-ruby/equalizer-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/virtus-1.0.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_=03d1ba02eb65729b4469a2ec6f386cdf
diff --git a/metadata/md5-cache/dev-ruby/vlad-2.7.0 b/metadata/md5-cache/dev-ruby/vlad-2.7.0
index 9da7fc3fd7b3..0d667d006166 100644
--- a/metadata/md5-cache/dev-ruby/vlad-2.7.0
+++ b/metadata/md5-cache/dev-ruby/vlad-2.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby21] test? ( >=dev-ruby/minitest-5.7[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-5.7[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby23] test? ( >=dev-ruby/minitest-5.7[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/rake-remote_task-2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rake-remote_task-2.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rake-remote_task-2.3[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-5.7[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby23] test? ( >=dev-ruby/minitest-5.7[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/rake-remote_task-2.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rake-remote_task-2.3[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Pragmatic application deployment automation, without mercy
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/vlad
-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 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rake-remote_task-2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rake-remote_task-2.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rake-remote_task-2.3[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/rake-remote_task-2.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rake-remote_task-2.3[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/vlad-2.7.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_=d7688d11c751c5f2417789c8b5ab70c3
diff --git a/metadata/md5-cache/dev-ruby/warden-1.2.6 b/metadata/md5-cache/dev-ruby/warden-1.2.6
index c5db87406ac9..670cccbad2a8 100644
--- a/metadata/md5-cache/dev-ruby/warden-1.2.6
+++ b/metadata/md5-cache/dev-ruby/warden-1.2.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[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=test? ( ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[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=General Rack Authentication Framework
 EAPI=5
 HOMEPAGE=https://github.com/hassox/warden
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[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/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[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/warden-1.2.6.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_=6ade31b296551210ebe8b82665060424
diff --git a/metadata/md5-cache/dev-ruby/warden-1.2.7 b/metadata/md5-cache/dev-ruby/warden-1.2.7
index e0139538a209..24672b3f8da3 100644
--- a/metadata/md5-cache/dev-ruby/warden-1.2.7
+++ b/metadata/md5-cache/dev-ruby/warden-1.2.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[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=test? ( ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[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=General Rack Authentication Framework
 EAPI=5
 HOMEPAGE=https://github.com/hassox/warden
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[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/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[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/warden-1.2.7.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_=b2bae6019f5db41b38e009fba1346813
diff --git a/metadata/md5-cache/dev-ruby/web-console-2.3.0 b/metadata/md5-cache/dev-ruby/web-console-2.3.0
index faee011565e2..3a11ac950d4e 100644
--- a/metadata/md5-cache/dev-ruby/web-console-2.3.0
+++ b/metadata/md5-cache/dev-ruby/web-console-2.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activemodel-4.0:*[ruby_targets_ruby21] >=dev-ruby/binding_of_caller-0.7.2[ruby_targets_ruby21] >=dev-ruby/railties-4.0:*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activemodel-4.0:*[ruby_targets_ruby22] >=dev-ruby/binding_of_caller-0.7.2[ruby_targets_ruby22] >=dev-ruby/railties-4.0:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-4.0:*[ruby_targets_ruby23] >=dev-ruby/binding_of_caller-0.7.2[ruby_targets_ruby23] >=dev-ruby/railties-4.0:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] >=dev-ruby/rails-4.0[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] dev-ruby/simplecov[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/rails-4.0[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/simplecov[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/rails-4.0[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/simplecov[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/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=test? ( ruby_targets_ruby22? ( >=dev-ruby/activemodel-4.0:*[ruby_targets_ruby22] >=dev-ruby/binding_of_caller-0.7.2[ruby_targets_ruby22] >=dev-ruby/railties-4.0:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-4.0:*[ruby_targets_ruby23] >=dev-ruby/binding_of_caller-0.7.2[ruby_targets_ruby23] >=dev-ruby/railties-4.0:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/rails-4.0[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/simplecov[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/rails-4.0[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/simplecov[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/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=A debugging tool for your Ruby on Rails applications
 EAPI=5
 HOMEPAGE=https://github.com/rails/web-console
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activemodel-4.0:*[ruby_targets_ruby21] >=dev-ruby/binding_of_caller-0.7.2[ruby_targets_ruby21] >=dev-ruby/railties-4.0:*[ruby_targets_ruby21] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby21] <dev-ruby/sprockets-rails-4.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activemodel-4.0:*[ruby_targets_ruby22] >=dev-ruby/binding_of_caller-0.7.2[ruby_targets_ruby22] >=dev-ruby/railties-4.0:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-4.0:*[ruby_targets_ruby23] >=dev-ruby/binding_of_caller-0.7.2[ruby_targets_ruby23] >=dev-ruby/railties-4.0:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4.0:*[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/activemodel-4.0:*[ruby_targets_ruby22] >=dev-ruby/binding_of_caller-0.7.2[ruby_targets_ruby22] >=dev-ruby/railties-4.0:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] <dev-ruby/sprockets-rails-4.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activemodel-4.0:*[ruby_targets_ruby23] >=dev-ruby/binding_of_caller-0.7.2[ruby_targets_ruby23] >=dev-ruby/railties-4.0:*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] <dev-ruby/sprockets-rails-4.0:*[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=https://github.com/rails/web-console/archive/v2.3.0.tar.gz -> web-console-2.3.0.tar.gz
 _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_=fdd4277df2273b6e0389b494aa3dc6d1
diff --git a/metadata/md5-cache/dev-ruby/web-console-3.3.1 b/metadata/md5-cache/dev-ruby/web-console-3.3.1
index 3573169a32df..fd77f207743b 100644
--- a/metadata/md5-cache/dev-ruby/web-console-3.3.1
+++ b/metadata/md5-cache/dev-ruby/web-console-3.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rails/web-console/archive/v3.3.1.tar.gz -> web-console-3.3.1.tar.gz
 _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_=e0db78a9da67b7b646fe204459056308
diff --git a/metadata/md5-cache/dev-ruby/web-console-3.4.0 b/metadata/md5-cache/dev-ruby/web-console-3.4.0
index 7c16c82a5915..c171e4fb5506 100644
--- a/metadata/md5-cache/dev-ruby/web-console-3.4.0
+++ b/metadata/md5-cache/dev-ruby/web-console-3.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rails/web-console/archive/v3.4.0.tar.gz -> web-console-3.4.0.tar.gz
 _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_=e0db78a9da67b7b646fe204459056308
diff --git a/metadata/md5-cache/dev-ruby/web-console-3.5.1 b/metadata/md5-cache/dev-ruby/web-console-3.5.1
index 26c7c869be76..17ebedf04858 100644
--- a/metadata/md5-cache/dev-ruby/web-console-3.5.1
+++ b/metadata/md5-cache/dev-ruby/web-console-3.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rails/web-console/archive/v3.5.1.tar.gz -> web-console-3.5.1.tar.gz
 _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_=d0e4a02f2d3771f9d99cab185b3c46da
diff --git a/metadata/md5-cache/dev-ruby/webmock-1.20.3 b/metadata/md5-cache/dev-ruby/webmock-1.20.3
index 46cccd2902f5..42dbb1054f83 100644
--- a/metadata/md5-cache/dev-ruby/webmock-1.20.3
+++ b/metadata/md5-cache/dev-ruby/webmock-1.20.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21] >=dev-ruby/crack-0.3.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/httpclient-2.2.4[ruby_targets_ruby21] >=dev-ruby/patron-0.4.18[ruby_targets_ruby21] >=dev-ruby/http-0.6.0:0.6[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/httpclient-2.2.4[ruby_targets_ruby22] >=dev-ruby/patron-0.4.18[ruby_targets_ruby22] >=dev-ruby/http-0.6.0:0.6[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/httpclient-2.2.4[ruby_targets_ruby22] >=dev-ruby/patron-0.4.18[ruby_targets_ruby22] >=dev-ruby/http-0.6.0:0.6[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=Allows stubbing HTTP requests and setting expectations on HTTP requests
 EAPI=5
 HOMEPAGE=https://github.com/bblimke/webmock
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21] >=dev-ruby/crack-0.3.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.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/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.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/webmock-1.20.3.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_=8567136c7b30ff2a280a1854216e988d
diff --git a/metadata/md5-cache/dev-ruby/webmock-1.24.6 b/metadata/md5-cache/dev-ruby/webmock-1.24.6
index aaf050e1db3a..2680edbf29b9 100644
--- a/metadata/md5-cache/dev-ruby/webmock-1.24.6
+++ b/metadata/md5-cache/dev-ruby/webmock-1.24.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21] >=dev-ruby/crack-0.3.2[ruby_targets_ruby21] dev-ruby/hashdiff[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/rspec:3[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] >=dev-ruby/httpclient-2.2.4[ruby_targets_ruby21] >=dev-ruby/patron-0.4.18[ruby_targets_ruby21] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/httpclient-2.2.4[ruby_targets_ruby22] >=dev-ruby/patron-0.4.18[ruby_targets_ruby22] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/httpclient-2.2.4[ruby_targets_ruby23] >=dev-ruby/patron-0.4.18[ruby_targets_ruby23] >=dev-ruby/http-0.8.0:0.8[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/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=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/httpclient-2.2.4[ruby_targets_ruby22] >=dev-ruby/patron-0.4.18[ruby_targets_ruby22] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/httpclient-2.2.4[ruby_targets_ruby23] >=dev-ruby/patron-0.4.18[ruby_targets_ruby23] >=dev-ruby/http-0.8.0:0.8[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/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=Allows stubbing HTTP requests and setting expectations on HTTP requests
 EAPI=5
 HOMEPAGE=https://github.com/bblimke/webmock
-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 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21] >=dev-ruby/crack-0.3.2[ruby_targets_ruby21] dev-ruby/hashdiff[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[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/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[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/webmock-1.24.6.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_=ab5f5217faa6d6665653c6b423c03920
diff --git a/metadata/md5-cache/dev-ruby/webmock-2.1.0 b/metadata/md5-cache/dev-ruby/webmock-2.1.0
index 4489c00380ae..358aa0278db1 100644
--- a/metadata/md5-cache/dev-ruby/webmock-2.1.0
+++ b/metadata/md5-cache/dev-ruby/webmock-2.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21] >=dev-ruby/crack-0.3.2[ruby_targets_ruby21] dev-ruby/hashdiff[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/rspec:3[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby21] >=dev-ruby/patron-0.4.18[ruby_targets_ruby21] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby22] >=dev-ruby/patron-0.4.18[ruby_targets_ruby22] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby23] >=dev-ruby/patron-0.4.18[ruby_targets_ruby23] >=dev-ruby/http-0.8.0:0.8[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/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=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby22] >=dev-ruby/patron-0.4.18[ruby_targets_ruby22] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby23] >=dev-ruby/patron-0.4.18[ruby_targets_ruby23] >=dev-ruby/http-0.8.0:0.8[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/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=Allows stubbing HTTP requests and setting expectations on HTTP requests
 EAPI=5
 HOMEPAGE=https://github.com/bblimke/webmock
-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 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21] >=dev-ruby/crack-0.3.2[ruby_targets_ruby21] dev-ruby/hashdiff[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[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/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[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=2
 SRC_URI=mirror://rubygems/webmock-2.1.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_=72381a88341752819fd0b6b9886928d9
diff --git a/metadata/md5-cache/dev-ruby/webmock-2.3.1 b/metadata/md5-cache/dev-ruby/webmock-2.3.1
index 263075ffaecf..1be1416f0f29 100644
--- a/metadata/md5-cache/dev-ruby/webmock-2.3.1
+++ b/metadata/md5-cache/dev-ruby/webmock-2.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21] >=dev-ruby/crack-0.3.2[ruby_targets_ruby21] dev-ruby/hashdiff[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/rspec:3[ruby_targets_ruby21] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby21] >=dev-ruby/patron-0.4.18[ruby_targets_ruby21] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby22] >=dev-ruby/patron-0.4.18[ruby_targets_ruby22] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby23] >=dev-ruby/patron-0.4.18[ruby_targets_ruby23] >=dev-ruby/http-0.8.0:0.8[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/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=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby22] >=dev-ruby/patron-0.4.18[ruby_targets_ruby22] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby23] >=dev-ruby/patron-0.4.18[ruby_targets_ruby23] >=dev-ruby/http-0.8.0:0.8[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/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=Allows stubbing HTTP requests and setting expectations on HTTP requests
 EAPI=5
 HOMEPAGE=https://github.com/bblimke/webmock
-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 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21] >=dev-ruby/crack-0.3.2[ruby_targets_ruby21] dev-ruby/hashdiff[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[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/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[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=2
 SRC_URI=mirror://rubygems/webmock-2.3.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_=df0a9b7f9f34992baedd9cd67472e57f
diff --git a/metadata/md5-cache/dev-ruby/webmock-2.3.2 b/metadata/md5-cache/dev-ruby/webmock-2.3.2
index bc1b78c085c9..306fd7e2789e 100644
--- a/metadata/md5-cache/dev-ruby/webmock-2.3.2
+++ b/metadata/md5-cache/dev-ruby/webmock-2.3.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21] >=dev-ruby/crack-0.3.2[ruby_targets_ruby21] dev-ruby/hashdiff[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/rspec:3[ruby_targets_ruby21] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby21] >=dev-ruby/patron-0.4.18[ruby_targets_ruby21] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby22] >=dev-ruby/patron-0.4.18[ruby_targets_ruby22] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby23] >=dev-ruby/patron-0.4.18[ruby_targets_ruby23] >=dev-ruby/http-0.8.0:0.8[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/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=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby22] >=dev-ruby/patron-0.4.18[ruby_targets_ruby22] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby23] >=dev-ruby/patron-0.4.18[ruby_targets_ruby23] >=dev-ruby/http-0.8.0:0.8[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/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=Allows stubbing HTTP requests and setting expectations on HTTP requests
 EAPI=5
 HOMEPAGE=https://github.com/bblimke/webmock
-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 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21] >=dev-ruby/crack-0.3.2[ruby_targets_ruby21] dev-ruby/hashdiff[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[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/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[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=2
 SRC_URI=mirror://rubygems/webmock-2.3.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_=5999d86c89352fdb5a26aacbe20151f8
diff --git a/metadata/md5-cache/dev-ruby/webmock-3.0.1 b/metadata/md5-cache/dev-ruby/webmock-3.0.1
index aec293a3fa95..401eb7d373e0 100644
--- a/metadata/md5-cache/dev-ruby/webmock-3.0.1
+++ b/metadata/md5-cache/dev-ruby/webmock-3.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21] >=dev-ruby/crack-0.3.2[ruby_targets_ruby21] dev-ruby/hashdiff[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby24] >=dev-ruby/crack-0.3.2[ruby_targets_ruby24] dev-ruby/hashdiff[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/rspec:3[ruby_targets_ruby21] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby21] >=dev-ruby/patron-0.4.18[ruby_targets_ruby21] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby22] >=dev-ruby/patron-0.4.18[ruby_targets_ruby22] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby23] >=dev-ruby/patron-0.4.18[ruby_targets_ruby23] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby24] >=dev-ruby/patron-0.4.18[ruby_targets_ruby24] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby24] >=dev-ruby/crack-0.3.2[ruby_targets_ruby24] dev-ruby/hashdiff[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby22] >=dev-ruby/patron-0.4.18[ruby_targets_ruby22] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby23] >=dev-ruby/patron-0.4.18[ruby_targets_ruby23] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby24] >=dev-ruby/patron-0.4.18[ruby_targets_ruby24] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Allows stubbing HTTP requests and setting expectations on HTTP requests
 EAPI=6
 HOMEPAGE=https://github.com/bblimke/webmock
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21] >=dev-ruby/crack-0.3.2[ruby_targets_ruby21] dev-ruby/hashdiff[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby24] >=dev-ruby/crack-0.3.2[ruby_targets_ruby24] dev-ruby/hashdiff[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby22] >=dev-ruby/crack-0.3.2[ruby_targets_ruby22] dev-ruby/hashdiff[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby23] >=dev-ruby/crack-0.3.2[ruby_targets_ruby23] dev-ruby/hashdiff[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby24] >=dev-ruby/crack-0.3.2[ruby_targets_ruby24] dev-ruby/hashdiff[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/webmock-3.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_=85bce0cab836f4acbfaf4a78af1e9ba1
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2 b/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2
index ced77fafefc5..38df4d204910 100644
--- a/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/shoulda[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/shoulda[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/shoulda[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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=A library to help write robots.txt compliant web robots
 EAPI=5
 HOMEPAGE=http://rubygems.org/gems/webrobots
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[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/nokogiri-1.4.4[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/webrobots-0.1.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_=6fe1acdff34d5764a75d3254aaf13ff8
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.2 b/metadata/md5-cache/dev-ruby/webrobots-0.1.2
index 8081713b3daf..18494bbac8bc 100644
--- a/metadata/md5-cache/dev-ruby/webrobots-0.1.2
+++ b/metadata/md5-cache/dev-ruby/webrobots-0.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/shoulda[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/shoulda[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/shoulda[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/webmock[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/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=test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/shoulda[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/shoulda[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/webmock[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/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=A library to help write robots.txt compliant web robots
 EAPI=5
 HOMEPAGE=https://github.com/knu/webrobots
-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 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.4.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/nokogiri-1.4.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.4.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/webrobots-0.1.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_=e2a489e527e9ddbf727abee1a61b5679
diff --git a/metadata/md5-cache/dev-ruby/websocket-1.2.3 b/metadata/md5-cache/dev-ruby/websocket-1.2.3
index fbc5801ee9f5..e51e68200069 100644
--- a/metadata/md5-cache/dev-ruby/websocket-1.2.3
+++ b/metadata/md5-cache/dev-ruby/websocket-1.2.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[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/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[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=Universal Ruby library to handle WebSocket protocol
 EAPI=5
 HOMEPAGE=https://github.com/imanel/websocket-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/websocket-1.2.3.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_=17864324da8e18c2a865948209d95c54
diff --git a/metadata/md5-cache/dev-ruby/websocket-1.2.4 b/metadata/md5-cache/dev-ruby/websocket-1.2.4
index e322bc7a9573..9f42c0cd5bab 100644
--- a/metadata/md5-cache/dev-ruby/websocket-1.2.4
+++ b/metadata/md5-cache/dev-ruby/websocket-1.2.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Universal Ruby library to handle WebSocket protocol
 EAPI=5
 HOMEPAGE=https://github.com/imanel/websocket-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/websocket-1.2.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_=a56935f52075d95438db6e885e8e4dec
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.4 b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.4
index 70d90d1b527d..3ec4c3b2be6d 100644
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.4
+++ b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/websocket-extensions-0.1.0[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: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=test? ( ruby_targets_ruby22? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/websocket-extensions-0.1.0[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: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=A complete implementation of the WebSocket protocols
 EAPI=5
 HOMEPAGE=https://github.com/faye/websocket-driver-ruby
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/websocket-extensions-0.1.0[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/websocket-extensions-0.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/websocket-extensions-0.1.0[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=https://github.com/faye/websocket-driver-ruby/archive/0.6.4.tar.gz -> websocket-driver-0.6.4.tar.gz
 _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_=5549bdead3cc48648072acdf34e1068e
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5 b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5
index 5df6f27443f3..067edccf8888 100644
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5
+++ b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A complete implementation of the WebSocket protocols
 EAPI=5
 HOMEPAGE=https://github.com/faye/websocket-driver-ruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/faye/websocket-driver-ruby/archive/0.6.5.tar.gz -> websocket-driver-0.6.5.tar.gz
 _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_=38d7ac1995599d460cc2eeca386811b1
diff --git a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.2 b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.2
index 3bdecaad226b..b1dbaf696e00 100644
--- a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.2
+++ b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Generic extension manager for WebSocket connections
 EAPI=5
 HOMEPAGE=https://github.com/faye/websocket-extensions-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/faye/websocket-extensions-ruby/archive/0.1.2.tar.gz -> websocket-extensions-0.1.2.tar.gz
 _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_=d334a534fe5c619b3bd49a2422d28076
diff --git a/metadata/md5-cache/dev-ruby/wikicloth-0.8.3 b/metadata/md5-cache/dev-ruby/wikicloth-0.8.3
index 540f7122de6d..cea9f3050693 100644
--- a/metadata/md5-cache/dev-ruby/wikicloth-0.8.3
+++ b/metadata/md5-cache/dev-ruby/wikicloth-0.8.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/builder:*[ruby_targets_ruby21] dev-ruby/expression_parser[ruby_targets_ruby21] dev-ruby/htmlentities[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/rinku[ruby_targets_ruby21] dev-ruby/twitter-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/builder:*[ruby_targets_ruby22] dev-ruby/expression_parser[ruby_targets_ruby22] dev-ruby/htmlentities[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/rinku[ruby_targets_ruby22] dev-ruby/twitter-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/builder:*[ruby_targets_ruby23] dev-ruby/expression_parser[ruby_targets_ruby23] dev-ruby/htmlentities[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/rinku[ruby_targets_ruby23] dev-ruby/twitter-text[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/activesupport[ruby_targets_ruby21] dev-ruby/test-unit[ruby_targets_ruby21] dev-ruby/i18n[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/activesupport[ruby_targets_ruby22] dev-ruby/test-unit[ruby_targets_ruby22] dev-ruby/i18n[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activesupport[ruby_targets_ruby23] dev-ruby/test-unit[ruby_targets_ruby23] dev-ruby/i18n[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/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=test? ( ruby_targets_ruby22? ( dev-ruby/builder:*[ruby_targets_ruby22] dev-ruby/expression_parser[ruby_targets_ruby22] dev-ruby/htmlentities[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/rinku[ruby_targets_ruby22] dev-ruby/twitter-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/builder:*[ruby_targets_ruby23] dev-ruby/expression_parser[ruby_targets_ruby23] dev-ruby/htmlentities[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/rinku[ruby_targets_ruby23] dev-ruby/twitter-text[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/activesupport[ruby_targets_ruby22] dev-ruby/test-unit[ruby_targets_ruby22] dev-ruby/i18n[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activesupport[ruby_targets_ruby23] dev-ruby/test-unit[ruby_targets_ruby23] dev-ruby/i18n[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/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=A mediawiki parser
 EAPI=5
 HOMEPAGE=https://github.com/nricciar/wikicloth
-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
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/builder:*[ruby_targets_ruby21] dev-ruby/expression_parser[ruby_targets_ruby21] dev-ruby/htmlentities[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/rinku[ruby_targets_ruby21] dev-ruby/twitter-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/builder:*[ruby_targets_ruby22] dev-ruby/expression_parser[ruby_targets_ruby22] dev-ruby/htmlentities[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/rinku[ruby_targets_ruby22] dev-ruby/twitter-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/builder:*[ruby_targets_ruby23] dev-ruby/expression_parser[ruby_targets_ruby23] dev-ruby/htmlentities[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/rinku[ruby_targets_ruby23] dev-ruby/twitter-text[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:*[ruby_targets_ruby22] dev-ruby/expression_parser[ruby_targets_ruby22] dev-ruby/htmlentities[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/rinku[ruby_targets_ruby22] dev-ruby/twitter-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/builder:*[ruby_targets_ruby23] dev-ruby/expression_parser[ruby_targets_ruby23] dev-ruby/htmlentities[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/rinku[ruby_targets_ruby23] dev-ruby/twitter-text[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=https://github.com/nricciar/wikicloth/archive/v0.8.3.tar.gz -> wikicloth-0.8.3.tar.gz
 _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_=10f77b1385005ab295e3b88693d763c5
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-3.1.0 b/metadata/md5-cache/dev-ruby/will_paginate-3.1.0
index e74a495037aa..a4131e2d626e 100644
--- a/metadata/md5-cache/dev-ruby/will_paginate-3.1.0
+++ b/metadata/md5-cache/dev-ruby/will_paginate-3.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( <dev-ruby/rails-5[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( <dev-ruby/rails-5[ruby_targets_ruby22] dev-ruby/mocha[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/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_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/rails-5[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Most awesome pagination solution for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/mislav/will_paginate/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/will_paginate-3.1.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_=8f129e45a6975223ded2b15950f42cdc
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-3.1.0-r1 b/metadata/md5-cache/dev-ruby/will_paginate-3.1.0-r1
index 0af6f3350a0b..eac006ad0d23 100644
--- a/metadata/md5-cache/dev-ruby/will_paginate-3.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/will_paginate-3.1.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( <dev-ruby/rails-5[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( <dev-ruby/rails-5[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( <dev-ruby/rails-5[ruby_targets_ruby23] dev-ruby/mocha[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=ruby_targets_ruby22? ( test? ( <dev-ruby/rails-5[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( <dev-ruby/rails-5[ruby_targets_ruby23] dev-ruby/mocha[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=Most awesome pagination solution for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/mislav/will_paginate/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~x86-macos
 LICENSE=MIT
-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=3
 SRC_URI=mirror://rubygems/will_paginate-3.1.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_=cbc1dabf898dfe1938c4ad6f74178c23
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-3.1.5 b/metadata/md5-cache/dev-ruby/will_paginate-3.1.5
index 78a0bbefb60c..146770f28903 100644
--- a/metadata/md5-cache/dev-ruby/will_paginate-3.1.5
+++ b/metadata/md5-cache/dev-ruby/will_paginate-3.1.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( <dev-ruby/rails-5[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( <dev-ruby/rails-5[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( <dev-ruby/rails-5[ruby_targets_ruby23] dev-ruby/mocha[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=ruby_targets_ruby22? ( test? ( <dev-ruby/rails-5[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( <dev-ruby/rails-5[ruby_targets_ruby23] dev-ruby/mocha[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=Most awesome pagination solution for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/mislav/will_paginate/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 LICENSE=MIT
-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=3
 SRC_URI=mirror://rubygems/will_paginate-3.1.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_=214539b53dfedd02cfc63cde5c09d4cc
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-3.1.6 b/metadata/md5-cache/dev-ruby/will_paginate-3.1.6
index 1ef85a95918e..8634876b7fb4 100644
--- a/metadata/md5-cache/dev-ruby/will_paginate-3.1.6
+++ b/metadata/md5-cache/dev-ruby/will_paginate-3.1.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/will_paginate-3.1.6.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_=9f07ce188d7f06e9e43d72ab780562f9
diff --git a/metadata/md5-cache/dev-ruby/windows_error-0.1.1 b/metadata/md5-cache/dev-ruby/windows_error-0.1.1
index 8917e24f1169..95b65dcf3441 100644
--- a/metadata/md5-cache/dev-ruby/windows_error-0.1.1
+++ b/metadata/md5-cache/dev-ruby/windows_error-0.1.1
@@ -12,5 +12,5 @@ RESTRICT=test
 SLOT=0.1
 SRC_URI=mirror://rubygems/windows_error-0.1.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_=c17ef3dbdd3ed316ffec279842f26a13
diff --git a/metadata/md5-cache/dev-ruby/windows_error-0.1.2 b/metadata/md5-cache/dev-ruby/windows_error-0.1.2
index 164c4a44efaa..c7331b109f66 100644
--- a/metadata/md5-cache/dev-ruby/windows_error-0.1.2
+++ b/metadata/md5-cache/dev-ruby/windows_error-0.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.1
 SRC_URI=mirror://rubygems/windows_error-0.1.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_=d851281ed389d8d3930394ca5e701a34
diff --git a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4 b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
index be1401c0986a..49b89cc3fa5d 100644
--- a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
+++ b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=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? ( 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? ( 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? ( 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=Wirble is a set of enhancements for Irb
 EAPI=5
 HOMEPAGE=http://pablotron.org/software/wirble/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=amd64 ppc x86
 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/wirble-0.1.3.gem
 _eclass_exported_funcs=pkg_postinst:- 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_=3e63548a8d486ab6f2f4d5ce72d1f997
diff --git a/metadata/md5-cache/dev-ruby/xml-simple-1.1.5 b/metadata/md5-cache/dev-ruby/xml-simple-1.1.5
index 44e083779354..42b52bd113f7 100644
--- a/metadata/md5-cache/dev-ruby/xml-simple-1.1.5
+++ b/metadata/md5-cache/dev-ruby/xml-simple-1.1.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Easy API to maintain XML. A Ruby port of Grant McLean's Perl module XML::Simple
 EAPI=5
 HOMEPAGE=https://github.com/maik/xml-simple
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=amd64 ~ppc ~x86
 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/maik/xml-simple/archive/v1.1.5.tar.gz -> xml-simple-1.1.5.tar.gz
 _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_=69f5fc9ee7745ad2f2380a117946c0dd
diff --git a/metadata/md5-cache/dev-ruby/xmlrpc-0.2.1 b/metadata/md5-cache/dev-ruby/xmlrpc-0.2.1
index 86362eff68f2..041a63a1252f 100644
--- a/metadata/md5-cache/dev-ruby/xmlrpc-0.2.1
+++ b/metadata/md5-cache/dev-ruby/xmlrpc-0.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ruby/xmlrpc/archive/v0.2.1.tar.gz -> xmlrpc-0.2.1.tar.gz
 _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_=4b6941598c83279a9b473836bacfad60
diff --git a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.0 b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.0
index 0dbae88d76c2..5c5eced1e125 100644
--- a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.0
+++ b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ruby/xmlrpc/archive/v0.3.0.tar.gz -> xmlrpc-0.3.0.tar.gz
 _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_=499d84d8c6a19604b304061370603475
diff --git a/metadata/md5-cache/dev-ruby/xpath-0.1.4-r1 b/metadata/md5-cache/dev-ruby/xpath-0.1.4-r1
index 9b22ff9667ea..13b8caf57913 100644
--- a/metadata/md5-cache/dev-ruby/xpath-0.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/xpath-0.1.4-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri[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=ruby_targets_ruby22? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri[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=XPath is a Ruby DSL around a subset of XPath 1.0
 EAPI=5
 HOMEPAGE=https://github.com/jnicklas/xpath
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-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/xpath-0.1.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_=02358bb1777256e28ecab80064338fc9
diff --git a/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1 b/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1
index b4b945d1031d..df61da8ac39d 100644
--- a/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=XPath is a Ruby DSL around a subset of XPath 1.0
 EAPI=5
 HOMEPAGE=https://github.com/jnicklas/xpath
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/xpath-2.0.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_=147f9c7dc551a71e2596fa5efa71f268
diff --git a/metadata/md5-cache/dev-ruby/xpath-2.1.0 b/metadata/md5-cache/dev-ruby/xpath-2.1.0
index 50437eb72493..67d2a393b4ba 100644
--- a/metadata/md5-cache/dev-ruby/xpath-2.1.0
+++ b/metadata/md5-cache/dev-ruby/xpath-2.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=XPath is a Ruby DSL around a subset of XPath 1.0
 EAPI=5
 HOMEPAGE=https://github.com/jnicklas/xpath
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/xpath-2.1.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_=07294647245fa7588c2c4017ce6c6763
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.1.0-r1 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.1.0-r1
index 9dd0cd728121..b5aafe2f50ac 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.1.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/yajl ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) 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_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=dev-libs/yajl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Ruby C bindings to the Yajl JSON stream-based parser library
 EAPI=5
 HOMEPAGE=https://github.com/brianmario/yajl-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=dev-libs/yajl 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=dev-libs/yajl 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/yajl-ruby-1.1.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_=d97f797e2ecd3c237f87e19ee92da43e
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.1 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.1
index 2ce5c6fc7dd0..3263e05e9980 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.1
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/yajl 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=dev-libs/yajl 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=Ruby C bindings to the Yajl JSON stream-based parser library
 EAPI=5
 HOMEPAGE=https://github.com/brianmario/yajl-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=dev-libs/yajl 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=dev-libs/yajl 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/yajl-ruby-1.2.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_=546bac5b02f2a2e53efc2d9261e81ec6
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.0 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.0
index 77c49d2fbfde..4ab8c98ddbce 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.0
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/yajl 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=dev-libs/yajl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby C bindings to the Yajl JSON stream-based parser library
 EAPI=5
 HOMEPAGE=https://github.com/brianmario/yajl-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=dev-libs/yajl 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=dev-libs/yajl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/yajl-ruby-1.3.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_=87be664d3e900676414203ee59c573bf
diff --git a/metadata/md5-cache/dev-ruby/yard-0.8.7.3 b/metadata/md5-cache/dev-ruby/yard-0.8.7.3
index e07f15ccda0d..d8206a7f8a26 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.8.7.3
+++ b/metadata/md5-cache/dev-ruby/yard-0.8.7.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( || ( dev-ruby/bluecloth[ruby_targets_ruby21] dev-ruby/maruku[ruby_targets_ruby21] dev-ruby/rdiscount[ruby_targets_ruby21] dev-ruby/kramdown[ruby_targets_ruby21] ) ) test? ( dev-ruby/rack[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( || ( dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/maruku[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/kramdown[ruby_targets_ruby22] ) ) test? ( dev-ruby/rack[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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_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? ( doc? ( || ( dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/maruku[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/kramdown[ruby_targets_ruby22] ) ) test? ( dev-ruby/rack[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Documentation generation tool for the Ruby programming language
 EAPI=5
 HOMEPAGE=http://yardoc.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/0.8.7.3.tar.gz -> yard-0.8.7.3-git.tgz
 _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_=34db9e753d5ba78ac9437920fade0a5e
diff --git a/metadata/md5-cache/dev-ruby/yard-0.8.7.6 b/metadata/md5-cache/dev-ruby/yard-0.8.7.6
index a46918abfb74..9239d60c2b1c 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.8.7.6
+++ b/metadata/md5-cache/dev-ruby/yard-0.8.7.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby21] dev-ruby/rdiscount[ruby_targets_ruby21] dev-ruby/bluecloth[ruby_targets_ruby21] dev-ruby/kramdown[ruby_targets_ruby21] ) ) ) ruby_targets_ruby22? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/kramdown[ruby_targets_ruby22] ) ) ) ruby_targets_ruby23? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/kramdown[ruby_targets_ruby23] ) ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby21] ) ) 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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=ruby_targets_ruby22? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/kramdown[ruby_targets_ruby22] ) ) ) ruby_targets_ruby23? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/kramdown[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Documentation generation tool for the Ruby programming language
 EAPI=5
 HOMEPAGE=http://yardoc.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=https://github.com/lsegal/yard/archive/v0.8.7.6.tar.gz -> yard-0.8.7.6-git.tgz
 _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_=8f8e1abe781f9e2b335530efae4e58f7
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.4 b/metadata/md5-cache/dev-ruby/yard-0.9.4
index 2ac6e4e33458..26af7e1136c2 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.4
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby21] dev-ruby/rdiscount[ruby_targets_ruby21] dev-ruby/bluecloth[ruby_targets_ruby21] dev-ruby/kramdown[ruby_targets_ruby21] ) ) ) ruby_targets_ruby22? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/kramdown[ruby_targets_ruby22] ) ) ) ruby_targets_ruby23? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/kramdown[ruby_targets_ruby23] ) ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby22] ) ) 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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=ruby_targets_ruby22? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/kramdown[ruby_targets_ruby22] ) ) ) ruby_targets_ruby23? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/kramdown[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=Documentation generation tool for the Ruby programming language
 EAPI=5
 HOMEPAGE=http://yardoc.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=https://github.com/lsegal/yard/archive/v0.9.4.tar.gz -> yard-0.9.4-git.tgz
 _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_=1838012ebe33e0c6ab38b1d8743bdf6a
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.8 b/metadata/md5-cache/dev-ruby/yard-0.9.8
index d3be37e7c62f..05a38ea744cb 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.8
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby21] dev-ruby/rdiscount[ruby_targets_ruby21] dev-ruby/bluecloth[ruby_targets_ruby21] dev-ruby/kramdown[ruby_targets_ruby21] ) ) ) ruby_targets_ruby22? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/kramdown[ruby_targets_ruby22] ) ) ) ruby_targets_ruby23? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/kramdown[ruby_targets_ruby23] ) ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby22] ) ) 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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/kramdown[ruby_targets_ruby22] ) ) ) ruby_targets_ruby23? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/kramdown[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=Documentation generation tool for the Ruby programming language
 EAPI=5
 HOMEPAGE=http://yardoc.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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=https://github.com/lsegal/yard/archive/v0.9.8.tar.gz -> yard-0.9.8-git.tgz
 _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_=9f48c0af79adc4c45df47e38b5314478
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.9 b/metadata/md5-cache/dev-ruby/yard-0.9.9
index 028b3ce8e03d..497a3b6365c6 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.9
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby21] dev-ruby/rdiscount[ruby_targets_ruby21] dev-ruby/bluecloth[ruby_targets_ruby21] dev-ruby/kramdown[ruby_targets_ruby21] ) ) ) ruby_targets_ruby22? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/kramdown[ruby_targets_ruby22] ) ) ) ruby_targets_ruby23? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/kramdown[ruby_targets_ruby23] ) ) ) ruby_targets_ruby24? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby24] dev-ruby/rdiscount[ruby_targets_ruby24] dev-ruby/bluecloth[ruby_targets_ruby24] dev-ruby/kramdown[ruby_targets_ruby24] ) ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/bluecloth[ruby_targets_ruby22] dev-ruby/kramdown[ruby_targets_ruby22] ) ) ) ruby_targets_ruby23? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/kramdown[ruby_targets_ruby23] ) ) ) ruby_targets_ruby24? ( doc? ( || ( dev-ruby/maruku[ruby_targets_ruby24] dev-ruby/rdiscount[ruby_targets_ruby24] dev-ruby/bluecloth[ruby_targets_ruby24] dev-ruby/kramdown[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/ruby-gettext-2.3.8[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Documentation generation tool for the Ruby programming language
 EAPI=6
 HOMEPAGE=http://yardoc.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.9.9.tar.gz -> yard-0.9.9-git.tgz
 _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_=4ec1bf0fba1144159cdb92f005a30639
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.11.0 b/metadata/md5-cache/dev-ruby/zentest-4.11.0
index d29d2b421d7e..d57df41a8474 100644
--- a/metadata/md5-cache/dev-ruby/zentest-4.11.0
+++ b/metadata/md5-cache/dev-ruby/zentest-4.11.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby21] dev-ruby/hoe-seattlerb[ruby_targets_ruby21] dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] dev-ruby/minitest:5[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/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/hoe-2.10[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] dev-ruby/minitest:5[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/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=Testing tools: zentest, unit_diff, autotest, multiruby, and Test::Rails
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/zentest
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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/ZenTest-4.11.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_=0310d2d5ec46bd2b5a5361cc8740703b
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.11.1 b/metadata/md5-cache/dev-ruby/zentest-4.11.1
index 658b258887ce..9e908ce7d406 100644
--- a/metadata/md5-cache/dev-ruby/zentest-4.11.1
+++ b/metadata/md5-cache/dev-ruby/zentest-4.11.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby21] dev-ruby/hoe-seattlerb[ruby_targets_ruby21] dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby24] dev-ruby/hoe-seattlerb[ruby_targets_ruby24] dev-ruby/minitest:5[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby24] dev-ruby/hoe-seattlerb[ruby_targets_ruby24] dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Testing tools: zentest, unit_diff, autotest, multiruby, and Test::Rails
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/zentest
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/ZenTest-4.11.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_=6ad91621e2cce778c761a74fb1c84cb3
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
diff --git a/metadata/md5-cache/dev-vcs/git-num-2.0.1 b/metadata/md5-cache/dev-vcs/git-num-2.0.1
index 418a1b90b342..b399d25a9d32 100644
--- a/metadata/md5-cache/dev-vcs/git-num-2.0.1
+++ b/metadata/md5-cache/dev-vcs/git-num-2.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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_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? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Quickly reference files in Git using numbers
 EAPI=5
 HOMEPAGE=https://github.com/schreifels/git-num
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=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-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/schreifels/git-num/archive/v2.0.1.tar.gz -> git-num-2.0.1.tar.gz
 _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_=7de402b3fdf86ce45bbde2e6557c9a50
diff --git a/metadata/md5-cache/dev-vcs/gitsh-0.11.2 b/metadata/md5-cache/dev-vcs/gitsh-0.11.2
index ea8c02f4d79e..df72e3a7e67d 100644
--- a/metadata/md5-cache/dev-vcs/gitsh-0.11.2
+++ b/metadata/md5-cache/dev-vcs/gitsh-0.11.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-vcs/git ) test? ( ruby_targets_ruby21? ( dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/parslet[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/parslet[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/parslet[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/pry[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/pry[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/pry[ruby_targets_ruby23] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 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=test? ( dev-vcs/git ) test? ( ruby_targets_ruby22? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/parslet[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/parslet[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/pry[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/pry[ruby_targets_ruby23] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 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=An interactive shell for git
 EAPI=6
 HOMEPAGE=https://github.com/thoughtbot/gitsh
-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 ~amd64-linux
 LICENSE=BSD
-RDEPEND=sys-libs/readline ruby_targets_ruby21? ( dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/parslet[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/parslet[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/parslet[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=sys-libs/readline ruby_targets_ruby22? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/parslet[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/parslet[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=https://github.com/thoughtbot/gitsh/archive/v0.11.2.tar.gz -> gitsh-0.11.2.tar.gz
 _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_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bf3b445920ae65def0ef6be7d068a2b8
diff --git a/metadata/md5-cache/games-misc/lolcat-42.1.43 b/metadata/md5-cache/games-misc/lolcat-42.1.43
index 3bedb298bb71..af4ead4f06b8 100644
--- a/metadata/md5-cache/games-misc/lolcat-42.1.43
+++ b/metadata/md5-cache/games-misc/lolcat-42.1.43
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-vcs/git test? ( ruby_targets_ruby21? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby21] >=dev-ruby/paint-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby22] >=dev-ruby/paint-1.0[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] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=dev-vcs/git test? ( ruby_targets_ruby22? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby22] >=dev-ruby/paint-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Rainbows and unicorns!
 EAPI=5
 HOMEPAGE=https://github.com/busyloop/lolcat
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~x86
 LICENSE=WTFPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby21] >=dev-ruby/paint-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby22] >=dev-ruby/paint-1.0[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/trollop-2.1.2:2[ruby_targets_ruby22] >=dev-ruby/paint-1.0[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/lolcat-42.1.43.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_=6bc82bb4d513a324d40a69c98715cb7f
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta19 b/metadata/md5-cache/media-libs/libcaca-0.99_beta19
index 7e9ae7499ad9..beb157904035 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta19
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta19
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta19.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-opt-2 pkg_setup:- src_unpack:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=818ddc7903f1f78436701eef8aaf8500
diff --git a/metadata/md5-cache/net-analyzer/metasploit-4.12.16 b/metadata/md5-cache/net-analyzer/metasploit-4.12.16
deleted file mode 100644
index e00ee29034b8..000000000000
--- a/metadata/md5-cache/net-analyzer/metasploit-4.12.16
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/actionpack-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/activerecord-4.2.6:4.2[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/bit-struct[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/filesize[ruby_targets_ruby21] dev-ruby/jsobfu:0.3.0[ruby_targets_ruby21] dev-ruby/json:*[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] dev-ruby/metasm:1.0.2[ruby_targets_ruby21] >=dev-ruby/metasploit_data_models-2.0.0[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.1.13[ruby_targets_ruby21] dev-ruby/metasploit_payloads-mettle:0.0.6[ruby_targets_ruby21] >=dev-ruby/metasploit-credential-2.0.0:*[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-2.0.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-2.0.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/net-ssh:*[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/octokit[ruby_targets_ruby21] dev-ruby/openssl-ccm:1.2.1[ruby_targets_ruby21] dev-ruby/patch_finder[ruby_targets_ruby21] dev-ruby/recog:2.0.14[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/rex-arch[ruby_targets_ruby21] dev-ruby/rex-java[ruby_targets_ruby21] dev-ruby/rex-ole[ruby_targets_ruby21] dev-ruby/rex-powershell[ruby_targets_ruby21] dev-ruby/rex-random_identifier[ruby_targets_ruby21] dev-ruby/rex-registry[ruby_targets_ruby21] dev-ruby/rex-struct2[ruby_targets_ruby21] dev-ruby/rex-text[ruby_targets_ruby21] dev-ruby/rex-zip[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.11[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] dev-ruby/sshkey[ruby_targets_ruby21] dev-ruby/tzinfo:*[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) test? ( >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/database_cleaner[ruby_targets_ruby21] >=dev-ruby/rspec-2.12[ruby_targets_ruby21] dev-ruby/shoulda-matchers[ruby_targets_ruby21] dev-ruby/timecop[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/actionpack-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/activerecord-4.2.6:4.2[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/bit-struct[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/filesize[ruby_targets_ruby21] dev-ruby/jsobfu:0.3.0[ruby_targets_ruby21] dev-ruby/json:*[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] dev-ruby/metasm:1.0.2[ruby_targets_ruby21] >=dev-ruby/metasploit_data_models-2.0.0[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.1.13[ruby_targets_ruby21] dev-ruby/metasploit_payloads-mettle:0.0.6[ruby_targets_ruby21] >=dev-ruby/metasploit-credential-2.0.0:*[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-2.0.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-2.0.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/net-ssh:*[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/octokit[ruby_targets_ruby21] dev-ruby/openssl-ccm:1.2.1[ruby_targets_ruby21] dev-ruby/patch_finder[ruby_targets_ruby21] dev-ruby/recog:2.0.14[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/rex-arch[ruby_targets_ruby21] dev-ruby/rex-java[ruby_targets_ruby21] dev-ruby/rex-ole[ruby_targets_ruby21] dev-ruby/rex-powershell[ruby_targets_ruby21] dev-ruby/rex-random_identifier[ruby_targets_ruby21] dev-ruby/rex-registry[ruby_targets_ruby21] dev-ruby/rex-struct2[ruby_targets_ruby21] dev-ruby/rex-text[ruby_targets_ruby21] dev-ruby/rex-zip[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.11[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] dev-ruby/sshkey[ruby_targets_ruby21] dev-ruby/tzinfo:*[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
-DESCRIPTION=Advanced framework for developing, testing, and using vulnerability exploit code
-EAPI=5
-HOMEPAGE=http://www.metasploit.org/
-IUSE=development +java oracle +pcap test test elibc_FreeBSD ruby_targets_ruby21
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/actionpack-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/activerecord-4.2.6:4.2[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/bit-struct[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/filesize[ruby_targets_ruby21] dev-ruby/jsobfu:0.3.0[ruby_targets_ruby21] dev-ruby/json:*[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] dev-ruby/metasm:1.0.2[ruby_targets_ruby21] >=dev-ruby/metasploit_data_models-2.0.0[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.1.13[ruby_targets_ruby21] dev-ruby/metasploit_payloads-mettle:0.0.6[ruby_targets_ruby21] >=dev-ruby/metasploit-credential-2.0.0:*[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-2.0.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-2.0.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/net-ssh:*[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/octokit[ruby_targets_ruby21] dev-ruby/openssl-ccm:1.2.1[ruby_targets_ruby21] dev-ruby/patch_finder[ruby_targets_ruby21] dev-ruby/recog:2.0.14[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/rex-arch[ruby_targets_ruby21] dev-ruby/rex-java[ruby_targets_ruby21] dev-ruby/rex-ole[ruby_targets_ruby21] dev-ruby/rex-powershell[ruby_targets_ruby21] dev-ruby/rex-random_identifier[ruby_targets_ruby21] dev-ruby/rex-registry[ruby_targets_ruby21] dev-ruby/rex-struct2[ruby_targets_ruby21] dev-ruby/rex-text[ruby_targets_ruby21] dev-ruby/rex-zip[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.11[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] dev-ruby/sshkey[ruby_targets_ruby21] dev-ruby/tzinfo:*[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) ) dev-db/postgresql[server] >=app-crypt/johntheripper-1.7.9-r1[-minimal] net-analyzer/nmap >=app-eselect/eselect-metasploit-0.16 ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 )
-RESTRICT=strip
-SLOT=4.12
-SRC_URI=https://github.com/rapid7/metasploit-framework/archive/4.12.16.tar.gz -> metasploit-4.12.16.tar.gz
-_eclass_exported_funcs=pkg_postinst:- pkg_setup:- 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-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0439ff26f29f75124afcbf6f589df99e
diff --git a/metadata/md5-cache/net-analyzer/metasploit-4.12.7 b/metadata/md5-cache/net-analyzer/metasploit-4.12.7
deleted file mode 100644
index 3a9681586df1..000000000000
--- a/metadata/md5-cache/net-analyzer/metasploit-4.12.7
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/actionpack-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/activerecord-4.2.6:4.2[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/filesize[ruby_targets_ruby21] dev-ruby/jsobfu:0.3.0[ruby_targets_ruby21] dev-ruby/json:*[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] dev-ruby/metasm:1.0.2[ruby_targets_ruby21] >=dev-ruby/metasploit_data_models-2.0.0[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.1.11[ruby_targets_ruby21] >=dev-ruby/metasploit-credential-2.0.0[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-2.0.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-2.0.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/octokit[ruby_targets_ruby21] dev-ruby/openssl-ccm:1.2.1[ruby_targets_ruby21] dev-ruby/patch_finder[ruby_targets_ruby21] dev-ruby/recog:2.0.14[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.11[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] dev-ruby/tzinfo:*[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) test? ( >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/database_cleaner[ruby_targets_ruby21] >=dev-ruby/rspec-2.12[ruby_targets_ruby21] dev-ruby/shoulda-matchers[ruby_targets_ruby21] dev-ruby/timecop[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/actionpack-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/activerecord-4.2.6:4.2[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/filesize[ruby_targets_ruby21] dev-ruby/jsobfu:0.3.0[ruby_targets_ruby21] dev-ruby/json:*[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] dev-ruby/metasm:1.0.2[ruby_targets_ruby21] >=dev-ruby/metasploit_data_models-2.0.0[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.1.11[ruby_targets_ruby21] >=dev-ruby/metasploit-credential-2.0.0[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-2.0.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-2.0.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/octokit[ruby_targets_ruby21] dev-ruby/openssl-ccm:1.2.1[ruby_targets_ruby21] dev-ruby/patch_finder[ruby_targets_ruby21] dev-ruby/recog:2.0.14[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.11[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] dev-ruby/tzinfo:*[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
-DESCRIPTION=Advanced framework for developing, testing, and using vulnerability exploit code
-EAPI=5
-HOMEPAGE=http://www.metasploit.org/
-IUSE=development +java oracle +pcap test test elibc_FreeBSD ruby_targets_ruby21
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/actionpack-4.2.6:4.2[ruby_targets_ruby21] >=dev-ruby/activerecord-4.2.6:4.2[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/filesize[ruby_targets_ruby21] dev-ruby/jsobfu:0.3.0[ruby_targets_ruby21] dev-ruby/json:*[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] dev-ruby/metasm:1.0.2[ruby_targets_ruby21] >=dev-ruby/metasploit_data_models-2.0.0[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.1.11[ruby_targets_ruby21] >=dev-ruby/metasploit-credential-2.0.0[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-2.0.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-2.0.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/octokit[ruby_targets_ruby21] dev-ruby/openssl-ccm:1.2.1[ruby_targets_ruby21] dev-ruby/patch_finder[ruby_targets_ruby21] dev-ruby/recog:2.0.14[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.11[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] dev-ruby/tzinfo:*[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) ) dev-db/postgresql[server] >=app-crypt/johntheripper-1.7.9-r1[-minimal] net-analyzer/nmap >=app-eselect/eselect-metasploit-0.16 ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 )
-RESTRICT=strip
-SLOT=4.12
-SRC_URI=https://github.com/rapid7/metasploit-framework/archive/4.12.7.tar.gz -> metasploit-4.12.7.tar.gz
-_eclass_exported_funcs=pkg_postinst:- pkg_setup:- 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-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8d5abd53bc9c91734eb961af320031a9
diff --git a/metadata/md5-cache/net-analyzer/metasploit-4.14.16 b/metadata/md5-cache/net-analyzer/metasploit-4.14.16
index 14e84e168390..f5c3e8db31bb 100644
--- a/metadata/md5-cache/net-analyzer/metasploit-4.14.16
+++ b/metadata/md5-cache/net-analyzer/metasploit-4.14.16
@@ -12,5 +12,5 @@ RESTRICT=strip
 SLOT=4.14
 SRC_URI=https://github.com/rapid7/metasploit-framework/archive/4.14.16.tar.gz -> metasploit-4.14.16.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- 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-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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b4ae1b74a1f7d635f600f336a0439fb9
diff --git a/metadata/md5-cache/net-analyzer/metasploit-9999 b/metadata/md5-cache/net-analyzer/metasploit-9999
index f59797024cd3..be0d11628f87 100644
--- a/metadata/md5-cache/net-analyzer/metasploit-9999
+++ b/metadata/md5-cache/net-analyzer/metasploit-9999
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby23 )
 RESTRICT=strip
 SLOT=9999
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_unpack:git-r3 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	git-r3	cbafa3261c37c7e3af44bb16a34ea390	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-r3	cbafa3261c37c7e3af44bb16a34ea390	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=25d2da45ebc5637a745fb880e7ba72d6
diff --git a/metadata/md5-cache/net-irc/epic5-1.1.10-r1 b/metadata/md5-cache/net-irc/epic5-1.1.10-r1
index 510dd202ae1e..57e86396a8c1 100644
--- a/metadata/md5-cache/net-irc/epic5-1.1.10-r1
+++ b/metadata/md5-cache/net-irc/epic5-1.1.10-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/openssl-0.9.8e-r3:0 >=sys-libs/ncurses-5.6-r2 virtual/libiconv archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2 ) tcl? ( dev-lang/tcl:0 ) socks5? ( net-proxy/dante ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ) valgrind? ( dev-util/valgrind ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/openssl-0.9.8e-r3:0 >=sys-libs/ncurses-5.6-r2 virtual/libiconv archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2 ) tcl? ( dev-lang/tcl:0 ) socks5? ( net-proxy/dante ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ) valgrind? ( dev-util/valgrind ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Epic5 IRC Client
 EAPI=4
 HOMEPAGE=http://epicsol.org/
-IUSE=archive ipv6 perl tcl ruby socks5 valgrind elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=archive ipv6 perl tcl ruby socks5 valgrind elibc_FreeBSD ruby_targets_ruby22
 KEYWORDS=amd64 ~ppc x86
 LICENSE=BSD
-RDEPEND=>=dev-libs/openssl-0.9.8e-r3:0 >=sys-libs/ncurses-5.6-r2 virtual/libiconv archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2 ) tcl? ( dev-lang/tcl:0 ) socks5? ( net-proxy/dante ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) )
-REQUIRED_USE=ruby? ( ^^ ( ruby_targets_ruby21 ruby_targets_ruby22 ) ) ruby_targets_ruby21? ( ruby ) ruby_targets_ruby22? ( ruby )
+RDEPEND=>=dev-libs/openssl-0.9.8e-r3:0 >=sys-libs/ncurses-5.6-r2 virtual/libiconv archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2 ) tcl? ( dev-lang/tcl:0 ) socks5? ( net-proxy/dante ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) )
+REQUIRED_USE=ruby? ( ^^ ( ruby_targets_ruby22 ) ) ruby_targets_ruby22? ( ruby )
 SLOT=0
 SRC_URI=ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-1.1.10.tar.bz2
 _eclass_exported_funcs=pkg_setup:- src_unpack:- src_prepare:- src_configure:- src_compile:- src_test:ruby-ng src_install:-
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=20b811464fdfcc3b395be8df2087a5fc
diff --git a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325 b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325
index 7b7b1771cbf7..d43b3f089ec9 100644
--- a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325
+++ b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/tokyocabinet[ruby_targets_ruby21] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby21] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby21] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby21] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby21] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/tokyocabinet[ruby_targets_ruby22] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby22] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby22] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby22] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby22] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby22] ) ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DEPEND=ruby_targets_ruby22? ( nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/tokyocabinet[ruby_targets_ruby22] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby22] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby22] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby22] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby22] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby22] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=A ruby IRC bot
 EAPI=5
 HOMEPAGE=http://ruby-rbot.org/
-IUSE=spell aspell timezone translator shorturl nls figlet fortune cal host toilet linguas_zh_CN linguas_zh_TW linguas_ru linguas_nl linguas_de linguas_fi linguas_fr linguas_it linguas_ja test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=spell aspell timezone translator shorturl nls figlet fortune cal host toilet linguas_zh_CN linguas_zh_TW linguas_ru linguas_nl linguas_de linguas_fi linguas_fr linguas_it linguas_ja test elibc_FreeBSD ruby_targets_ruby22
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( feh GPL-2 )
-RDEPEND=spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) ) figlet? ( app-misc/figlet ) toilet? ( app-misc/toilet ) fortune? ( games-misc/fortune-mod ) cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) ) host? ( net-dns/bind-tools ) ruby_targets_ruby21? ( dev-ruby/tokyocabinet[ruby_targets_ruby21] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby21] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby21] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby21] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby21] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/tokyocabinet[ruby_targets_ruby22] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby22] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby22] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby22] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby22] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) ) figlet? ( app-misc/figlet ) toilet? ( app-misc/toilet ) fortune? ( games-misc/fortune-mod ) cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) ) host? ( net-dns/bind-tools ) ruby_targets_ruby22? ( dev-ruby/tokyocabinet[ruby_targets_ruby22] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby22] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby22] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby22] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby22] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ruby-rbot/rbot/archive/e358601cc521d8aced941eb928fae2d8c53cf0c2.tar.gz -> rbot-0.9.15_p20160325.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- 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-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3cbd3fa3be17a3e8cd7ae94873cefdbf
diff --git a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r1 b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r1
index d342d7075871..234361fe3e0e 100644
--- a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r1
+++ b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/tokyocabinet[ruby_targets_ruby21] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby21] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby21] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby21] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby21] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/tokyocabinet[ruby_targets_ruby22] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby22] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby22] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby22] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby22] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/tokyocabinet[ruby_targets_ruby23] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby23] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby23] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby23] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby23] >=dev-ruby/locale-2.0.5-r2[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 )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/tokyocabinet[ruby_targets_ruby22] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby22] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby22] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby22] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby22] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/tokyocabinet[ruby_targets_ruby23] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby23] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby23] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby23] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby23] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 DESCRIPTION=A ruby IRC bot
 EAPI=5
 HOMEPAGE=http://ruby-rbot.org/
-IUSE=spell aspell timezone translator shorturl nls figlet fortune cal host sqlite toilet linguas_zh_CN linguas_zh_TW linguas_ru linguas_nl linguas_de linguas_fi linguas_fr linguas_it linguas_ja test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
+IUSE=spell aspell timezone translator shorturl nls figlet fortune cal host sqlite toilet linguas_zh_CN linguas_zh_TW linguas_ru linguas_nl linguas_de linguas_fi linguas_fr linguas_it linguas_ja test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
 KEYWORDS=~amd64
 LICENSE=|| ( feh GPL-2 )
-RDEPEND=spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) ) figlet? ( app-misc/figlet ) sqlite? ( dev-ruby/sqlite3 ) toilet? ( app-misc/toilet ) fortune? ( games-misc/fortune-mod ) cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) ) host? ( net-dns/bind-tools ) ruby_targets_ruby21? ( dev-ruby/tokyocabinet[ruby_targets_ruby21] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby21] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby21] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby21] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby21] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/tokyocabinet[ruby_targets_ruby22] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby22] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby22] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby22] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby22] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/tokyocabinet[ruby_targets_ruby23] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby23] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby23] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby23] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby23] >=dev-ruby/locale-2.0.5-r2[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 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) ) figlet? ( app-misc/figlet ) sqlite? ( dev-ruby/sqlite3 ) toilet? ( app-misc/toilet ) fortune? ( games-misc/fortune-mod ) cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) ) host? ( net-dns/bind-tools ) ruby_targets_ruby22? ( dev-ruby/tokyocabinet[ruby_targets_ruby22] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby22] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby22] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby22] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby22] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/tokyocabinet[ruby_targets_ruby23] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby23] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby23] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby23] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby23] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/ruby-rbot/rbot/archive/e358601cc521d8aced941eb928fae2d8c53cf0c2.tar.gz -> rbot-0.9.15_p20160325.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- 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-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b7c16b58f26e312900e272f80903c229
diff --git a/metadata/md5-cache/net-mail/mailshears-0.0.3 b/metadata/md5-cache/net-mail/mailshears-0.0.3
index 3ed2b6bc0ec1..1ab8107cdf6b 100644
--- a/metadata/md5-cache/net-mail/mailshears-0.0.3
+++ b/metadata/md5-cache/net-mail/mailshears-0.0.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/pg-0.17[ruby_targets_ruby21] <dev-ruby/pg-1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pg-0.17[ruby_targets_ruby22] <dev-ruby/pg-1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[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? ( ruby_targets_ruby22? ( >=dev-ruby/pg-0.17[ruby_targets_ruby22] <dev-ruby/pg-1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Mangle your mail garden
 EAPI=6
 HOMEPAGE=http://michael.orlitzky.com/code/mailshears.php
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/pg-0.17[ruby_targets_ruby21] <dev-ruby/pg-1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/pg-0.17[ruby_targets_ruby22] <dev-ruby/pg-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/pg-0.17[ruby_targets_ruby22] <dev-ruby/pg-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/mailshears-0.0.3.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_=67dd6ae6048671b9ec772598cc301e45
diff --git a/metadata/md5-cache/net-misc/mikutter-3.4.2-r1 b/metadata/md5-cache/net-misc/mikutter-3.4.2-r1
index 433133c3a0f0..71313d9da248 100644
--- a/metadata/md5-cache/net-misc/mikutter-3.4.2-r1
+++ b/metadata/md5-cache/net-misc/mikutter-3.4.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] dev-ruby/delayer[ruby_targets_ruby21] dev-ruby/delayer-deferred[ruby_targets_ruby21] dev-ruby/httpclient[ruby_targets_ruby21] dev-ruby/json:0[ruby_targets_ruby21] dev-ruby/instance_storage[ruby_targets_ruby21] <dev-ruby/memoist-0.16[ruby_targets_ruby21] >=dev-ruby/moneta-0.7[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby21] dev-ruby/pluggaloid[ruby_targets_ruby21] dev-ruby/rcairo[ruby_targets_ruby21] >=dev-ruby/ruby-gettext-3.0.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby21] dev-ruby/ruby-hmac[ruby_targets_ruby21] dev-ruby/totoridipjp[ruby_targets_ruby21] dev-ruby/twitter-text[ruby_targets_ruby21] dev-ruby/typed-array[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] dev-ruby/delayer[ruby_targets_ruby22] dev-ruby/delayer-deferred[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/json:0[ruby_targets_ruby22] dev-ruby/instance_storage[ruby_targets_ruby22] <dev-ruby/memoist-0.16[ruby_targets_ruby22] >=dev-ruby/moneta-0.7[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby22] dev-ruby/pluggaloid[ruby_targets_ruby22] dev-ruby/rcairo[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby22] dev-ruby/ruby-hmac[ruby_targets_ruby22] dev-ruby/totoridipjp[ruby_targets_ruby22] dev-ruby/twitter-text[ruby_targets_ruby22] dev-ruby/typed-array[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] dev-ruby/delayer[ruby_targets_ruby22] dev-ruby/delayer-deferred[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/json:0[ruby_targets_ruby22] dev-ruby/instance_storage[ruby_targets_ruby22] <dev-ruby/memoist-0.16[ruby_targets_ruby22] >=dev-ruby/moneta-0.7[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby22] dev-ruby/pluggaloid[ruby_targets_ruby22] dev-ruby/rcairo[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby22] dev-ruby/ruby-hmac[ruby_targets_ruby22] dev-ruby/totoridipjp[ruby_targets_ruby22] dev-ruby/twitter-text[ruby_targets_ruby22] dev-ruby/typed-array[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=Simple, powerful and moeful twitter client
 EAPI=5
 HOMEPAGE=http://mikutter.hachune.net/
-IUSE=+libnotify test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=+libnotify test elibc_FreeBSD ruby_targets_ruby22
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] dev-ruby/delayer[ruby_targets_ruby21] dev-ruby/delayer-deferred[ruby_targets_ruby21] dev-ruby/httpclient[ruby_targets_ruby21] dev-ruby/json:0[ruby_targets_ruby21] dev-ruby/instance_storage[ruby_targets_ruby21] <dev-ruby/memoist-0.16[ruby_targets_ruby21] >=dev-ruby/moneta-0.7[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby21] dev-ruby/pluggaloid[ruby_targets_ruby21] dev-ruby/rcairo[ruby_targets_ruby21] >=dev-ruby/ruby-gettext-3.0.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby21] dev-ruby/ruby-hmac[ruby_targets_ruby21] dev-ruby/totoridipjp[ruby_targets_ruby21] dev-ruby/twitter-text[ruby_targets_ruby21] dev-ruby/typed-array[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] dev-ruby/delayer[ruby_targets_ruby22] dev-ruby/delayer-deferred[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/json:0[ruby_targets_ruby22] dev-ruby/instance_storage[ruby_targets_ruby22] <dev-ruby/memoist-0.16[ruby_targets_ruby22] >=dev-ruby/moneta-0.7[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby22] dev-ruby/pluggaloid[ruby_targets_ruby22] dev-ruby/rcairo[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby22] dev-ruby/ruby-hmac[ruby_targets_ruby22] dev-ruby/totoridipjp[ruby_targets_ruby22] dev-ruby/twitter-text[ruby_targets_ruby22] dev-ruby/typed-array[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] dev-ruby/delayer[ruby_targets_ruby22] dev-ruby/delayer-deferred[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/json:0[ruby_targets_ruby22] dev-ruby/instance_storage[ruby_targets_ruby22] <dev-ruby/memoist-0.16[ruby_targets_ruby22] >=dev-ruby/moneta-0.7[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby22] dev-ruby/pluggaloid[ruby_targets_ruby22] dev-ruby/rcairo[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby22] dev-ruby/ruby-hmac[ruby_targets_ruby22] dev-ruby/totoridipjp[ruby_targets_ruby22] dev-ruby/twitter-text[ruby_targets_ruby22] dev-ruby/typed-array[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://mikutter.hachune.net/bin/mikutter.3.4.2.tar.gz
 _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-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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=89abc37deb66daca6c8d59e2f1e4bb4d
diff --git a/metadata/md5-cache/net-misc/mikutter-3.5.4-r1 b/metadata/md5-cache/net-misc/mikutter-3.5.4-r1
index 61e296ab6bb2..191a96deb540 100644
--- a/metadata/md5-cache/net-misc/mikutter-3.5.4-r1
+++ b/metadata/md5-cache/net-misc/mikutter-3.5.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=http://mikutter.hachune.net/bin/mikutter.3.5.4.tar.gz
 _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-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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=16091dd53c26b714cc890df3a768b9c4
diff --git a/metadata/md5-cache/net-misc/mikutter-9999 b/metadata/md5-cache/net-misc/mikutter-9999
index fe8bc9aa50dc..7888eaf02b80 100644
--- a/metadata/md5-cache/net-misc/mikutter-9999
+++ b/metadata/md5-cache/net-misc/mikutter-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] dev-ruby/delayer[ruby_targets_ruby21] dev-ruby/delayer-deferred[ruby_targets_ruby21] dev-ruby/httpclient[ruby_targets_ruby21] dev-ruby/json:0[ruby_targets_ruby21] dev-ruby/instance_storage[ruby_targets_ruby21] dev-ruby/memoist[ruby_targets_ruby21] >=dev-ruby/moneta-0.7[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby21] dev-ruby/pluggaloid[ruby_targets_ruby21] dev-ruby/rcairo[ruby_targets_ruby21] >=dev-ruby/ruby-gettext-3.0.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby21] dev-ruby/ruby-hmac[ruby_targets_ruby21] dev-ruby/totoridipjp[ruby_targets_ruby21] dev-ruby/twitter-text[ruby_targets_ruby21] dev-ruby/typed-array[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] dev-ruby/delayer[ruby_targets_ruby22] dev-ruby/delayer-deferred[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/json:0[ruby_targets_ruby22] dev-ruby/instance_storage[ruby_targets_ruby22] dev-ruby/memoist[ruby_targets_ruby22] >=dev-ruby/moneta-0.7[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby22] dev-ruby/pluggaloid[ruby_targets_ruby22] dev-ruby/rcairo[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby22] dev-ruby/ruby-hmac[ruby_targets_ruby22] dev-ruby/totoridipjp[ruby_targets_ruby22] dev-ruby/twitter-text[ruby_targets_ruby22] dev-ruby/typed-array[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) dev-vcs/git
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] dev-ruby/delayer[ruby_targets_ruby22] dev-ruby/delayer-deferred[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/json:0[ruby_targets_ruby22] dev-ruby/instance_storage[ruby_targets_ruby22] dev-ruby/memoist[ruby_targets_ruby22] >=dev-ruby/moneta-0.7[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby22] dev-ruby/pluggaloid[ruby_targets_ruby22] dev-ruby/rcairo[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby22] dev-ruby/ruby-hmac[ruby_targets_ruby22] dev-ruby/totoridipjp[ruby_targets_ruby22] dev-ruby/twitter-text[ruby_targets_ruby22] dev-ruby/typed-array[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) dev-vcs/git
 DESCRIPTION=Simple, powerful and moeful twitter client
 EAPI=5
 HOMEPAGE=http://mikutter.hachune.net/
-IUSE=+libnotify test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=+libnotify test elibc_FreeBSD ruby_targets_ruby22
 LICENSE=GPL-3
-RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] dev-ruby/delayer[ruby_targets_ruby21] dev-ruby/delayer-deferred[ruby_targets_ruby21] dev-ruby/httpclient[ruby_targets_ruby21] dev-ruby/json:0[ruby_targets_ruby21] dev-ruby/instance_storage[ruby_targets_ruby21] dev-ruby/memoist[ruby_targets_ruby21] >=dev-ruby/moneta-0.7[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby21] dev-ruby/pluggaloid[ruby_targets_ruby21] dev-ruby/rcairo[ruby_targets_ruby21] >=dev-ruby/ruby-gettext-3.0.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby21] dev-ruby/ruby-hmac[ruby_targets_ruby21] dev-ruby/totoridipjp[ruby_targets_ruby21] dev-ruby/twitter-text[ruby_targets_ruby21] dev-ruby/typed-array[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] dev-ruby/delayer[ruby_targets_ruby22] dev-ruby/delayer-deferred[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/json:0[ruby_targets_ruby22] dev-ruby/instance_storage[ruby_targets_ruby22] dev-ruby/memoist[ruby_targets_ruby22] >=dev-ruby/moneta-0.7[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby22] dev-ruby/pluggaloid[ruby_targets_ruby22] dev-ruby/rcairo[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby22] dev-ruby/ruby-hmac[ruby_targets_ruby22] dev-ruby/totoridipjp[ruby_targets_ruby22] dev-ruby/twitter-text[ruby_targets_ruby22] dev-ruby/typed-array[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] dev-ruby/delayer[ruby_targets_ruby22] dev-ruby/delayer-deferred[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/json:0[ruby_targets_ruby22] dev-ruby/instance_storage[ruby_targets_ruby22] dev-ruby/memoist[ruby_targets_ruby22] >=dev-ruby/moneta-0.7[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby22] dev-ruby/pluggaloid[ruby_targets_ruby22] dev-ruby/rcairo[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.1[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby22] dev-ruby/ruby-hmac[ruby_targets_ruby22] dev-ruby/totoridipjp[ruby_targets_ruby22] dev-ruby/twitter-text[ruby_targets_ruby22] dev-ruby/typed-array[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:git-2 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	git-2	195a672bfaf52d868442171c9469bbb6	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-2	195a672bfaf52d868442171c9469bbb6	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f93c39c4befa0c0662df8a798d1e77cc
diff --git a/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109 b/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109
index 19ad7547dd23..ef42240d0dde 100644
--- a/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109
+++ b/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-libs/libnl:3= net-libs/libpcap
+DEPEND=ruby? ( ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-libs/libnl:3= net-libs/libpcap
 DESCRIPTION=A generic library for injecting 802.11 frames
 EAPI=5
 HOMEPAGE=http://802.11ninja.net/lorcon
-IUSE=python ruby python_targets_python2_7 elibc_FreeBSD ruby_targets_ruby21
+IUSE=python ruby python_targets_python2_7 elibc_FreeBSD
 KEYWORDS=amd64 arm ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-libs/libnl:3= net-libs/libpcap
+RDEPEND=ruby? ( ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-libs/libnl:3= net-libs/libpcap
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/lorcon-0.0_p20150109.tar.xz
 _eclass_exported_funcs=pkg_setup:- src_unpack:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	101cc3d4c2ccd96cb22d936a45789426
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	101cc3d4c2ccd96cb22d936a45789426
 _md5_=816a2a1327c4a7d02ef3157cc0938cf0
diff --git a/metadata/md5-cache/net-wireless/lorcon-9999 b/metadata/md5-cache/net-wireless/lorcon-9999
index 83f56e3d381f..fa9e0fe1172d 100644
--- a/metadata/md5-cache/net-wireless/lorcon-9999
+++ b/metadata/md5-cache/net-wireless/lorcon-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-libs/libnl:3= net-libs/libpcap >=dev-vcs/git-1.8.2.1
+DEPEND=ruby? ( ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-libs/libnl:3= net-libs/libpcap >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A generic library for injecting 802.11 frames
 EAPI=5
 HOMEPAGE=http://802.11ninja.net/lorcon
-IUSE=python ruby python_targets_python2_7 elibc_FreeBSD ruby_targets_ruby21
+IUSE=python ruby python_targets_python2_7 elibc_FreeBSD
 LICENSE=GPL-2
-RDEPEND=ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-libs/libnl:3= net-libs/libpcap
+RDEPEND=ruby? ( ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-libs/libnl:3= net-libs/libpcap
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 _eclass_exported_funcs=pkg_setup:- src_unpack:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-r3	cbafa3261c37c7e3af44bb16a34ea390	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	101cc3d4c2ccd96cb22d936a45789426
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-r3	cbafa3261c37c7e3af44bb16a34ea390	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	101cc3d4c2ccd96cb22d936a45789426
 _md5_=ada0f161927a7186d32c962216f0cf0c
diff --git a/metadata/md5-cache/sci-biology/bioruby-1.4.3.0001-r1 b/metadata/md5-cache/sci-biology/bioruby-1.4.3.0001-r1
index 29850ca96efd..5046e0148a81 100644
--- a/metadata/md5-cache/sci-biology/bioruby-1.4.3.0001-r1
+++ b/metadata/md5-cache/sci-biology/bioruby-1.4.3.0001-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/libxml[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/libxml[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=An integrated environment for bioinformatics using the Ruby language
 EAPI=5
 HOMEPAGE=http://bioruby.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=amd64 ~ppc x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/libxml[ruby_targets_ruby21] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/libxml[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=http://bioruby.org/archive/bioruby-1.4.3.0001.tar.gz
 _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
-_md5_=e8da8e69c8a12eed091a3b299fb0cd23
+_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_=0bff0c3e2db3a9967274e417280ca082
diff --git a/metadata/md5-cache/sci-biology/bioruby-1.5.1 b/metadata/md5-cache/sci-biology/bioruby-1.5.1
index 798632988c1f..589e0a80c5e7 100644
--- a/metadata/md5-cache/sci-biology/bioruby-1.5.1
+++ b/metadata/md5-cache/sci-biology/bioruby-1.5.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/libxml[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/libxml[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/libxml[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=test? ( ruby_targets_ruby22? ( dev-ruby/libxml[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/libxml[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=An integrated environment for bioinformatics using the Ruby language
 EAPI=6
 HOMEPAGE=http://bioruby.org/
-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 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/libxml[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/libxml[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/libxml[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/libxml[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/libxml[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/bio-1.5.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_=279e084b7a2a210af63381996d8b6488
diff --git a/metadata/md5-cache/sci-biology/bioruby-9999 b/metadata/md5-cache/sci-biology/bioruby-9999
deleted file mode 100644
index 578a41f1cdf6..000000000000
--- a/metadata/md5-cache/sci-biology/bioruby-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/libxml[ruby_targets_ruby21] ) ) dev-vcs/git ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=An integrated environment for bioinformatics using the Ruby language
-EAPI=5
-HOMEPAGE=http://bioruby.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 doc test test
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/libxml[ruby_targets_ruby21] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 )
-SLOT=0
-_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	git-2	195a672bfaf52d868442171c9469bbb6	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0722552bc2425246965750e9fa29c4e4
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.23.10 b/metadata/md5-cache/sci-electronics/klayout-0.23.10
index 1fa26713dbd4..020be9f5bffc 100644
--- a/metadata/md5-cache/sci-electronics/klayout-0.23.10
+++ b/metadata/md5-cache/sci-electronics/klayout-0.23.10
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-qt/designer:4 dev-qt/qtgui:4[qt3support] ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
+DEPEND=dev-qt/designer:4 dev-qt/qtgui:4[qt3support] ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=Viewer and editor for GDS and OASIS integrated circuit layouts
 EAPI=5
 HOMEPAGE=http://www.klayout.de/
-IUSE=elibc_FreeBSD ruby_targets_ruby21
+IUSE=elibc_FreeBSD ruby_targets_ruby22
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-qt/designer:4 dev-qt/qtgui:4[qt3support] ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 )
+RDEPEND=dev-qt/designer:4 dev-qt/qtgui:4[qt3support] ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://178.77.72.242/downloads/klayout-0.23.10.tar.gz
 _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-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=97a42248d7a260b1478f2e670b534d66
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=78bd5d84c78e8c8b9801826710589adc
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.24.10 b/metadata/md5-cache/sci-electronics/klayout-0.24.10
index 47d3f0c9702c..0a94d26d14f8 100644
--- a/metadata/md5-cache/sci-electronics/klayout-0.24.10
+++ b/metadata/md5-cache/sci-electronics/klayout-0.24.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://www.klayout.org/downloads/source/klayout-0.24.10.tar.gz
 _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-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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fcff8542a63378ca259367e9e5b86736
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.24.9 b/metadata/md5-cache/sci-electronics/klayout-0.24.9
deleted file mode 100644
index 520944db56b5..000000000000
--- a/metadata/md5-cache/sci-electronics/klayout-0.24.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-qt/designer:4 dev-qt/qtgui:4[qt3support] sys-libs/zlib ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
-DESCRIPTION=Viewer and editor for GDS and OASIS integrated circuit layouts
-EAPI=5
-HOMEPAGE=http://www.klayout.de/
-IUSE=elibc_FreeBSD ruby_targets_ruby21
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/designer:4 dev-qt/qtgui:4[qt3support] sys-libs/zlib ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=http://www.klayout.org/downloads/source/klayout-0.24.9.tar.gz
-_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-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=682ce74adecc68b0b8ec88e7804b3e63
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.5 b/metadata/md5-cache/sys-libs/libselinux-2.5
index df8afb210f85..8c45f0cc1dff 100644
--- a/metadata/md5-cache/sys-libs/libselinux-2.5
+++ b/metadata/md5-cache/sys-libs/libselinux-2.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )
+DEPEND=>=sys-libs/libsepol-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )
 DESCRIPTION=SELinux userland library
 EAPI=5
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=public-domain
-RDEPEND=>=sys-libs/libsepol-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
+RDEPEND=>=sys-libs/libsepol-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223/libselinux-2.5.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=bfb8e5c353fb08578b3e8aa5ce2bf36e
+_md5_=749c5747286cfddbf4162cbd19bd6922
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.5-r1 b/metadata/md5-cache/sys-libs/libselinux-2.5-r1
index 4cef9f9e48fd..305e2bcb4ce5 100644
--- a/metadata/md5-cache/sys-libs/libselinux-2.5-r1
+++ b/metadata/md5-cache/sys-libs/libselinux-2.5-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )
+DEPEND=>=sys-libs/libsepol-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )
 DESCRIPTION=SELinux userland library
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=public-domain
-RDEPEND=>=sys-libs/libsepol-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
+RDEPEND=>=sys-libs/libsepol-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223/libselinux-2.5.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=430611d306928f1793f4b5ebd4ec52f7
+_md5_=a210fb6b01811af414a3a2977dbd1c57
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.6 b/metadata/md5-cache/sys-libs/libselinux-2.6
index f51e57e627c2..f1faf46a1204 100644
--- a/metadata/md5-cache/sys-libs/libselinux-2.6
+++ b/metadata/md5-cache/sys-libs/libselinux-2.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-2.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )
+DEPEND=>=sys-libs/libsepol-2.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )
 DESCRIPTION=SELinux userland library
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=public-domain
-RDEPEND=>=sys-libs/libsepol-2.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
+RDEPEND=>=sys-libs/libsepol-2.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014/libselinux-2.6.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9c3fd16d640dd47ae2e12a01c2155587
+_md5_=6bcb9215dd68dd5de0227b17d2a55c89
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.7 b/metadata/md5-cache/sys-libs/libselinux-2.7
index 71ebf1e1334a..f3b09f0f3009 100644
--- a/metadata/md5-cache/sys-libs/libselinux-2.7
+++ b/metadata/md5-cache/sys-libs/libselinux-2.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-2.7:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )
+DEPEND=>=sys-libs/libsepol-2.7:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )
 DESCRIPTION=SELinux userland library
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=public-domain
-RDEPEND=>=sys-libs/libsepol-2.7:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
+RDEPEND=>=sys-libs/libsepol-2.7:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804/libselinux-2.7.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0e2acc9dddae51eb1d727b966c881a60
+_md5_=dd8a4b4a0630f20c672d5a96e4f35222
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.7_rc1 b/metadata/md5-cache/sys-libs/libselinux-2.7_rc1
index 8a7a37006618..a8a8a1976f34 100644
--- a/metadata/md5-cache/sys-libs/libselinux-2.7_rc1
+++ b/metadata/md5-cache/sys-libs/libselinux-2.7_rc1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-2.7_rc1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )
+DEPEND=>=sys-libs/libsepol-2.7_rc1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )
 DESCRIPTION=SELinux userland library
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=public-domain
-RDEPEND=>=sys-libs/libsepol-2.7_rc1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
+RDEPEND=>=sys-libs/libsepol-2.7_rc1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170609/libselinux-2.7-rc1.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4277852622e0aa44804bb9b6ac89394e
+_md5_=f72bd92ce10362adf3106d38c2f27b19
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.7_rc4 b/metadata/md5-cache/sys-libs/libselinux-2.7_rc4
index e6114d89d848..e4bb0108c606 100644
--- a/metadata/md5-cache/sys-libs/libselinux-2.7_rc4
+++ b/metadata/md5-cache/sys-libs/libselinux-2.7_rc4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-2.7_rc4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )
+DEPEND=>=sys-libs/libsepol-2.7_rc4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )
 DESCRIPTION=SELinux userland library
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=public-domain
-RDEPEND=>=sys-libs/libsepol-2.7_rc4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
+RDEPEND=>=sys-libs/libsepol-2.7_rc4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170630/libselinux-2.7-rc4.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=211eb0318a39a827ab80dedead1e261b
+_md5_=d80da87a406587de326f447d38223873
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.7_rc5 b/metadata/md5-cache/sys-libs/libselinux-2.7_rc5
index 0905584aa8bd..e54ff56392d3 100644
--- a/metadata/md5-cache/sys-libs/libselinux-2.7_rc5
+++ b/metadata/md5-cache/sys-libs/libselinux-2.7_rc5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-2.7_rc5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )
+DEPEND=>=sys-libs/libsepol-2.7_rc5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )
 DESCRIPTION=SELinux userland library
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=public-domain
-RDEPEND=>=sys-libs/libsepol-2.7_rc5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
+RDEPEND=>=sys-libs/libsepol-2.7_rc5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170718/libselinux-2.7-rc5.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2893b9802cc4dfc0fb7a62d45b3ee151
+_md5_=199f3692c36e37bf4250ea265302e9ce
diff --git a/metadata/md5-cache/sys-libs/libselinux-9999 b/metadata/md5-cache/sys-libs/libselinux-9999
index 6961a62a96c8..733c5798057d 100644
--- a/metadata/md5-cache/sys-libs/libselinux-9999
+++ b/metadata/md5-cache/sys-libs/libselinux-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=sys-libs/libsepol-9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 ) >=dev-vcs/git-1.8.2.1
+DEPEND=>=sys-libs/libsepol-9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=SELinux userland library
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=public-domain
-RDEPEND=>=sys-libs/libsepol-9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
+RDEPEND=>=sys-libs/libsepol-9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 _eclass_exported_funcs=pkg_postinst:- src_unpack:git-r3 src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=git-r3	cbafa3261c37c7e3af44bb16a34ea390	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0e2acc9dddae51eb1d727b966c881a60
+_md5_=dd8a4b4a0630f20c672d5a96e4f35222
diff --git a/metadata/md5-cache/virtual/ruby-ffi-3 b/metadata/md5-cache/virtual/ruby-ffi-3
index d892c92d3dc7..998f5f1a391a 100644
--- a/metadata/md5-cache/virtual/ruby-ffi-3
+++ b/metadata/md5-cache/virtual/ruby-ffi-3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=Virtual ebuild for the Ruby ffi library
 EAPI=5
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=elibc_FreeBSD ruby_targets_ruby22
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/ffi[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ffi[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/ffi[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- pkg_setup:- src_unpack:- src_prepare:- src_configure:ruby-ng src_compile:- src_test:ruby-ng src_install:-
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f67bbb2499463e903708a71494aaa8dc
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d8efd2c17904b94eae8610987a573f04
diff --git a/metadata/md5-cache/virtual/ruby-ffi-4 b/metadata/md5-cache/virtual/ruby-ffi-4
index cf8c3c6b1e6c..d59b0b282aaa 100644
--- a/metadata/md5-cache/virtual/ruby-ffi-4
+++ b/metadata/md5-cache/virtual/ruby-ffi-4
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=Virtual ebuild for the Ruby ffi library
 EAPI=5
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/ffi[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- pkg_setup:- src_unpack:- src_prepare:- src_configure:ruby-ng src_compile:- src_test:ruby-ng src_install:-
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=130e2fc95980629f34c0da92aa0569be
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e159f49cf299a7b841eaa2ce0093ac97
diff --git a/metadata/md5-cache/virtual/ruby-minitest-1 b/metadata/md5-cache/virtual/ruby-minitest-1
index 5513c017264b..6f56a15b120d 100644
--- a/metadata/md5-cache/virtual/ruby-minitest-1
+++ b/metadata/md5-cache/virtual/ruby-minitest-1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=Virtual ebuild for the Ruby minitest library
 EAPI=5
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=elibc_FreeBSD ruby_targets_ruby22
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-RDEPEND=ruby_targets_ruby21? ( || ( dev-ruby/minitest[ruby_targets_ruby21] dev-lang/ruby:2.1 ) ) ruby_targets_ruby22? ( || ( dev-ruby/minitest[ruby_targets_ruby22] dev-lang/ruby:2.2 ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby22? ( || ( dev-ruby/minitest[ruby_targets_ruby22] dev-lang/ruby:2.2 ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 _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-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=618b283754cf7b1e7fdb1ac669cb67ce
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=860471e076b4fabdc0c4ea6c41ed3e97
diff --git a/metadata/md5-cache/virtual/ruby-ssl-8 b/metadata/md5-cache/virtual/ruby-ssl-8
index 7c5837bb5024..56d12a661c13 100644
--- a/metadata/md5-cache/virtual/ruby-ssl-8
+++ b/metadata/md5-cache/virtual/ruby-ssl-8
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 DESCRIPTION=Virtual ebuild for the Ruby OpenSSL bindings
 EAPI=5
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1[ssl] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2[ssl] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3[ssl] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2[ssl] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3[ssl] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- pkg_setup:- src_unpack:- src_prepare:- src_configure:ruby-ng src_compile:- src_test:ruby-ng src_install:-
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=477bcf879618c30c0905225d27de4f90
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f452010b80d30883c5ac011be7746a60
diff --git a/metadata/md5-cache/virtual/ruby-ssl-9 b/metadata/md5-cache/virtual/ruby-ssl-9
index 4eddde438302..5420044d7121 100644
--- a/metadata/md5-cache/virtual/ruby-ssl-9
+++ b/metadata/md5-cache/virtual/ruby-ssl-9
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=Virtual ebuild for the Ruby OpenSSL bindings
 EAPI=5
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1[ssl] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2[ssl] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3[ssl] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4[ssl] ) 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_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2[ssl] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3[ssl] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4[ssl] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- pkg_setup:- src_unpack:- src_prepare:- src_configure:ruby-ng src_compile:- src_test:ruby-ng src_install:-
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2142fed79848de3ccb0b8596a990ba7e
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=faeb609888e8641b023cc134535f1ccc
diff --git a/metadata/md5-cache/virtual/rubygems-11 b/metadata/md5-cache/virtual/rubygems-11
index 1f8390c816cb..bfe71e59b0c6 100644
--- a/metadata/md5-cache/virtual/rubygems-11
+++ b/metadata/md5-cache/virtual/rubygems-11
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=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_rbx? ( dev-lang/rubinius )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_rbx? ( dev-lang/rubinius )
 DESCRIPTION=Virtual ebuild for rubygems
 EAPI=5
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_rbx
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_rbx
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=ruby_targets_rbx? ( dev-lang/rubinius ) ruby_targets_ruby21? ( >=dev-ruby/rubygems-2.0.14[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rubygems-2.4.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rubygems-2.5.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_rbx? ( dev-lang/rubinius )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_rbx )
+RDEPEND=ruby_targets_rbx? ( dev-lang/rubinius ) ruby_targets_ruby22? ( >=dev-ruby/rubygems-2.4.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rubygems-2.5.1[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_rbx? ( dev-lang/rubinius )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_rbx )
 SLOT=0
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- pkg_setup:- src_unpack:- src_prepare:- src_configure:ruby-ng src_compile:- src_test:ruby-ng src_install:-
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6d3b00e5d1694e98598ea0344178a3f0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=70ee7390fac1c7feac6ab08596f918da
diff --git a/metadata/md5-cache/virtual/rubygems-12 b/metadata/md5-cache/virtual/rubygems-12
index 13e0060afbda..a9323fc06462 100644
--- a/metadata/md5-cache/virtual/rubygems-12
+++ b/metadata/md5-cache/virtual/rubygems-12
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_rbx? ( dev-lang/rubinius )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_rbx? ( dev-lang/rubinius )
 DESCRIPTION=Virtual ebuild for rubygems
 EAPI=5
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_rbx
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_rbx
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=ruby_targets_rbx? ( dev-lang/rubinius ) ruby_targets_ruby21? ( >=dev-ruby/rubygems-2.0.14[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rubygems-2.4.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rubygems-2.5.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rubygems-2.6.8[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_rbx? ( dev-lang/rubinius )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_rbx )
+RDEPEND=ruby_targets_rbx? ( dev-lang/rubinius ) ruby_targets_ruby22? ( >=dev-ruby/rubygems-2.4.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rubygems-2.5.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rubygems-2.6.8[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_rbx? ( dev-lang/rubinius )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_rbx )
 SLOT=0
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- pkg_setup:- src_unpack:- src_prepare:- src_configure:ruby-ng src_compile:- src_test:ruby-ng src_install:-
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=51bec4f1f54472da4c428e0702a33303
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9001d280829614d6b53386e6504dd2d9
diff --git a/metadata/md5-cache/virtual/rubygems-13 b/metadata/md5-cache/virtual/rubygems-13
index 7022500198bf..c5f531e2d6b1 100644
--- a/metadata/md5-cache/virtual/rubygems-13
+++ b/metadata/md5-cache/virtual/rubygems-13
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_rbx? ( dev-lang/rubinius )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_rbx? ( dev-lang/rubinius )
 DESCRIPTION=Virtual ebuild for rubygems
 EAPI=5
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_rbx
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_rbx
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=ruby_targets_rbx? ( dev-lang/rubinius ) ruby_targets_ruby21? ( >=dev-ruby/rubygems-2.0.14[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rubygems-2.4.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rubygems-2.5.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rubygems-2.6.11[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_rbx? ( dev-lang/rubinius )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_rbx )
+RDEPEND=ruby_targets_rbx? ( dev-lang/rubinius ) ruby_targets_ruby22? ( >=dev-ruby/rubygems-2.4.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rubygems-2.5.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rubygems-2.6.11[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_rbx? ( dev-lang/rubinius )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_rbx )
 SLOT=0
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- pkg_setup:- src_unpack:- src_prepare:- src_configure:ruby-ng src_compile:- src_test:ruby-ng src_install:-
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=886a4abb7563bb9b67055986454ee769
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9c8976d240776ce1451ff78fd66f6ef8
diff --git a/metadata/md5-cache/www-apache/passenger-5.1.2 b/metadata/md5-cache/www-apache/passenger-5.1.2
index 486fe271b416..8a3e6a6721c1 100644
--- a/metadata/md5-cache/www-apache/passenger-5.1.2
+++ b/metadata/md5-cache/www-apache/passenger-5.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rake-0.8.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+DEPEND=ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
 EAPI=5
 HOMEPAGE=https://www.phusionpassenger.com/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
+IUSE=debug test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rake-0.8.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-5.1.2.tar.gz
 _eclass_exported_funcs=pkg_postinst:apache-module pkg_setup:- 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_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5efdfcab4587b0d7a89fc62f72e9c0c2
diff --git a/metadata/md5-cache/www-apache/passenger-5.1.6 b/metadata/md5-cache/www-apache/passenger-5.1.6
index 62857d5a2649..7e469bfa8c53 100644
--- a/metadata/md5-cache/www-apache/passenger-5.1.6
+++ b/metadata/md5-cache/www-apache/passenger-5.1.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rake-0.8.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) 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_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
 EAPI=6
 HOMEPAGE=https://www.phusionpassenger.com/
-IUSE=apache2 debug test apache2 elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=apache2 debug test apache2 elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rake-0.8.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) 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_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-5.1.6.tar.gz
 _eclass_exported_funcs=pkg_postinst:apache-module pkg_setup:- 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_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0f18cb84de60bb761ae7565f87ba9732
diff --git a/metadata/md5-cache/www-apache/passenger-5.1.7 b/metadata/md5-cache/www-apache/passenger-5.1.7
index 8fd5f346bc63..7f36ff252154 100644
--- a/metadata/md5-cache/www-apache/passenger-5.1.7
+++ b/metadata/md5-cache/www-apache/passenger-5.1.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rake-0.8.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) 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_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
 EAPI=6
 HOMEPAGE=https://www.phusionpassenger.com/
-IUSE=apache2 debug test apache2 elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=apache2 debug test apache2 elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rake-0.8.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) 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_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-5.1.7.tar.gz
 _eclass_exported_funcs=pkg_postinst:apache-module pkg_setup:- 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_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0f18cb84de60bb761ae7565f87ba9732
diff --git a/metadata/md5-cache/www-apps/jekyll-3.1.6-r1 b/metadata/md5-cache/www-apps/jekyll-3.1.6-r1
index 21fcf5d560ad..7bdedf46b4cf 100644
--- a/metadata/md5-cache/www-apps/jekyll-3.1.6-r1
+++ b/metadata/md5-cache/www-apps/jekyll-3.1.6-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( <dev-ruby/colorator-1.0[ruby_targets_ruby21] >=dev-ruby/kramdown-1.3[ruby_targets_ruby21] >=dev-ruby/liquid-3.0:3[ruby_targets_ruby21] >=dev-ruby/mercenary-0.3.3[ruby_targets_ruby21] >=dev-ruby/safe_yaml-1.0[ruby_targets_ruby21] >=dev-ruby/rouge-1.7:0[ruby_targets_ruby21] >=www-apps/jekyll-sass-converter-1.0[ruby_targets_ruby21] >=www-apps/jekyll-watch-1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( <dev-ruby/colorator-1.0[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] >=dev-ruby/liquid-3.0:3[ruby_targets_ruby22] >=dev-ruby/mercenary-0.3.3[ruby_targets_ruby22] >=dev-ruby/safe_yaml-1.0[ruby_targets_ruby22] >=dev-ruby/rouge-1.7:0[ruby_targets_ruby22] >=www-apps/jekyll-sass-converter-1.0[ruby_targets_ruby22] >=www-apps/jekyll-watch-1.1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec-mocks[ruby_targets_ruby21] dev-ruby/launchy[ruby_targets_ruby21] dev-ruby/mime-types:0[ruby_targets_ruby21] >=dev-ruby/rdiscount-2.0[ruby_targets_ruby21] >=dev-ruby/redcloth-4.2.1[ruby_targets_ruby21] >=dev-ruby/rouge-1.7[ruby_targets_ruby21] >=dev-ruby/shoulda-3[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-mocks[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] dev-ruby/mime-types:0[ruby_targets_ruby22] >=dev-ruby/rdiscount-2.0[ruby_targets_ruby22] >=dev-ruby/redcloth-4.2.1[ruby_targets_ruby22] >=dev-ruby/rouge-1.7[ruby_targets_ruby22] >=dev-ruby/shoulda-3[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( <dev-ruby/colorator-1.0[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] >=dev-ruby/liquid-3.0:3[ruby_targets_ruby22] >=dev-ruby/mercenary-0.3.3[ruby_targets_ruby22] >=dev-ruby/safe_yaml-1.0[ruby_targets_ruby22] >=dev-ruby/rouge-1.7:0[ruby_targets_ruby22] >=www-apps/jekyll-sass-converter-1.0[ruby_targets_ruby22] >=www-apps/jekyll-watch-1.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-mocks[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] dev-ruby/mime-types:0[ruby_targets_ruby22] >=dev-ruby/rdiscount-2.0[ruby_targets_ruby22] >=dev-ruby/redcloth-4.2.1[ruby_targets_ruby22] >=dev-ruby/rouge-1.7[ruby_targets_ruby22] >=dev-ruby/shoulda-3[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=A simple, blog aware, static site generator
 EAPI=5
 HOMEPAGE=http://jekyllrb.com https://github.com/jekyll/jekyll
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( <dev-ruby/colorator-1.0[ruby_targets_ruby21] >=dev-ruby/kramdown-1.3[ruby_targets_ruby21] >=dev-ruby/liquid-3.0:3[ruby_targets_ruby21] >=dev-ruby/mercenary-0.3.3[ruby_targets_ruby21] >=dev-ruby/safe_yaml-1.0[ruby_targets_ruby21] >=dev-ruby/rouge-1.7:0[ruby_targets_ruby21] >=www-apps/jekyll-sass-converter-1.0[ruby_targets_ruby21] >=www-apps/jekyll-watch-1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( <dev-ruby/colorator-1.0[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] >=dev-ruby/liquid-3.0:3[ruby_targets_ruby22] >=dev-ruby/mercenary-0.3.3[ruby_targets_ruby22] >=dev-ruby/safe_yaml-1.0[ruby_targets_ruby22] >=dev-ruby/rouge-1.7:0[ruby_targets_ruby22] >=www-apps/jekyll-sass-converter-1.0[ruby_targets_ruby22] >=www-apps/jekyll-watch-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/colorator-1.0[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] >=dev-ruby/liquid-3.0:3[ruby_targets_ruby22] >=dev-ruby/mercenary-0.3.3[ruby_targets_ruby22] >=dev-ruby/safe_yaml-1.0[ruby_targets_ruby22] >=dev-ruby/rouge-1.7:0[ruby_targets_ruby22] >=www-apps/jekyll-sass-converter-1.0[ruby_targets_ruby22] >=www-apps/jekyll-watch-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=https://github.com/jekyll/jekyll/archive/v3.1.6.tar.gz -> jekyll-3.1.6.tar.gz
 _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_=a1162b7080817b6105879d486ebd1520
diff --git a/metadata/md5-cache/www-apps/jekyll-3.2.1-r2 b/metadata/md5-cache/www-apps/jekyll-3.2.1-r2
index 0943613f40fa..f8643a26dfa0 100644
--- a/metadata/md5-cache/www-apps/jekyll-3.2.1-r2
+++ b/metadata/md5-cache/www-apps/jekyll-3.2.1-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/colorator-1.0[ruby_targets_ruby21] >=dev-ruby/kramdown-1.3[ruby_targets_ruby21] >=dev-ruby/liquid-3.0:3[ruby_targets_ruby21] >=dev-ruby/mercenary-0.3.3[ruby_targets_ruby21] >=dev-ruby/pathutil-0.9[ruby_targets_ruby21] >=dev-ruby/safe_yaml-1.0[ruby_targets_ruby21] >=dev-ruby/rouge-1.7:0[ruby_targets_ruby21] >=www-apps/jekyll-sass-converter-1.0[ruby_targets_ruby21] >=www-apps/jekyll-watch-1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/colorator-1.0[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] >=dev-ruby/liquid-3.0:3[ruby_targets_ruby22] >=dev-ruby/mercenary-0.3.3[ruby_targets_ruby22] >=dev-ruby/pathutil-0.9[ruby_targets_ruby22] >=dev-ruby/safe_yaml-1.0[ruby_targets_ruby22] >=dev-ruby/rouge-1.7:0[ruby_targets_ruby22] >=www-apps/jekyll-sass-converter-1.0[ruby_targets_ruby22] >=www-apps/jekyll-watch-1.1[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec-mocks[ruby_targets_ruby21] dev-ruby/launchy[ruby_targets_ruby21] dev-ruby/mime-types:0[ruby_targets_ruby21] >=dev-ruby/rdiscount-2.0[ruby_targets_ruby21] >=dev-ruby/redcloth-4.2.1[ruby_targets_ruby21] >=dev-ruby/rouge-1.7[ruby_targets_ruby21] >=dev-ruby/shoulda-3[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-mocks[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] dev-ruby/mime-types:0[ruby_targets_ruby22] >=dev-ruby/rdiscount-2.0[ruby_targets_ruby22] >=dev-ruby/redcloth-4.2.1[ruby_targets_ruby22] >=dev-ruby/rouge-1.7[ruby_targets_ruby22] >=dev-ruby/shoulda-3[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=test? ( ruby_targets_ruby22? ( >=dev-ruby/colorator-1.0[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] >=dev-ruby/liquid-3.0:3[ruby_targets_ruby22] >=dev-ruby/mercenary-0.3.3[ruby_targets_ruby22] >=dev-ruby/pathutil-0.9[ruby_targets_ruby22] >=dev-ruby/safe_yaml-1.0[ruby_targets_ruby22] >=dev-ruby/rouge-1.7:0[ruby_targets_ruby22] >=www-apps/jekyll-sass-converter-1.0[ruby_targets_ruby22] >=www-apps/jekyll-watch-1.1[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-mocks[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] dev-ruby/mime-types:0[ruby_targets_ruby22] >=dev-ruby/rdiscount-2.0[ruby_targets_ruby22] >=dev-ruby/redcloth-4.2.1[ruby_targets_ruby22] >=dev-ruby/rouge-1.7[ruby_targets_ruby22] >=dev-ruby/shoulda-3[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=A simple, blog aware, static site generator
 EAPI=5
 HOMEPAGE=http://jekyllrb.com https://github.com/jekyll/jekyll
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/colorator-1.0[ruby_targets_ruby21] >=dev-ruby/kramdown-1.3[ruby_targets_ruby21] >=dev-ruby/liquid-3.0:3[ruby_targets_ruby21] >=dev-ruby/mercenary-0.3.3[ruby_targets_ruby21] >=dev-ruby/pathutil-0.9[ruby_targets_ruby21] >=dev-ruby/safe_yaml-1.0[ruby_targets_ruby21] >=dev-ruby/rouge-1.7:0[ruby_targets_ruby21] >=www-apps/jekyll-sass-converter-1.0[ruby_targets_ruby21] >=www-apps/jekyll-watch-1.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/colorator-1.0[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] >=dev-ruby/liquid-3.0:3[ruby_targets_ruby22] >=dev-ruby/mercenary-0.3.3[ruby_targets_ruby22] >=dev-ruby/pathutil-0.9[ruby_targets_ruby22] >=dev-ruby/safe_yaml-1.0[ruby_targets_ruby22] >=dev-ruby/rouge-1.7:0[ruby_targets_ruby22] >=www-apps/jekyll-sass-converter-1.0[ruby_targets_ruby22] >=www-apps/jekyll-watch-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/colorator-1.0[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] >=dev-ruby/liquid-3.0:3[ruby_targets_ruby22] >=dev-ruby/mercenary-0.3.3[ruby_targets_ruby22] >=dev-ruby/pathutil-0.9[ruby_targets_ruby22] >=dev-ruby/safe_yaml-1.0[ruby_targets_ruby22] >=dev-ruby/rouge-1.7:0[ruby_targets_ruby22] >=www-apps/jekyll-sass-converter-1.0[ruby_targets_ruby22] >=www-apps/jekyll-watch-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=https://github.com/jekyll/jekyll/archive/v3.2.1.tar.gz -> jekyll-3.2.1.tar.gz
 _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_=210297a1afe63248961cb2a6d5f1a405
diff --git a/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1 b/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1
index 03bc2d5efd81..bef06bb5782a 100644
--- a/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1
+++ b/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/coffee-script[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/coffee-script[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( www-apps/jekyll[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( www-apps/jekyll[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/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_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? ( ruby_targets_ruby22? ( dev-ruby/coffee-script[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( www-apps/jekyll[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A CoffeeScript Converter for Jekyll
 EAPI=5
 HOMEPAGE=https://github.com/jekyll/jekyll-coffeescript
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/coffee-script[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/coffee-script[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/coffee-script[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=https://github.com/jekyll/jekyll-coffeescript/archive/v1.0.1.tar.gz -> jekyll-coffeescript-1.0.1.tar.gz
 _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_=d24d43b00751243f1cf3d98c7152d430
diff --git a/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.2 b/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.2
index 799aa62a3ec9..dd5042bf1cef 100644
--- a/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.2
+++ b/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/coffee-script-2.2[ruby_targets_ruby21] <dev-ruby/coffee-script-3[ruby_targets_ruby21] >=dev-ruby/coffee-script-source-1.11.1[ruby_targets_ruby21] <dev-ruby/coffee-script-source-1.12[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/coffee-script-2.2[ruby_targets_ruby22] <dev-ruby/coffee-script-3[ruby_targets_ruby22] >=dev-ruby/coffee-script-source-1.11.1[ruby_targets_ruby22] <dev-ruby/coffee-script-source-1.12[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( www-apps/jekyll[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( www-apps/jekyll[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/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_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? ( ruby_targets_ruby22? ( >=dev-ruby/coffee-script-2.2[ruby_targets_ruby22] <dev-ruby/coffee-script-3[ruby_targets_ruby22] >=dev-ruby/coffee-script-source-1.11.1[ruby_targets_ruby22] <dev-ruby/coffee-script-source-1.12[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( www-apps/jekyll[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A CoffeeScript Converter for Jekyll
 EAPI=5
 HOMEPAGE=https://github.com/jekyll/jekyll-coffeescript
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/coffee-script-2.2[ruby_targets_ruby21] <dev-ruby/coffee-script-3[ruby_targets_ruby21] >=dev-ruby/coffee-script-source-1.11.1[ruby_targets_ruby21] <dev-ruby/coffee-script-source-1.12[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/coffee-script-2.2[ruby_targets_ruby22] <dev-ruby/coffee-script-3[ruby_targets_ruby22] >=dev-ruby/coffee-script-source-1.11.1[ruby_targets_ruby22] <dev-ruby/coffee-script-source-1.12[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/coffee-script-2.2[ruby_targets_ruby22] <dev-ruby/coffee-script-3[ruby_targets_ruby22] >=dev-ruby/coffee-script-source-1.11.1[ruby_targets_ruby22] <dev-ruby/coffee-script-source-1.12[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=https://github.com/jekyll/jekyll-coffeescript/archive/v1.0.2.tar.gz -> jekyll-coffeescript-1.0.2.tar.gz
 _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_=21b75fecadcef3898d59d1a03dccbb29
diff --git a/metadata/md5-cache/www-apps/jekyll-gist-1.4.0 b/metadata/md5-cache/www-apps/jekyll-gist-1.4.0
index 0fa0279f1af9..193b7d44b799 100644
--- a/metadata/md5-cache/www-apps/jekyll-gist-1.4.0
+++ b/metadata/md5-cache/www-apps/jekyll-gist-1.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/octokit-4.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/octokit-4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/webmock[ruby_targets_ruby21] >=www-apps/jekyll-2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock[ruby_targets_ruby22] >=www-apps/jekyll-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/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( >=dev-ruby/octokit-4.2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock[ruby_targets_ruby22] >=www-apps/jekyll-2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Liquid tag for displaying GitHub Gists in Jekyll sites
 EAPI=5
 HOMEPAGE=https://github.com/jekyll/jekyll-gist
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/octokit-4.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/octokit-4.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/octokit-4.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=https://github.com/jekyll/jekyll-gist/archive/v1.4.0.tar.gz -> jekyll-gist-1.4.0.tar.gz
 _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_=fbd9fcccff56d2eda3f31808d7f4ccb6
diff --git a/metadata/md5-cache/www-apps/jekyll-sass-converter-1.4.0 b/metadata/md5-cache/www-apps/jekyll-sass-converter-1.4.0
index c061d0ef126d..e8433de6cabc 100644
--- a/metadata/md5-cache/www-apps/jekyll-sass-converter-1.4.0
+++ b/metadata/md5-cache/www-apps/jekyll-sass-converter-1.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/sass:3.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/sass:3.4[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=www-apps/jekyll-2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=www-apps/jekyll-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/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( dev-ruby/sass:3.4[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=www-apps/jekyll-2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A basic Sass converter for Jekyll
 EAPI=5
 HOMEPAGE=https://github.com/jekyll/jekyll-sass-converter
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/sass:3.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/sass:3.4[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/sass:3.4[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=https://github.com/jekyll/jekyll-sass-converter/archive/v1.4.0.tar.gz -> jekyll-sass-converter-1.4.0.tar.gz
 _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_=9804a855d19847082858ba1b84063590
diff --git a/metadata/md5-cache/www-apps/jekyll-sass-converter-1.5.0 b/metadata/md5-cache/www-apps/jekyll-sass-converter-1.5.0
index 019a009f1c03..9678688334b3 100644
--- a/metadata/md5-cache/www-apps/jekyll-sass-converter-1.5.0
+++ b/metadata/md5-cache/www-apps/jekyll-sass-converter-1.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/sass:3.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/sass:3.4[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=www-apps/jekyll-2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=www-apps/jekyll-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/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( dev-ruby/sass:3.4[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=www-apps/jekyll-2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A basic Sass converter for Jekyll
 EAPI=5
 HOMEPAGE=https://github.com/jekyll/jekyll-sass-converter
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/sass:3.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/sass:3.4[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/sass:3.4[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=https://github.com/jekyll/jekyll-sass-converter/archive/v1.5.0.tar.gz -> jekyll-sass-converter-1.5.0.tar.gz
 _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_=459bdfff3d9594d7ecbd68738dbd5957
diff --git a/metadata/md5-cache/www-apps/jekyll-sitemap-0.11.0 b/metadata/md5-cache/www-apps/jekyll-sitemap-0.11.0
index be98fcbea219..0fa5570a4e85 100644
--- a/metadata/md5-cache/www-apps/jekyll-sitemap-0.11.0
+++ b/metadata/md5-cache/www-apps/jekyll-sitemap-0.11.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( test? ( >=www-apps/jekyll-2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=www-apps/jekyll-2[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4.0[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/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( >=www-apps/jekyll-2[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Automatically generate a sitemap.xml for your Jekyll site
 EAPI=5
 HOMEPAGE=https://github.com/jekyll/jekyll-sitemap
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4.0[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/addressable-2.4.0[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=https://github.com/jekyll/jekyll-sitemap/archive/v0.11.0.tar.gz -> jekyll-sitemap-0.11.0.tar.gz
 _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_=9efc44aa681b2a63bef858fd438050c6
diff --git a/metadata/md5-cache/www-apps/jekyll-watch-1.3.1 b/metadata/md5-cache/www-apps/jekyll-watch-1.3.1
index 2eda79d2e690..69f4265e7587 100644
--- a/metadata/md5-cache/www-apps/jekyll-watch-1.3.1
+++ b/metadata/md5-cache/www-apps/jekyll-watch-1.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/listen-3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/listen-3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=www-apps/jekyll-2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=www-apps/jekyll-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/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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? ( ruby_targets_ruby22? ( >=dev-ruby/listen-3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=www-apps/jekyll-2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Rebuild your Jekyll site when a file changes with the --watch switch
 EAPI=5
 HOMEPAGE=https://github.com/jekyll/jekyll-watch
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/listen-3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/listen-3.0[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/listen-3.0[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=https://github.com/jekyll/jekyll-watch/archive/v1.3.1.tar.gz -> jekyll-watch-1.3.1.tar.gz
 _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_=7db33bc72eb8037c9d3afc43ca406471
diff --git a/metadata/md5-cache/www-apps/nanoc-4.3.5 b/metadata/md5-cache/www-apps/nanoc-4.3.5
index 8cec9106b13e..9a8fc7a16f75 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.3.5
+++ b/metadata/md5-cache/www-apps/nanoc-4.3.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-text/asciidoc app-text/highlight ) test? ( ruby_targets_ruby21? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby21] dev-ruby/rack:*[ruby_targets_ruby21] www-servers/adsf[ruby_targets_ruby21] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby21] =dev-ruby/hamster-3*[ruby_targets_ruby21] dev-ruby/ref:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] dev-ruby/ref:2[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] =dev-ruby/rdoc-4*[ruby_targets_ruby21] dev-ruby/systemu[ruby_targets_ruby21] dev-ruby/vcr[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby21] dev-ruby/rdiscount[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] =dev-ruby/rdoc-4*[ruby_targets_ruby22] dev-ruby/systemu[ruby_targets_ruby22] dev-ruby/vcr[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=test? ( app-text/asciidoc app-text/highlight ) test? ( ruby_targets_ruby22? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] dev-ruby/ref:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] =dev-ruby/rdoc-4*[ruby_targets_ruby22] dev-ruby/systemu[ruby_targets_ruby22] dev-ruby/vcr[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=nanoc is a simple but very flexible static site generator written in Ruby
 EAPI=5
 HOMEPAGE=http://nanoc.ws/
-IUSE=minimal test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=minimal test elibc_FreeBSD ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby21] dev-ruby/rack:*[ruby_targets_ruby21] www-servers/adsf[ruby_targets_ruby21] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby21] =dev-ruby/hamster-3*[ruby_targets_ruby21] dev-ruby/ref:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] dev-ruby/ref: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? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] dev-ruby/ref: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/nanoc-4.3.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_=ba04815164eca853190fad49bb374e83
diff --git a/metadata/md5-cache/www-apps/nanoc-4.3.8 b/metadata/md5-cache/www-apps/nanoc-4.3.8
index 4dc4c3ae4292..f9749835539f 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.3.8
+++ b/metadata/md5-cache/www-apps/nanoc-4.3.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-text/asciidoc app-text/highlight ) test? ( ruby_targets_ruby21? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby21] dev-ruby/rack:*[ruby_targets_ruby21] www-servers/adsf[ruby_targets_ruby21] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby21] =dev-ruby/hamster-3*[ruby_targets_ruby21] >=dev-ruby/parallel-1.9:1[ruby_targets_ruby21] dev-ruby/ref:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] >=dev-ruby/parallel-1.9:1[ruby_targets_ruby22] dev-ruby/ref:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/rack:*[ruby_targets_ruby23] www-servers/adsf[ruby_targets_ruby23] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby23] =dev-ruby/hamster-3*[ruby_targets_ruby23] >=dev-ruby/parallel-1.9:1[ruby_targets_ruby23] dev-ruby/ref:2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] dev-ruby/systemu[ruby_targets_ruby21] dev-ruby/vcr[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby21] dev-ruby/rdiscount[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/systemu[ruby_targets_ruby22] dev-ruby/vcr[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/systemu[ruby_targets_ruby23] dev-ruby/vcr[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] dev-ruby/yard[ruby_targets_ruby23] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/yard[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/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=test? ( app-text/asciidoc app-text/highlight ) test? ( ruby_targets_ruby22? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] >=dev-ruby/parallel-1.9:1[ruby_targets_ruby22] dev-ruby/ref:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/rack:*[ruby_targets_ruby23] www-servers/adsf[ruby_targets_ruby23] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby23] =dev-ruby/hamster-3*[ruby_targets_ruby23] >=dev-ruby/parallel-1.9:1[ruby_targets_ruby23] dev-ruby/ref:2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/systemu[ruby_targets_ruby22] dev-ruby/vcr[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/systemu[ruby_targets_ruby23] dev-ruby/vcr[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] dev-ruby/yard[ruby_targets_ruby23] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/yard[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/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=nanoc is a simple but very flexible static site generator written in Ruby
 EAPI=5
 HOMEPAGE=http://nanoc.ws/
-IUSE=minimal test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=minimal test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby21] dev-ruby/rack:*[ruby_targets_ruby21] www-servers/adsf[ruby_targets_ruby21] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby21] =dev-ruby/hamster-3*[ruby_targets_ruby21] >=dev-ruby/parallel-1.9:1[ruby_targets_ruby21] dev-ruby/ref:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] >=dev-ruby/parallel-1.9:1[ruby_targets_ruby22] dev-ruby/ref:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/rack:*[ruby_targets_ruby23] www-servers/adsf[ruby_targets_ruby23] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby23] =dev-ruby/hamster-3*[ruby_targets_ruby23] >=dev-ruby/parallel-1.9:1[ruby_targets_ruby23] dev-ruby/ref: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? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] >=dev-ruby/parallel-1.9:1[ruby_targets_ruby22] dev-ruby/ref:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/rack:*[ruby_targets_ruby23] www-servers/adsf[ruby_targets_ruby23] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby23] =dev-ruby/hamster-3*[ruby_targets_ruby23] >=dev-ruby/parallel-1.9:1[ruby_targets_ruby23] dev-ruby/ref: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/nanoc-4.3.8.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_=0c6874ca5fc75bf88a7fa1e743d37557
diff --git a/metadata/md5-cache/www-apps/nanoc-4.4.7 b/metadata/md5-cache/www-apps/nanoc-4.4.7
index 70259daef8d9..ff055045d5b0 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.4.7
+++ b/metadata/md5-cache/www-apps/nanoc-4.4.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-text/asciidoc app-text/highlight ) test? ( ruby_targets_ruby21? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby21] dev-ruby/rack:*[ruby_targets_ruby21] www-servers/adsf[ruby_targets_ruby21] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby21] =dev-ruby/hamster-3*[ruby_targets_ruby21] dev-ruby/ref:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] dev-ruby/ref:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/rack:*[ruby_targets_ruby23] www-servers/adsf[ruby_targets_ruby23] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby23] =dev-ruby/hamster-3*[ruby_targets_ruby23] dev-ruby/ref:2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] dev-ruby/systemu[ruby_targets_ruby21] dev-ruby/vcr[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby21] dev-ruby/rdiscount[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/systemu[ruby_targets_ruby22] dev-ruby/vcr[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/systemu[ruby_targets_ruby23] dev-ruby/vcr[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] dev-ruby/yard[ruby_targets_ruby23] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/yard[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/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=test? ( app-text/asciidoc app-text/highlight ) test? ( ruby_targets_ruby22? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] dev-ruby/ref:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/rack:*[ruby_targets_ruby23] www-servers/adsf[ruby_targets_ruby23] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby23] =dev-ruby/hamster-3*[ruby_targets_ruby23] dev-ruby/ref:2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/systemu[ruby_targets_ruby22] dev-ruby/vcr[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/systemu[ruby_targets_ruby23] dev-ruby/vcr[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] dev-ruby/yard[ruby_targets_ruby23] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/yard[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/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=nanoc is a simple but very flexible static site generator written in Ruby
 EAPI=5
 HOMEPAGE=http://nanoc.ws/
-IUSE=minimal test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=minimal test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby21] dev-ruby/rack:*[ruby_targets_ruby21] www-servers/adsf[ruby_targets_ruby21] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby21] =dev-ruby/hamster-3*[ruby_targets_ruby21] dev-ruby/ref:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] dev-ruby/ref:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/rack:*[ruby_targets_ruby23] www-servers/adsf[ruby_targets_ruby23] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby23] =dev-ruby/hamster-3*[ruby_targets_ruby23] dev-ruby/ref: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? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] dev-ruby/ref:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/rack:*[ruby_targets_ruby23] www-servers/adsf[ruby_targets_ruby23] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby23] =dev-ruby/hamster-3*[ruby_targets_ruby23] dev-ruby/ref: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/nanoc-4.4.7.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_=1f82f705e73ecaa5d1f853f94824f91d
diff --git a/metadata/md5-cache/www-apps/nanoc-4.5.4 b/metadata/md5-cache/www-apps/nanoc-4.5.4
index 77c460245e37..c4c514b0b494 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.5.4
+++ b/metadata/md5-cache/www-apps/nanoc-4.5.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-text/asciidoc app-text/highlight ) test? ( ruby_targets_ruby21? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby21] dev-ruby/rack:*[ruby_targets_ruby21] www-servers/adsf[ruby_targets_ruby21] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby21] dev-ruby/ddplugin:1[ruby_targets_ruby21] =dev-ruby/hamster-3*[ruby_targets_ruby21] dev-ruby/ref:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] dev-ruby/ddplugin:1[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] dev-ruby/ref:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/rack:*[ruby_targets_ruby23] www-servers/adsf[ruby_targets_ruby23] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby23] dev-ruby/ddplugin:1[ruby_targets_ruby23] =dev-ruby/hamster-3*[ruby_targets_ruby23] dev-ruby/ref:2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] dev-ruby/systemu[ruby_targets_ruby21] dev-ruby/vcr[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby21] dev-ruby/rdiscount[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/systemu[ruby_targets_ruby22] dev-ruby/vcr[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/systemu[ruby_targets_ruby23] dev-ruby/vcr[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] dev-ruby/yard[ruby_targets_ruby23] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/yard[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/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=test? ( app-text/asciidoc app-text/highlight ) test? ( ruby_targets_ruby22? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] dev-ruby/ddplugin:1[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] dev-ruby/ref:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/rack:*[ruby_targets_ruby23] www-servers/adsf[ruby_targets_ruby23] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby23] dev-ruby/ddplugin:1[ruby_targets_ruby23] =dev-ruby/hamster-3*[ruby_targets_ruby23] dev-ruby/ref:2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/systemu[ruby_targets_ruby22] dev-ruby/vcr[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/systemu[ruby_targets_ruby23] dev-ruby/vcr[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] dev-ruby/yard[ruby_targets_ruby23] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/yard[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/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=nanoc is a simple but very flexible static site generator written in Ruby
 EAPI=5
 HOMEPAGE=http://nanoc.ws/
-IUSE=minimal test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=minimal test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby21] dev-ruby/rack:*[ruby_targets_ruby21] www-servers/adsf[ruby_targets_ruby21] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby21] dev-ruby/ddplugin:1[ruby_targets_ruby21] =dev-ruby/hamster-3*[ruby_targets_ruby21] dev-ruby/ref:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] dev-ruby/ddplugin:1[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] dev-ruby/ref:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/rack:*[ruby_targets_ruby23] www-servers/adsf[ruby_targets_ruby23] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby23] dev-ruby/ddplugin:1[ruby_targets_ruby23] =dev-ruby/hamster-3*[ruby_targets_ruby23] dev-ruby/ref: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? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] dev-ruby/ddplugin:1[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] dev-ruby/ref:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/rack:*[ruby_targets_ruby23] www-servers/adsf[ruby_targets_ruby23] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby23] dev-ruby/ddplugin:1[ruby_targets_ruby23] =dev-ruby/hamster-3*[ruby_targets_ruby23] dev-ruby/ref: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/nanoc-4.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_=9c997cf1efe8ca4cb5bdc9450e971a1a
diff --git a/metadata/md5-cache/www-apps/nanoc-4.6.4 b/metadata/md5-cache/www-apps/nanoc-4.6.4
index 5469395137cd..02e8c8cf393d 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.6.4
+++ b/metadata/md5-cache/www-apps/nanoc-4.6.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-text/asciidoc app-text/highlight ) test? ( ruby_targets_ruby21? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby21] dev-ruby/rack:*[ruby_targets_ruby21] www-servers/adsf[ruby_targets_ruby21] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby21] dev-ruby/ddplugin:1[ruby_targets_ruby21] =dev-ruby/hamster-3*[ruby_targets_ruby21] dev-ruby/ref:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] dev-ruby/ddplugin:1[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] dev-ruby/ref:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/rack:*[ruby_targets_ruby23] www-servers/adsf[ruby_targets_ruby23] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby23] dev-ruby/ddplugin:1[ruby_targets_ruby23] =dev-ruby/hamster-3*[ruby_targets_ruby23] dev-ruby/ref:2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] dev-ruby/systemu[ruby_targets_ruby21] dev-ruby/vcr[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby21] dev-ruby/rdiscount[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/systemu[ruby_targets_ruby22] dev-ruby/vcr[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/systemu[ruby_targets_ruby23] dev-ruby/vcr[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] dev-ruby/yard[ruby_targets_ruby23] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/yard[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/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=test? ( app-text/asciidoc app-text/highlight ) test? ( ruby_targets_ruby22? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] dev-ruby/ddplugin:1[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] dev-ruby/ref:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/rack:*[ruby_targets_ruby23] www-servers/adsf[ruby_targets_ruby23] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby23] dev-ruby/ddplugin:1[ruby_targets_ruby23] =dev-ruby/hamster-3*[ruby_targets_ruby23] dev-ruby/ref:2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/systemu[ruby_targets_ruby22] dev-ruby/vcr[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/systemu[ruby_targets_ruby23] dev-ruby/vcr[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] dev-ruby/yard[ruby_targets_ruby23] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/yard[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/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=nanoc is a simple but very flexible static site generator written in Ruby
 EAPI=5
 HOMEPAGE=https://nanoc.ws/
-IUSE=minimal test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=minimal test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby21] dev-ruby/rack:*[ruby_targets_ruby21] www-servers/adsf[ruby_targets_ruby21] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby21] dev-ruby/ddplugin:1[ruby_targets_ruby21] =dev-ruby/hamster-3*[ruby_targets_ruby21] dev-ruby/ref:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] dev-ruby/ddplugin:1[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] dev-ruby/ref:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/rack:*[ruby_targets_ruby23] www-servers/adsf[ruby_targets_ruby23] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby23] dev-ruby/ddplugin:1[ruby_targets_ruby23] =dev-ruby/hamster-3*[ruby_targets_ruby23] dev-ruby/ref: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? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/rack:*[ruby_targets_ruby22] www-servers/adsf[ruby_targets_ruby22] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby22] dev-ruby/ddplugin:1[ruby_targets_ruby22] =dev-ruby/hamster-3*[ruby_targets_ruby22] dev-ruby/ref:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/rack:*[ruby_targets_ruby23] www-servers/adsf[ruby_targets_ruby23] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby23] dev-ruby/ddplugin:1[ruby_targets_ruby23] =dev-ruby/hamster-3*[ruby_targets_ruby23] dev-ruby/ref: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/nanoc-4.6.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_=b1fb932a06b07ab6dfa445077d187613
diff --git a/metadata/md5-cache/www-apps/nanoc-4.7.14 b/metadata/md5-cache/www-apps/nanoc-4.7.14
index 860b1f75807b..8664d2ae7771 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.7.14
+++ b/metadata/md5-cache/www-apps/nanoc-4.7.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/nanoc-4.7.14.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_=755ec5077147243acc5944d5ca78acac
diff --git a/metadata/md5-cache/www-apps/nanoc-4.8.1 b/metadata/md5-cache/www-apps/nanoc-4.8.1
index 1380ec056c88..f3d7c1adbc19 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.8.1
+++ b/metadata/md5-cache/www-apps/nanoc-4.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/nanoc-4.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_=fcb11a7bef5f1b998cbadfe30d7d53fb
diff --git a/metadata/md5-cache/www-apps/redmine-3.2.7 b/metadata/md5-cache/www-apps/redmine-3.2.7
index 6fb6ff8722cf..40517c136714 100644
--- a/metadata/md5-cache/www-apps/redmine-3.2.7
+++ b/metadata/md5-cache/www-apps/redmine-3.2.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/rubygems[ruby_targets_ruby21] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby21] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby21] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby21] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby21] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby21] dev-ruby/mime-types:*[ruby_targets_ruby21] =dev-ruby/request_store-1.0.5[ruby_targets_ruby21] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby21] dev-ruby/actionpack-action_caching[ruby_targets_ruby21] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby21] dev-ruby/protected_attributes[ruby_targets_ruby21] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby21] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby21] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby21] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby21] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby21] ) passenger? ( www-apache/passenger[ruby_targets_ruby21] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rubygems[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] =dev-ruby/request_store-1.0.5[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby22] dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby22] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/rubygems[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] =dev-ruby/request_store-1.0.5[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby22] dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby22] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
 EAPI=5
 HOMEPAGE=http://www.redmine.org/
-IUSE=ldap fastcgi passenger imagemagick test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=ldap fastcgi passenger imagemagick test elibc_FreeBSD ruby_targets_ruby22
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( dev-ruby/rubygems[ruby_targets_ruby21] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby21] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby21] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby21] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby21] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby21] dev-ruby/mime-types:*[ruby_targets_ruby21] =dev-ruby/request_store-1.0.5[ruby_targets_ruby21] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby21] dev-ruby/actionpack-action_caching[ruby_targets_ruby21] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby21] dev-ruby/protected_attributes[ruby_targets_ruby21] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby21] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby21] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby21] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby21] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby21] ) passenger? ( www-apache/passenger[ruby_targets_ruby21] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rubygems[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] =dev-ruby/request_store-1.0.5[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby22] dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby22] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/rubygems[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] =dev-ruby/request_store-1.0.5[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby22] dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby22] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://www.redmine.org/releases/redmine-3.2.7.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- 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_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=bb0426530cb06a309f864c76782933cb
diff --git a/metadata/md5-cache/www-apps/redmine-3.3.4 b/metadata/md5-cache/www-apps/redmine-3.3.4
index a9858981b93b..3962a41fa89a 100644
--- a/metadata/md5-cache/www-apps/redmine-3.3.4
+++ b/metadata/md5-cache/www-apps/redmine-3.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://www.redmine.org/releases/redmine-3.3.4.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- 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_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=af4546d6aa752373aba51694f0e0e872
diff --git a/metadata/md5-cache/www-apps/redmine-3.4.0 b/metadata/md5-cache/www-apps/redmine-3.4.0
index c42bd35b15e4..31bbd25a2a9e 100644
--- a/metadata/md5-cache/www-apps/redmine-3.4.0
+++ b/metadata/md5-cache/www-apps/redmine-3.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://www.redmine.org/releases/redmine-3.4.0.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- 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_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=97ddbcb99c3158913113efbba6f6eb71
diff --git a/metadata/md5-cache/www-servers/adsf-1.2.1 b/metadata/md5-cache/www-servers/adsf-1.2.1
index 9a16df48bf2e..1403a423b7d4 100644
--- a/metadata/md5-cache/www-servers/adsf-1.2.1
+++ b/metadata/md5-cache/www-servers/adsf-1.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rack-test[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rack-test[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=test? ( ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rack-test[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=A Dead Simple Fileserver is a static file server that can launch in a directory
 EAPI=5
 HOMEPAGE=http://nanoc.stoneship.org/
-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=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[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/rack-1.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[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=https://github.com/ddfreyne/adsf/archive/1.2.1.tar.gz -> adsf-1.2.1.tar.gz
 _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_=91995278a7f3803ee80a8bfff435e098
diff --git a/metadata/md5-cache/www-servers/puma-3.10.0 b/metadata/md5-cache/www-servers/puma-3.10.0
index 9366e881ecbc..aa9863345d63 100644
--- a/metadata/md5-cache/www-servers/puma-3.10.0
+++ b/metadata/md5-cache/www-servers/puma-3.10.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] test? ( dev-ruby/rack[ruby_targets_ruby21] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby21] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] test? ( dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] test? ( dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby23] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] test? ( dev-ruby/rack[ruby_targets_ruby24] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby24] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] test? ( dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] test? ( dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby23] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] test? ( dev-ruby/rack[ruby_targets_ruby24] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby24] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
 EAPI=6
 HOMEPAGE=http://puma.io/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=BSD
-RDEPEND=dev-libs/openssl:0 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=dev-libs/openssl:0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v3.10.0.tar.gz -> puma-3.10.0.tar.gz
 _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_=2d55634c069f76f1d170bcd0aaed8f9d
diff --git a/metadata/md5-cache/www-servers/puma-3.6.2 b/metadata/md5-cache/www-servers/puma-3.6.2
index 1e075fb4ea03..c24a5cd8fac6 100644
--- a/metadata/md5-cache/www-servers/puma-3.6.2
+++ b/metadata/md5-cache/www-servers/puma-3.6.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] test? ( dev-ruby/rack[ruby_targets_ruby21] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby21] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] test? ( dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] test? ( dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby23] >=dev-ruby/test-unit-3.0: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? ( 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/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=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] test? ( dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] test? ( dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby23] >=dev-ruby/test-unit-3.0:2[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/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=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
 EAPI=5
 HOMEPAGE=http://puma.io/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-libs/openssl:0 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=dev-libs/openssl:0 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=3
 SRC_URI=https://github.com/puma/puma/archive/v3.6.2.tar.gz -> puma-3.6.2.tar.gz
 _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_=c2bdff0a28b90aaa9c04891c32f70a9d
diff --git a/metadata/md5-cache/www-servers/puma-3.9.1 b/metadata/md5-cache/www-servers/puma-3.9.1
index f7874c542c7b..4434210941a8 100644
--- a/metadata/md5-cache/www-servers/puma-3.9.1
+++ b/metadata/md5-cache/www-servers/puma-3.9.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] test? ( dev-ruby/rack[ruby_targets_ruby21] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby21] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] test? ( dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] test? ( dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby23] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] test? ( dev-ruby/rack[ruby_targets_ruby24] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby24] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) 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] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] test? ( dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] test? ( dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby23] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] test? ( dev-ruby/rack[ruby_targets_ruby24] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby24] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
 EAPI=6
 HOMEPAGE=http://puma.io/
-IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=BSD
-RDEPEND=dev-libs/openssl:0 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=dev-libs/openssl:0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v3.9.1.tar.gz -> puma-3.9.1.tar.gz
 _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_=2d55634c069f76f1d170bcd0aaed8f9d
diff --git a/metadata/md5-cache/www-servers/thin-1.7.0-r1 b/metadata/md5-cache/www-servers/thin-1.7.0-r1
index d1bee65ffd23..af93924dd9dd 100644
--- a/metadata/md5-cache/www-servers/thin-1.7.0-r1
+++ b/metadata/md5-cache/www-servers/thin-1.7.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel test? ( ruby_targets_ruby21? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] dev-ruby/rake-compiler[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/rake-compiler[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/rake-compiler[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=dev-util/ragel test? ( ruby_targets_ruby22? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/rake-compiler[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/rake-compiler[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A fast and very simple Ruby web server
 EAPI=5
 HOMEPAGE=http://code.macournoyer.com/thin/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby23] virtual/ruby-ssl[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/daemons-1.0.9[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby23] virtual/ruby-ssl[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=https://github.com/macournoyer/thin/archive/v1.7.0.tar.gz -> thin-1.7.0.tar.gz
 _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_=fa1896d3ef82796456f403448d8857b3
diff --git a/metadata/md5-cache/www-servers/thin-1.7.1 b/metadata/md5-cache/www-servers/thin-1.7.1
index 40f8ec0a5fe3..00072d052072 100644
--- a/metadata/md5-cache/www-servers/thin-1.7.1
+++ b/metadata/md5-cache/www-servers/thin-1.7.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel test? ( ruby_targets_ruby21? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] dev-ruby/rake-compiler[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/rake-compiler[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/rake-compiler[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=dev-util/ragel test? ( ruby_targets_ruby22? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/rake-compiler[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/rake-compiler[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A fast and very simple Ruby web server
 EAPI=6
 HOMEPAGE=http://code.macournoyer.com/thin/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby23] virtual/ruby-ssl[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/daemons-1.0.9[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby23] virtual/ruby-ssl[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=https://github.com/macournoyer/thin/archive/v1.7.1.tar.gz -> thin-1.7.1.tar.gz
 _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_=964c4cd1427156a076b3b6473d1122e5
diff --git a/metadata/md5-cache/www-servers/thin-1.7.2 b/metadata/md5-cache/www-servers/thin-1.7.2
index 7261c937cb34..a014fe16ecf3 100644
--- a/metadata/md5-cache/www-servers/thin-1.7.2
+++ b/metadata/md5-cache/www-servers/thin-1.7.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel test? ( ruby_targets_ruby21? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] dev-ruby/rake-compiler[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/rake-compiler[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/rake-compiler[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/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=dev-util/ragel test? ( ruby_targets_ruby22? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/rake-compiler[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/rake-compiler[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/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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=A fast and very simple Ruby web server
 EAPI=6
 HOMEPAGE=http://code.macournoyer.com/thin/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] <dev-ruby/rack-3:*[ruby_targets_ruby21] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby23] virtual/ruby-ssl[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/daemons-1.0.9[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/eventmachine-1.0.4:0[ruby_targets_ruby23] virtual/ruby-ssl[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=https://github.com/macournoyer/thin/archive/v1.7.2.tar.gz -> thin-1.7.2.tar.gz
 _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_=964c4cd1427156a076b3b6473d1122e5
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.15 b/metadata/md5-cache/www-servers/uwsgi-2.0.15
index 7ad1b8174a80..8e740343386d 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.15
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.15
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( dev-lang/go:=[gccgo] ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-2* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-6? ( dev-lang/php:5.6[embed] ) php_targets_php7-0? ( dev-lang/php:7.0[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_gevent? ( >=dev-python/gevent-1.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) )
+DEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( dev-lang/go:=[gccgo] ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-2* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-6? ( dev-lang/php:5.6[embed] ) php_targets_php7-0? ( dev-lang/php:7.0[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_gevent? ( >=dev-python/gevent-1.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) )
 DESCRIPTION=uWSGI server for Python web applications
 EAPI=5
 HOMEPAGE=http://projects.unbit.it/uwsgi/
-IUSE=apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php pypy python python_asyncio python_gevent ruby apache2 php_targets_php5-6 php_targets_php7-0 python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
+IUSE=apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php pypy python python_asyncio python_gevent ruby apache2 php_targets_php5-6 php_targets_php7-0 python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
 KEYWORDS=amd64 x86 ~amd64-linux
 LICENSE=GPL-2
-RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( dev-lang/go:=[gccgo] ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-2* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-6? ( dev-lang/php:5.6[embed] ) php_targets_php7-0? ( dev-lang/php:7.0[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_gevent? ( >=dev-python/gevent-1.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2* ) php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) )
+RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( dev-lang/go:=[gccgo] ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-2* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-6? ( dev-lang/php:5.6[embed] ) php_targets_php7-0? ( dev-lang/php:7.0[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_gevent? ( >=dev-python/gevent-1.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2* ) php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) )
 REQUIRED_USE=|| ( cgi mono perl go lua php pypy python python_asyncio python_gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml ) pypy? ( python_targets_python2_7 ) python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) python_asyncio? ( python_targets_python3_4 python_gevent ) python_gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php5-6 php_targets_php7-0 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.15.tar.gz -> uwsgi-2.0.15.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_unpack:- src_prepare:- src_configure:- src_compile:- src_test:ruby-ng src_install:-
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	7027963e8e8cc12c91117bdb9225dc26	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	7027963e8e8cc12c91117bdb9225dc26	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1f0fa10a3c653dc487ed61cab71ef26c
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.15-r1 b/metadata/md5-cache/www-servers/uwsgi-2.0.15-r1
index b92c42820e92..16d9ec011fe5 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.15-r1
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.15-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( dev-lang/go:=[gccgo] ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-4* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-6? ( dev-lang/php:5.6[embed] ) php_targets_php7-0? ( dev-lang/php:7.0[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_gevent? ( >=dev-python/gevent-1.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( 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_ruby24? ( dev-lang/ruby:2.4 ) ) virtual/pkgconfig apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) )
+DEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( dev-lang/go:=[gccgo] ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-4* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-6? ( dev-lang/php:5.6[embed] ) php_targets_php7-0? ( dev-lang/php:7.0[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_gevent? ( >=dev-python/gevent-1.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) virtual/pkgconfig apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) )
 DESCRIPTION=uWSGI server for Python web applications
 EAPI=5
 HOMEPAGE=http://projects.unbit.it/uwsgi/
-IUSE=apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php pypy python python_asyncio python_gevent ruby apache2 php_targets_php5-6 php_targets_php7-0 python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php pypy python python_asyncio python_gevent ruby apache2 php_targets_php5-6 php_targets_php7-0 python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
 KEYWORDS=~amd64 ~x86 ~amd64-linux
 LICENSE=GPL-2
-RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( dev-lang/go:=[gccgo] ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-4* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-6? ( dev-lang/php:5.6[embed] ) php_targets_php7-0? ( dev-lang/php:7.0[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_gevent? ( >=dev-python/gevent-1.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( 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_ruby24? ( dev-lang/ruby:2.4 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2* ) php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) )
+RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( dev-lang/go:=[gccgo] ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-4* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-6? ( dev-lang/php:5.6[embed] ) php_targets_php7-0? ( dev-lang/php:7.0[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_gevent? ( >=dev-python/gevent-1.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2* ) php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) )
 REQUIRED_USE=|| ( cgi mono perl go lua php pypy python python_asyncio python_gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) pypy? ( python_targets_python2_7 ) python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) python_asyncio? ( python_targets_python3_4 python_gevent ) python_gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php5-6 php_targets_php7-0 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.15.tar.gz -> uwsgi-2.0.15.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_unpack:- src_prepare:- src_configure:- src_compile:- src_test:ruby-ng src_install:-
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	7027963e8e8cc12c91117bdb9225dc26	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	7027963e8e8cc12c91117bdb9225dc26	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c73a03a73c0ddcead77d316755ff0316
diff --git a/metadata/md5-cache/x11-wm/subtle-0.11.3244 b/metadata/md5-cache/x11-wm/subtle-0.11.3244
index 4391f03d007f..cbc3e2fb21f9 100644
--- a/metadata/md5-cache/x11-wm/subtle-0.11.3244
+++ b/metadata/md5-cache/x11-wm/subtle-0.11.3244
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) xtest? ( x11-libs/libXtst ) xrandr? ( x11-libs/libXrandr ) virtual/pkgconfig test? ( ruby_targets_ruby21? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) xtest? ( x11-libs/libXtst ) xrandr? ( x11-libs/libXrandr ) virtual/pkgconfig test? ( ruby_targets_ruby22? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 DESCRIPTION=A manual tiling window manager
 EAPI=5
 HOMEPAGE=http://subforge.org/projects/subtle/wiki
-IUSE=debug doc +xft xinerama xpm +xrandr +xtest test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=debug doc +xft xinerama xpm +xrandr +xtest test elibc_FreeBSD ruby_targets_ruby22
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) xtest? ( x11-libs/libXtst ) xrandr? ( x11-libs/libXrandr ) ruby_targets_ruby21? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) xtest? ( x11-libs/libXtst ) xrandr? ( x11-libs/libXrandr ) ruby_targets_ruby22? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/dist/subtle-0.11.3244.tar.gz
 _eclass_exported_funcs=pkg_postinst:- 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-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-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b89ae5df309ee6c6096dad48bc5c8f3c
diff --git a/metadata/md5-cache/x11-wm/subtle-9999 b/metadata/md5-cache/x11-wm/subtle-9999
index 92b4cd2f296b..4abceadf3135 100644
--- a/metadata/md5-cache/x11-wm/subtle-9999
+++ b/metadata/md5-cache/x11-wm/subtle-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) xtest? ( x11-libs/libXtst ) xrandr? ( x11-libs/libXrandr ) virtual/pkgconfig test? ( ruby_targets_ruby21? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby22] ) ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) dev-vcs/mercurial
+DEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) xtest? ( x11-libs/libXtst ) xrandr? ( x11-libs/libXrandr ) virtual/pkgconfig test? ( ruby_targets_ruby22? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) dev-vcs/mercurial
 DESCRIPTION=A manual tiling window manager
 EAPI=5
 HOMEPAGE=http://subforge.org/projects/subtle/wiki
-IUSE=debug doc +xft xinerama xpm +xrandr +xtest test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
+IUSE=debug doc +xft xinerama xpm +xrandr +xtest test elibc_FreeBSD ruby_targets_ruby22
 LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) xtest? ( x11-libs/libXtst ) xrandr? ( x11-libs/libXrandr ) ruby_targets_ruby21? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) xtest? ( x11-libs/libXtst ) xrandr? ( x11-libs/libXrandr ) ruby_targets_ruby22? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:ruby-ng src_unpack:mercurial 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	mercurial	0bdc9ce12272665fa3749c8408b4d389	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	mercurial	0bdc9ce12272665fa3749c8408b4d389	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b89ae5df309ee6c6096dad48bc5c8f3c