2018-04-27 09:50:35 UTC

38 files changed, 100 insertions, 306 deletions

diff --git a/metadata/md5-cache/dev-php/awl-0.56 b/metadata/md5-cache/dev-php/awl-0.56
deleted file mode 100644
index 6419ac5dc7d3..000000000000
--- a/metadata/md5-cache/dev-php/awl-0.56
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=test? ( dev-php/phpunit )
-DESCRIPTION=Andrew McMillan's Web Libraries
-EAPI=5
-HOMEPAGE=https://gitlab.com/davical-project/awl
-IUSE=doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php:*[pdo,postgres,xml]
-SLOT=0
-SRC_URI=https://gitlab.com/davical-project/awl/repository/archive.tar.gz?ref=r0.56 -> awl-0.56.tar.gz
-_md5_=6eeae9adc2b4951504a756d6fd405d08
diff --git a/metadata/md5-cache/dev-php/awl-0.59 b/metadata/md5-cache/dev-php/awl-0.59
index 152773a3a196..c4f5e7afc7ba 100644
--- a/metadata/md5-cache/dev-php/awl-0.59
+++ b/metadata/md5-cache/dev-php/awl-0.59
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install test unpack
+DEFINED_PHASES=compile install test
 DEPEND=test? ( dev-php/phpunit )
 DESCRIPTION=Andrew McMillan's Web Libraries
 EAPI=6
@@ -8,6 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php:*[pdo,postgres,xml]
 SLOT=0
-SRC_URI=https://gitlab.com/davical-project/awl/repository/archive.tar.gz?ref=r0.59 -> awl-0.59.tar.gz
-_eclasses_=vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=d85627ef34596eb5305c3d362bec70ed
+SRC_URI=https://www.davical.org/downloads/awl_0.59.orig.tar.xz -> awl-0.59.tar.xz
+_md5_=8fe697c509cbd36dea2316132d20091d
diff --git a/metadata/md5-cache/dev-ruby/rack-1.6.7 b/metadata/md5-cache/dev-ruby/rack-1.6.7
index c00c9e42a65e..68f3dd51d255 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.6.7
+++ b/metadata/md5-cache/dev-ruby/rack-1.6.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bacon[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A modular Ruby webserver interface
 EAPI=6
 HOMEPAGE=https://rack.github.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 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_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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25] ) !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=1.6
 SRC_URI=mirror://rubygems/rack-1.6.7.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c1b67f6cca016e3f86bf797aeb9d6897
+_md5_=02a1222372027bff3518e77012b65ba4
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 9e675c491b24..854a1b13eb80 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,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rack-test[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rack-test[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rack-test[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rack-test[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rack-test[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) 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_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=This gem protects against typical web attacks
 EAPI=5
 HOMEPAGE=https://github.com/rkh/rack-protection
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
 KEYWORDS=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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=1
 SRC_URI=mirror://rubygems/rack-protection-1.5.3.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=24d9f8636cbb8ae48248894a98b1ee39
+_md5_=2f589ced188e9f4cfaecbf4d828f5790
diff --git a/metadata/md5-cache/dev-ruby/rack-test-0.8.3-r1 b/metadata/md5-cache/dev-ruby/rack-test-0.8.3-r1
index 040187cf1bcf..588dd16ca431 100644
--- a/metadata/md5-cache/dev-ruby/rack-test-0.8.3-r1
+++ b/metadata/md5-cache/dev-ruby/rack-test-0.8.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( 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_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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( 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_ruby25? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby25] <dev-ruby/rack-3:*[ruby_targets_ruby25] ) ) 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_ruby25? ( test? ( >=dev-ruby/sinatra-1.2.6[ruby_targets_ruby25] =dev-ruby/rack-1*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 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_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~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_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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=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_ruby25? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby25] <dev-ruby/rack-3:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0.8
 SRC_URI=https://github.com/rack-test/rack-test/archive/v0.8.3.tar.gz -> rack-test-0.8.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=abebf799ce354aa70fb224dc4024ed7f
+_md5_=5d4ce2a8958efceb43a2ba1a11fe4c7e
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.3.2 b/metadata/md5-cache/dev-ruby/redcloth-4.3.2
index 0005618b7f79..080aa0678a5f 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.3.2
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.3.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( 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
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f2bc667cc1547577f4d93a027ff57dcb
+_md5_=fe79681883e5ef7d9418469c6a020334
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
deleted file mode 100644
index 56c11e89bd24..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activemodel-3.0[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/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( 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_ruby23 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby23] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-SLOT=1
-SRC_URI=mirror://rubygems/rspec-collection_matchers-1.1.3.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=311912d01e440c9144d7f53f0dbd653b
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.5.3 b/metadata/md5-cache/dev-ruby/rspec-core-3.5.3
deleted file mode 100644
index 3a622229c9dd..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( 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_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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=A Behaviour Driven Development (BDD) framework for Ruby
-EAPI=5
-HOMEPAGE=https://github.com/rspec/rspec-core
-IUSE=highlight test elibc_FreeBSD 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_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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( 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
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d005eb4665b48d93dc0930dec5f76615
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.3 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.3
deleted file mode 100644
index 212cce0c4c6f..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby23] >=dev-ruby/text-1.3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) dev-ruby/racc[ruby_targets_ruby23] ) 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[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=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_ruby23 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( Ruby LGPL-3+ )
-RDEPEND=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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/gettext-3.2.3.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3940db491bd528e909d216bd0fd926e4
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.6 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.6
deleted file mode 100644
index b6eb6dcc67a4..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( 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_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_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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( 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_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=|| ( Ruby LGPL-3+ )
-RDEPEND=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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/gettext-3.2.6.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=05021c79ede802f9a6d225c531a1f827
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99998 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99998
deleted file mode 100644
index 271bd6e02b9c..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99998
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-db/unixODBC-2.0.6 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=>=dev-db/unixODBC-2.0.6 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.99998.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7334e32c91c0737a453bd71f168a4307
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.5.0 b/metadata/md5-cache/dev-ruby/rubypants-0.5.0
deleted file mode 100644
index 324e0a73fba6..000000000000
--- a/metadata/md5-cache/dev-ruby/rubypants-0.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( 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_ruby23 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/rubypants-0.5.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=09ffc9a5cd72bc431a45f3ddbba54975
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.5.1 b/metadata/md5-cache/dev-ruby/rubypants-0.5.1
deleted file mode 100644
index e366ddb85005..000000000000
--- a/metadata/md5-cache/dev-ruby/rubypants-0.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( 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_ruby23 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/rubypants-0.5.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=09ffc9a5cd72bc431a45f3ddbba54975
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.6.0 b/metadata/md5-cache/dev-ruby/rubypants-0.6.0
deleted file mode 100644
index 32fe07edf9f9..000000000000
--- a/metadata/md5-cache/dev-ruby/rubypants-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A Ruby port of the SmartyPants PHP library
-EAPI=5
-HOMEPAGE=http://chneukirchen.org/repos/rubypants/README
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/rubypants-0.6.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0e5ef7bca9ac0753a3e34389f75ddb4e
diff --git a/metadata/md5-cache/dev-ruby/sdoc-0.4.2 b/metadata/md5-cache/dev-ruby/sdoc-0.4.2
deleted file mode 100644
index 63dd4facf282..000000000000
--- a/metadata/md5-cache/dev-ruby/sdoc-0.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby23] =dev-ruby/rdoc-4*[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[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=rdoc generator html with javascript search index
-EAPI=5
-HOMEPAGE=https://rubygems.org/gems/sdoc
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby23] =dev-ruby/rdoc-4*[ruby_targets_ruby23] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/sdoc-0.4.2.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2ec794fd2c697ad7561e453493125d7d
diff --git a/metadata/md5-cache/dev-ruby/seed-fu-2.3.9 b/metadata/md5-cache/dev-ruby/seed-fu-2.3.9
new file mode 100644
index 000000000000..fb0cc361379c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/seed-fu-2.3.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/activerecord-3.1:*[ruby_targets_ruby23] >=dev-ruby/activesupport-3.1:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activerecord-3.1:*[ruby_targets_ruby24] >=dev-ruby/activesupport-3.1:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Advanced seed data handling for Rails
+EAPI=6
+HOMEPAGE=https://github.com/mbleigh/seed-fu
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/activerecord-3.1:*[ruby_targets_ruby23] >=dev-ruby/activesupport-3.1:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activerecord-3.1:*[ruby_targets_ruby24] >=dev-ruby/activesupport-3.1:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://github.com/mbleigh/seed-fu/archive/v2.3.9.tar.gz -> seed-fu-2.3.9.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e9a5d2732934789683ee273905dc5241
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 3e7638b8a755..c11598de77ea 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,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( 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_ruby25? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby25] dev-ruby/rubyzip:1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=This gem provides Ruby bindings for WebDriver
 EAPI=5
 HOMEPAGE=http://gemcutter.org/gems/selenium-webdriver
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
+RDEPEND=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_ruby25? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby25] dev-ruby/rubyzip:1[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/selenium-webdriver-2.53.4.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=81b4be5d1785a49f411ab02021b68e6f
+_md5_=543f0f447e9a6cd1192edc3f8d53bc5b
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.10.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.10.0
index 92a4c1dffa08..14cf8452b582 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.10.0
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.10.0
@@ -4,11 +4,11 @@ DESCRIPTION=This gem provides Ruby bindings for WebDriver
 EAPI=6
 HOMEPAGE=https://github.com/seleniumhq/selenium
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/selenium-webdriver-3.10.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=943b54a17af30ada55d965a5b292b8a1
+_md5_=73982d8bfaa7f8292e02cdf0643541f7
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.11.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.11.0
index 057c3819f32e..1fec97495cc1 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.11.0
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.11.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby25] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=This gem provides Ruby bindings for WebDriver
 EAPI=6
 HOMEPAGE=https://github.com/seleniumhq/selenium
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby25] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=3
 SRC_URI=mirror://rubygems/selenium-webdriver-3.11.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=943b54a17af30ada55d965a5b292b8a1
+_md5_=2b54cbbdf572eb794dc9b1b8b1a8f2e6
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.9.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.9.0
deleted file mode 100644
index 25a94bd52b67..000000000000
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( 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_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=3
-SRC_URI=mirror://rubygems/selenium-webdriver-3.9.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=943b54a17af30ada55d965a5b292b8a1
diff --git a/metadata/md5-cache/dev-ruby/sigar-0.7.3 b/metadata/md5-cache/dev-ruby/sigar-0.7.3
index c25eefedcb2e..e6d9378ff6ad 100644
--- a/metadata/md5-cache/dev-ruby/sigar-0.7.3
+++ b/metadata/md5-cache/dev-ruby/sigar-0.7.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=|| ( <sys-libs/glibc-2.26 net-libs/libtirpc ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=|| ( <sys-libs/glibc-2.26 net-libs/libtirpc ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=System Information Gatherer And Reporter
 EAPI=5
 HOMEPAGE=http://sigar.hyperic.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby23 test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/sigar-0.7.3.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a51d6da2a22ae7cfb867338fcf416bd6
+_md5_=7a21ba9847990688a0ed246fe45b0680
diff --git a/metadata/md5-cache/dev-ruby/sinatra-1.4.7 b/metadata/md5-cache/dev-ruby/sinatra-1.4.7
deleted file mode 100644
index 22016e65f6de..000000000000
--- a/metadata/md5-cache/dev-ruby/sinatra-1.4.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( 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_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_ruby23? ( dev-lang/ruby:2.3 ) 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=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_ruby23 test test
-KEYWORDS=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_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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/sinatra-1.4.7.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e346ae1d641a8c3a9f30455eb8d467d7
diff --git a/metadata/md5-cache/dev-ruby/sinatra-1.4.8 b/metadata/md5-cache/dev-ruby/sinatra-1.4.8
index 5964bb35318f..295b630e67ae 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-1.4.8
+++ b/metadata/md5-cache/dev-ruby/sinatra-1.4.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( 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_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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( 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_ruby25? ( =dev-ruby/rack-1*:*[ruby_targets_ruby25] >=dev-ruby/rack-1.5:*[ruby_targets_ruby25] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby25] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby25] <dev-ruby/tilt-3:*[ruby_targets_ruby25] ) ) 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_ruby25? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby25] dev-ruby/erubis[ruby_targets_ruby25] dev-ruby/builder[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 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_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
 KEYWORDS=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_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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=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_ruby25? ( =dev-ruby/rack-1*:*[ruby_targets_ruby25] >=dev-ruby/rack-1.5:*[ruby_targets_ruby25] >=dev-ruby/rack-protection-1.4:1[ruby_targets_ruby25] >=dev-ruby/tilt-1.3.4:*[ruby_targets_ruby25] <dev-ruby/tilt-3:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/sinatra-1.4.8.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8d9375de7f764f16ecbea79af3cc8d0a
+_md5_=80feaf0889074e557fa360ab368999d9
diff --git a/metadata/md5-cache/dev-ruby/syntax-1.2.1 b/metadata/md5-cache/dev-ruby/syntax-1.2.1
deleted file mode 100644
index 051f8138c510..000000000000
--- a/metadata/md5-cache/dev-ruby/syntax-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( 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_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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( 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
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=95830951d39e97fe1b5ef4348e9cf945
diff --git a/metadata/md5-cache/dev-ruby/thor-0.19.1 b/metadata/md5-cache/dev-ruby/thor-0.19.1
deleted file mode 100644
index c1555710be1e..000000000000
--- a/metadata/md5-cache/dev-ruby/thor-0.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( 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_ruby23 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/erikhuda/thor/archive/v0.19.1.tar.gz -> thor-git-0.19.1.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_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 4f4bd8ef58c2..73a8d72a1f66 100644
--- a/metadata/md5-cache/dev-ruby/thor-0.19.4
+++ b/metadata/md5-cache/dev-ruby/thor-0.19.4
@@ -4,11 +4,11 @@ DESCRIPTION=A scripting framework that replaces rake and sake
 EAPI=6
 HOMEPAGE=http://whatisthor.com/
 IUSE=doc elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( 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
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8ef7095372836c8c6250b6d8e06f60a9
+_md5_=38a2d1433db8e6003be93aa7a8271eac
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-0.3.53 b/metadata/md5-cache/dev-ruby/tzinfo-0.3.53
index 508a18d267cc..ec2637d8dbbf 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-0.3.53
+++ b/metadata/md5-cache/dev-ruby/tzinfo-0.3.53
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( )
+DEPEND=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=Daylight-savings aware timezone library
 EAPI=6
 HOMEPAGE=https://tzinfo.github.io/
-IUSE=elibc_FreeBSD doc test test
+IUSE=elibc_FreeBSD 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=
-REQUIRED_USE=|| ( )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/tzinfo-0.3.53.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=85758a1ccc439f4dba99f9fc5657e83f
+_md5_=7a8dab78ee22789c617bcbad6b5657eb
diff --git a/metadata/md5-cache/net-fs/samba-4.8.1 b/metadata/md5-cache/net-fs/samba-4.8.1
new file mode 100644
index 000000000000..3cb12b25cbdc
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.8.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[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-lang/perl:= dev-libs/libaio[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/libbsd[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/iniparser:0 dev-libs/popt[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-python/subunit[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(+),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-util/cmocka-1.1.1[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(-)?] sys-apps/attr[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(-)?] >=sys-libs/ldb-1.3.2[ldap(+)?,python?,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(+),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(-)?] sys-libs/libcap sys-libs/ncurses:0=[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(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,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(+),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(-)?] >=sys-libs/tdb-1.3.15[python?,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(+),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(-)?] >=sys-libs/tevent-0.9.36[python?,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(+),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(-)?] sys-libs/zlib[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(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[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(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,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(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[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(-)?] ) systemd? ( sys-apps/systemd:0= ) || ( net-libs/libnsl <sys-libs/glibc-2.26[rpc(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=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(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[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(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=http://www.samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_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
+KEYWORDS=~amd64 ~arm64 ~hppa ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[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-lang/perl:= dev-libs/libaio[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/libbsd[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/iniparser:0 dev-libs/popt[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-python/subunit[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(+),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-util/cmocka-1.1.1[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(-)?] sys-apps/attr[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(-)?] >=sys-libs/ldb-1.3.2[ldap(+)?,python?,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(+),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(-)?] sys-libs/libcap sys-libs/ncurses:0=[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(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,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(+),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(-)?] >=sys-libs/tdb-1.3.15[python?,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(+),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(-)?] >=sys-libs/tevent-0.9.36[python?,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(+),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(-)?] sys-libs/zlib[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(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[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(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,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(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[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(-)?] ) systemd? ( sys-apps/systemd:0= ) || ( net-libs/libnsl <sys-libs/glibc-2.26[rpc(+)] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=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(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
+REQUIRED_USE=addc? ( python gnutls winbind ) addns? ( python ) ads? ( acl gnutls ldap winbind ) cluster? ( ads ) gpg? ( addc ) python? ( ldap ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.8.1.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
+_md5_=fad29faaf40d0edc80f5d92c3bdf02de
diff --git a/metadata/md5-cache/sci-electronics/xcircuit-3.9.73 b/metadata/md5-cache/sci-electronics/xcircuit-3.9.73
new file mode 100644
index 000000000000..5e91377c9702
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/xcircuit-3.9.73
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=app-text/ghostscript-gpl media-libs/fontconfig:1.0= sys-libs/zlib:= x11-libs/cairo x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm x11-libs/libXt tcl? ( dev-lang/tcl:0= dev-lang/tk:0= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Circuit drawing and schematic capture program
+EAPI=6
+HOMEPAGE=http://opencircuitdesign.com/xcircuit
+IUSE=tcl
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/ghostscript-gpl media-libs/fontconfig:1.0= sys-libs/zlib:= x11-libs/cairo x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm x11-libs/libXt tcl? ( dev-lang/tcl:0= dev-lang/tk:0= )
+SLOT=0
+SRC_URI=http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.9.73.tgz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=3d05a2880e3cdee90b7a52cdf99c68ac
diff --git a/metadata/md5-cache/sys-boot/refind-0.11.2 b/metadata/md5-cache/sys-boot/refind-0.11.2
index 7bcd4b604cc7..1d664f21cc51 100644
--- a/metadata/md5-cache/sys-boot/refind-0.11.2
+++ b/metadata/md5-cache/sys-boot/refind-0.11.2
@@ -9,4 +9,4 @@ LICENSE=BSD GPL-2 GPL-3 FDL-1.3
 SLOT=0
 SRC_URI=mirror://sourceforge/project/refind/0.11.2/refind-src-0.11.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ac40a35d77202c4fdf59a9260f5d2d36
+_md5_=f6a24bbf1dcd4f439bda8df8940593f6
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-4.15.0 b/metadata/md5-cache/sys-fs/xfsprogs-4.16.0
index 5032bb4d0e2c..def08937fc70 100644
--- a/metadata/md5-cache/sys-fs/xfsprogs-4.15.0
+++ b/metadata/md5-cache/sys-fs/xfsprogs-4.16.0
@@ -9,6 +9,6 @@ LICENSE=LGPL-2.1
 RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3
 REQUIRED_USE=static? ( static-libs )
 SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.15.0.tar.xz
+SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.16.0.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=5354bd27dda09b43756f3459ada9a47d
diff --git a/metadata/md5-cache/www-apps/davical-1.0.2-r2 b/metadata/md5-cache/www-apps/davical-1.0.2-r2
deleted file mode 100644
index 0316b92d975d..000000000000
--- a/metadata/md5-cache/www-apps/davical-1.0.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare prerm setup
-DEPEND=>=dev-php/awl-0.51 sys-devel/gettext || ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A CalDAV and CardDAV Server
-EAPI=5
-HOMEPAGE=http://davical.org/
-IUSE=doc vhosts
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-admin/pwgen dev-lang/php:*[calendar,curl,pdo,postgres,xml] dev-perl/DBI dev-perl/DBD-Pg dev-perl/YAML >=dev-php/awl-0.51 www-servers/apache >=app-admin/webapp-config-1.50.15
-SLOT=1.0.2-r2
-SRC_URI=http://debian.mcmillan.net.nz/packages/davical/davical-1.0.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=bee6e4a136bfe0873b7cf4f2bc1cc5a0
diff --git a/metadata/md5-cache/www-apps/davical-1.1.0-r1 b/metadata/md5-cache/www-apps/davical-1.1.0-r1
deleted file mode 100644
index dd50d0528e4e..000000000000
--- a/metadata/md5-cache/www-apps/davical-1.1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare prerm setup
-DEPEND=>=dev-php/awl-0.51 sys-devel/gettext || ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A CalDAV and CardDAV Server
-EAPI=5
-HOMEPAGE=http://davical.org/
-IUSE=doc vhosts
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-admin/pwgen dev-lang/php:*[calendar,curl,pdo,postgres,xml] dev-perl/DBI dev-perl/DBD-Pg dev-perl/YAML >=dev-php/awl-0.51 www-servers/apache >=app-admin/webapp-config-1.50.15
-SLOT=1.1.0-r1
-SRC_URI=http://debian.mcmillan.net.nz/packages/davical/davical-1.1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=0fb1f47a7e1bf5178f30e6b54834700a
diff --git a/metadata/md5-cache/www-apps/davical-1.1.1-r2 b/metadata/md5-cache/www-apps/davical-1.1.1-r2
deleted file mode 100644
index 2ae240014393..000000000000
--- a/metadata/md5-cache/www-apps/davical-1.1.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare prerm setup
-DEPEND=>=dev-php/awl-0.51 sys-devel/gettext || ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A CalDAV and CardDAV Server
-EAPI=5
-HOMEPAGE=http://davical.org/
-IUSE=doc vhosts
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-admin/pwgen dev-lang/php:*[calendar,curl,pdo,postgres,xml] dev-perl/DBI dev-perl/DBD-Pg dev-perl/YAML >=dev-php/awl-0.51 virtual/httpd-php >=app-admin/webapp-config-1.50.15
-SLOT=1.1.1-r2
-SRC_URI=http://debian.mcmillan.net.nz/packages/davical/davical-1.1.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=5397345eadd39fda69ab2e0bd7a4bfbd
diff --git a/metadata/md5-cache/www-apps/davical-1.1.3.1-r2 b/metadata/md5-cache/www-apps/davical-1.1.3.1-r2
deleted file mode 100644
index 8e502a455035..000000000000
--- a/metadata/md5-cache/www-apps/davical-1.1.3.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare prerm setup
-DEPEND=>=dev-php/awl-0.55 sys-devel/gettext || ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A CalDAV and CardDAV Server
-EAPI=5
-HOMEPAGE=http://davical.org/
-IUSE=doc vhosts
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-admin/pwgen dev-lang/php:*[calendar,curl,pdo,postgres,xml] dev-perl/DBI dev-perl/DBD-Pg dev-perl/YAML >=dev-php/awl-0.55 virtual/httpd-php >=app-admin/webapp-config-1.50.15
-SLOT=1.1.3.1-r2
-SRC_URI=https://gitlab.com/davical-project/davical/repository/archive.tar.gz?ref=r1.1.3.1 -> davical-1.1.3.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=18c418429db38627939e6c7302621d33
diff --git a/metadata/md5-cache/www-apps/davical-1.1.7 b/metadata/md5-cache/www-apps/davical-1.1.7
index 6b5bb37bc71e..edddf9ca9a3b 100644
--- a/metadata/md5-cache/www-apps/davical-1.1.7
+++ b/metadata/md5-cache/www-apps/davical-1.1.7
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install postinst prerm setup unpack
+DEFINED_PHASES=compile install postinst prerm setup
 DEPEND=>=dev-php/awl-0.59 sys-devel/gettext || ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
 DESCRIPTION=A CalDAV and CardDAV Server
 EAPI=6
-HOMEPAGE=http://davical.org/
+HOMEPAGE=https://davical.org/
 IUSE=vhosts
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-admin/pwgen dev-lang/php:*[calendar,curl,pdo,postgres,xml] dev-perl/DBI dev-perl/DBD-Pg dev-perl/YAML >=dev-php/awl-0.59 virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=1.1.7
-SRC_URI=https://gitlab.com/davical-project/davical/repository/archive.tar.gz?ref=r1.1.7 -> davical-1.1.7.tar.gz
-_eclasses_=vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=a27820bdb624cfed8110d11f8e602ec2
+SRC_URI=https://www.davical.org/downloads/davical_1.1.7.orig.tar.xz -> davical-1.1.7.tar.xz
+_eclasses_=webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=f7f85b9195cdfe5765040a91fae33808
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 0de77f7f7ab6..e476e503bcc7 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -5899,14 +5899,14 @@ dev-ruby/rubypants 0.2.0-r5: A Ruby port of the SmartyPants PHP library
 dev-ruby/rubyzip 1.2.1: A ruby library for reading and writing zip files
 dev-ruby/safe_yaml 1.0.4-r3: Parse YAML safely, alternative implementation of YAML.load
 dev-ruby/sass 3.4.24: An extension of CSS3, adding nested rules, variables, mixins, and more
-dev-ruby/selenium-webdriver 3.8.0: This gem provides Ruby bindings for WebDriver
+dev-ruby/selenium-webdriver 3.8.0 3.10.0: This gem provides Ruby bindings for WebDriver
 dev-ruby/serialport 1.3.1: a library for serial port (rs232) access in ruby
 dev-ruby/session 3.2.0: A set of classes to drive external programs via pipe
 dev-ruby/sexp_processor 4.9.0: Processor for s-expressions created as part of the ParseTree project
 dev-ruby/shorturl 1.0.0-r2: A very simple library to use URL shortening services such as TinyURL or RubyURL
 dev-ruby/shoulda 2.11.3-r2: Making tests easy on the fingers and eyes
 dev-ruby/simple-rss 1.3.1-r1: A simple, flexible, extensible, and liberal RSS and Atom reader for Ruby
-dev-ruby/sinatra 1.4.7 1.4.8: A DSL for quickly creating web applications in Ruby with minimal effort
+dev-ruby/sinatra 1.4.8: A DSL for quickly creating web applications in Ruby with minimal effort
 dev-ruby/sparklines 0.5.2-r6: Create sparklines, small graphs to be used inline in texts
 dev-ruby/spork 0.9.2-r2: Spork is Tim Harper's implementation of test server
 dev-ruby/sqlite3 1.3.11: An extension library to access a SQLite database from Ruby
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 5c3574c5c582..79b3053a2652 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 27 Apr 2018 08:48:43 +0000
+Fri, 27 Apr 2018 09:50:35 +0000