2016-06-05 10:11:28 UTC

27 files changed, 84 insertions, 183 deletions

diff --git a/metadata/md5-cache/app-editors/gummi-0.6.6 b/metadata/md5-cache/app-editors/gummi-0.6.6
index b27c9c185c3a..b71665a9afd3 100644
--- a/metadata/md5-cache/app-editors/gummi-0.6.6
+++ b/metadata/md5-cache/app-editors/gummi-0.6.6
@@ -1,9 +1,9 @@
 DEFINED_PHASES=postinst prepare
 DEPEND=dev-libs/glib:2 dev-texlive/texlive-latex dev-texlive/texlive-latexextra x11-libs/gtk+:2 app-text/gtkspell:2 app-text/poppler[cairo] x11-libs/gtksourceview:2.0 x11-libs/pango !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Simple LaTeX editor for GTK+ users
-EAPI=5
+EAPI=6
 HOMEPAGE=https://github.com/alexandervdm/gummi
-IUSE=+linguas_ar +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_es +linguas_fr +linguas_hu +linguas_it +linguas_nl +linguas_pl +linguas_pt +linguas_pt_BR +linguas_ro +linguas_ru +linguas_sv +linguas_zh_CN +linguas_zh_TW
+IUSE=linguas_ar linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fr linguas_hu linguas_it linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sv linguas_zh_CN linguas_zh_TW
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 dev-texlive/texlive-latex dev-texlive/texlive-latexextra x11-libs/gtk+:2
@@ -11,4 +11,4 @@ SLOT=0
 SRC_URI=https://github.com/alexandervdm/gummi/archive/0.6.6.tar.gz -> gummi-0.6.6.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=74eb062810ed80396803288d65607a3e
+_md5_=0f87f2cacdf5eb914e4ec4d32ec95208
diff --git a/metadata/md5-cache/app-editors/gummi-9999 b/metadata/md5-cache/app-editors/gummi-9999
deleted file mode 100644
index cfb439c2cf86..000000000000
--- a/metadata/md5-cache/app-editors/gummi-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst prepare unpack
-DEPEND=dev-libs/glib:2 dev-texlive/texlive-latex dev-texlive/texlive-latexextra x11-libs/gtk+:2 app-text/gtkspell:2 app-text/poppler[cairo] x11-libs/gtksourceview:2.0 x11-libs/pango !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
-DESCRIPTION=Simple LaTeX editor for GTK+ users
-EAPI=6
-HOMEPAGE=https://github.com/alexandervdm/gummi
-IUSE=+linguas_ar +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_es +linguas_fr +linguas_hu +linguas_it +linguas_nl +linguas_pl +linguas_pt +linguas_pt_BR +linguas_ro +linguas_ru +linguas_sv +linguas_zh_CN +linguas_zh_TW
-LICENSE=MIT
-RDEPEND=dev-libs/glib:2 dev-texlive/texlive-latex dev-texlive/texlive-latexextra x11-libs/gtk+:2
-SLOT=0
-_eclass_exported_funcs=pkg_postinst:- src_unpack:git-r3 src_prepare:-
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=10c7dadfc8867cfb032829cbbaf7d00d
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.4 b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.4
index 4647bb447a7f..efef37287d73 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.4
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( test? ( dev-util/cucumber[ruby_targets_ruby20] dev-ruby/rspec-expectations:*[ruby_targets_ruby20] dev-ruby/asciimath[ruby_targets_ruby20] dev-ruby/coderay[ruby_targets_ruby20] dev-ruby/erubis[ruby_targets_ruby20] dev-ruby/haml[ruby_targets_ruby20] dev-ruby/nokogiri[ruby_targets_ruby20] dev-ruby/slim[ruby_targets_ruby20] dev-ruby/tilt[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-util/cucumber[ruby_targets_ruby21] dev-ruby/rspec-expectations:*[ruby_targets_ruby21] dev-ruby/asciimath[ruby_targets_ruby21] dev-ruby/coderay[ruby_targets_ruby21] dev-ruby/erubis[ruby_targets_ruby21] dev-ruby/haml[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/slim[ruby_targets_ruby21] dev-ruby/tilt[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-util/cucumber[ruby_targets_ruby20] dev-ruby/rspec-expectations:*[ruby_targets_ruby20] dev-ruby/asciimath[ruby_targets_ruby20] dev-ruby/coderay[ruby_targets_ruby20] dev-ruby/erubis[ruby_targets_ruby20] dev-ruby/haml[ruby_targets_ruby20] dev-ruby/nokogiri[ruby_targets_ruby20] dev-ruby/slim[ruby_targets_ruby20] dev-ruby/tilt[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-util/cucumber[ruby_targets_ruby21] dev-ruby/rspec-expectations:*[ruby_targets_ruby21] dev-ruby/asciimath[ruby_targets_ruby21] dev-ruby/coderay[ruby_targets_ruby21] dev-ruby/erubis[ruby_targets_ruby21] dev-ruby/haml[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/slim[ruby_targets_ruby21] dev-ruby/tilt[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] dev-ruby/rspec-expectations:*[ruby_targets_ruby22] dev-ruby/asciimath[ruby_targets_ruby22] dev-ruby/coderay[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/haml[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/slim[ruby_targets_ruby22] dev-ruby/tilt[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats
 EAPI=5
 HOMEPAGE=https://github.com/asciidoctor/asciidoctor
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v1.5.4.tar.gz -> asciidoctor-1.5.4.tar.gz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7537bac787353275f220ac6c9b22ef99
+_md5_=ce979af0d97bb54d510e7bcbfe86bd72
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.4.0 b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.4.0
new file mode 100644
index 000000000000..fff2b66db520
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.4.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=A set of Asciidoctor extensions that enable you to add diagrams
+EAPI=5
+HOMEPAGE=https://github.com/asciidoctor/asciidoctor-diagram
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/asciidoctor-1.5.0[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=https://github.com/asciidoctor/asciidoctor-diagram/archive/v1.4.0.tar.gz -> asciidoctor-diagram-1.4.0.tar.gz
+_eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=3833be17bf83a883ae890d2bdbe9a04c
diff --git a/metadata/md5-cache/dev-ruby/deep_merge-1.0.1 b/metadata/md5-cache/dev-ruby/deep_merge-1.0.1
index d2c603120af2..94885e427891 100644
--- a/metadata/md5-cache/dev-ruby/deep_merge-1.0.1
+++ b/metadata/md5-cache/dev-ruby/deep_merge-1.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A simple set of utility functions for Hash
 EAPI=5
 HOMEPAGE=http://trac.misuse.org/science/wiki/DeepMerge
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/deep_merge-1.0.1.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b7294f2309e698e0e314d3333eeaf669
+_md5_=265c8dffacabbc5df2289cc601e9264c
diff --git a/metadata/md5-cache/dev-ruby/http-0.6.3 b/metadata/md5-cache/dev-ruby/http-0.6.3
deleted file mode 100644
index fbe10da255ab..000000000000
--- a/metadata/md5-cache/dev-ruby/http-0.6.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby20] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=An easy-to-use client library for making requests from Ruby
-EAPI=5
-HOMEPAGE=https://github.com/tarcieri/http
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 doc test test
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby20] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby20] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 )
-SLOT=0.6
-SRC_URI=mirror://rubygems/http-0.6.3.gem
-_eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d055ab8fad0a67bcf9bd9f10a7d8772b
diff --git a/metadata/md5-cache/dev-ruby/http-0.6.3-r1 b/metadata/md5-cache/dev-ruby/http-0.6.3-r1
index c28206f42906..c61a2a140da7 100644
--- a/metadata/md5-cache/dev-ruby/http-0.6.3-r1
+++ b/metadata/md5-cache/dev-ruby/http-0.6.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=An easy-to-use client library for making requests from Ruby
 EAPI=5
 HOMEPAGE=https://github.com/tarcieri/http
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby20] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby21] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
@@ -12,4 +12,4 @@ SLOT=0.6
 SRC_URI=mirror://rubygems/http-0.6.3.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=033f13ea2e0aa96b0987ca3c7ca77ac7
+_md5_=0c6bae1b405788b8225fb5dcb0ea0408
diff --git a/metadata/md5-cache/dev-ruby/pg-0.17.1 b/metadata/md5-cache/dev-ruby/pg-0.17.1
deleted file mode 100644
index 63641151ae72..000000000000
--- a/metadata/md5-cache/dev-ruby/pg-0.17.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-db/postgresql test? ( dev-db/postgresql[server,threads] ) ruby_targets_ruby19? ( doc? ( dev-ruby/hoe[ruby_targets_ruby19] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby19] dev-ruby/rdoc[ruby_targets_ruby19] ) ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/hoe[ruby_targets_ruby20] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby20] dev-ruby/rdoc[ruby_targets_ruby20] ) ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=Ruby extension library providing an API to PostgreSQL
-EAPI=5
-HOMEPAGE=https://bitbucket.org/ged/ruby-pg/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=dev-db/postgresql ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
-SLOT=0
-SRC_URI=mirror://rubygems/pg-0.17.1.gem
-_eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=eb1af5dd072b69a77aad02e805d8a9a0
diff --git a/metadata/md5-cache/dev-ruby/pg-0.17.1-r1 b/metadata/md5-cache/dev-ruby/pg-0.17.1-r1
index bf6b3d1b6b4c..d4558f56880c 100644
--- a/metadata/md5-cache/dev-ruby/pg-0.17.1-r1
+++ b/metadata/md5-cache/dev-ruby/pg-0.17.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-db/postgresql test? ( dev-db/postgresql[server,threads] ) ruby_targets_ruby19? ( doc? ( dev-ruby/hoe[ruby_targets_ruby19] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby19] dev-ruby/rdoc[ruby_targets_ruby19] ) ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/hoe[ruby_targets_ruby20] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby20] dev-ruby/rdoc[ruby_targets_ruby20] ) ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] ) ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=dev-db/postgresql test? ( dev-db/postgresql[server,threads] ) ruby_targets_ruby20? ( doc? ( dev-ruby/hoe[ruby_targets_ruby20] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby20] dev-ruby/rdoc[ruby_targets_ruby20] ) ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] ) ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
 DESCRIPTION=Ruby extension library providing an API to PostgreSQL
 EAPI=5
 HOMEPAGE=https://bitbucket.org/ged/ruby-pg/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 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
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=dev-db/postgresql ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=dev-db/postgresql:* ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/pg-0.17.1.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f243c55cbd5ae70da3ab55c555087af6
+_md5_=04f0fbbc3a200ca0a1d10075223f6aea
diff --git a/metadata/md5-cache/dev-ruby/pg-0.18.2 b/metadata/md5-cache/dev-ruby/pg-0.18.2
deleted file mode 100644
index 585cd3f727b5..000000000000
--- a/metadata/md5-cache/dev-ruby/pg-0.18.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-db/postgresql test? ( >=dev-db/postgresql-9.4[server,threads] ) ruby_targets_ruby20? ( doc? ( dev-ruby/hoe[ruby_targets_ruby20] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby20] dev-ruby/rdoc[ruby_targets_ruby20] ) ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] ) ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Ruby extension library providing an API to PostgreSQL
-EAPI=5
-HOMEPAGE=https://bitbucket.org/ged/ruby-pg/
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=dev-db/postgresql ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/pg-0.18.2.gem
-_eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=005800752a02267bd86d161962e1684d
diff --git a/metadata/md5-cache/dev-ruby/pg-0.18.3 b/metadata/md5-cache/dev-ruby/pg-0.18.3
deleted file mode 100644
index 4e67035026c8..000000000000
--- a/metadata/md5-cache/dev-ruby/pg-0.18.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-db/postgresql test? ( >=dev-db/postgresql-9.4[server,threads] ) ruby_targets_ruby20? ( doc? ( dev-ruby/hoe[ruby_targets_ruby20] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby20] dev-ruby/rdoc[ruby_targets_ruby20] ) ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] ) ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] || ( >=dev-ruby/yard-0.6.1[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Ruby extension library providing an API to PostgreSQL
-EAPI=5
-HOMEPAGE=https://bitbucket.org/ged/ruby-pg/
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=dev-db/postgresql ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/pg-0.18.3.gem
-_eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=005800752a02267bd86d161962e1684d
diff --git a/metadata/md5-cache/dev-ruby/pg-0.18.4 b/metadata/md5-cache/dev-ruby/pg-0.18.4
index b97f56c78db1..8e0eda0c4738 100644
--- a/metadata/md5-cache/dev-ruby/pg-0.18.4
+++ b/metadata/md5-cache/dev-ruby/pg-0.18.4
@@ -6,10 +6,10 @@ HOMEPAGE=https://bitbucket.org/ged/ruby-pg/
 IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=dev-db/postgresql ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+RDEPEND=dev-db/postgresql:* ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/pg-0.18.4.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=005800752a02267bd86d161962e1684d
+_md5_=6fab1831fc287c4c6e91807a6a6ada25
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.2 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.2
index deb30c0484f4..4ba96e692cda 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.2
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/tins-1.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/tins-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/tins-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/tins-1.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/tins-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/tins-1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tins-1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Small Ruby library that colors strings using ANSI escape sequences
 EAPI=5
 HOMEPAGE=https://flori.github.io/term-ansicolor/
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/tins-1.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/tins-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/tins-1.0[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/tins-1.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/tins-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/tins-1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tins-1.0[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/term-ansicolor-1.3.2.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d2f076490c108b6b53fe40ac01a4882d
+_md5_=07a4790819d3a570571431aed34d8f53
diff --git a/metadata/md5-cache/lxde-base/lxterminal-0.2.0 b/metadata/md5-cache/lxde-base/lxterminal-0.2.0
deleted file mode 100644
index 36de616d98f3..000000000000
--- a/metadata/md5-cache/lxde-base/lxterminal-0.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 x11-libs/vte:0 virtual/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40.0
-DESCRIPTION=Lightweight vte-based tabbed terminal emulator for LXDE
-EAPI=5
-HOMEPAGE=http://lxde.sf.net/
-KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2 x11-libs/vte:0
-SLOT=0
-SRC_URI=mirror://sourceforge/lxde/lxterminal-0.2.0.tar.gz
-_eclass_exported_funcs=src_install:-
-_md5_=2847d23a1a43b49afb2d85908d1b8faa
diff --git a/metadata/md5-cache/lxde-base/lxterminal-0.2.0-r1 b/metadata/md5-cache/lxde-base/lxterminal-0.2.0-r1
new file mode 100644
index 000000000000..d07972fe38fc
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/lxterminal-0.2.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure
+DEPEND=dev-libs/glib:2 !gtk3? ( x11-libs/gtk+:2 x11-libs/vte:0 ) gtk3? ( x11-libs/gtk+:3 x11-libs/vte:2.90 ) virtual/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40.0
+DESCRIPTION=Lightweight vte-based tabbed terminal emulator for LXDE
+EAPI=6
+HOMEPAGE=http://lxde.sf.net/
+IUSE=gtk3
+KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 !gtk3? ( x11-libs/gtk+:2 x11-libs/vte:0 ) gtk3? ( x11-libs/gtk+:3 x11-libs/vte:2.90 )
+SLOT=0
+SRC_URI=mirror://sourceforge/lxde/lxterminal-0.2.0.tar.gz
+_eclass_exported_funcs=src_configure:-
+_md5_=7387cf975dfc464ba3425160c48b26ca
diff --git a/metadata/md5-cache/mail-filter/spamdyke-5.0.1 b/metadata/md5-cache/mail-filter/spamdyke-5.0.1
new file mode 100644
index 000000000000..c8a5da197c3b
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/spamdyke-5.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A drop-in connection-time spam filter for qmail
+EAPI=5
+HOMEPAGE=http://www.spamdyke.org/
+IUSE=libressl +ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) virtual/qmail
+SLOT=0
+SRC_URI=http://www.spamdyke.org/releases/spamdyke-5.0.1.tgz
+_eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=015e06f3678031045e69f27f8b18d3ef
diff --git a/metadata/md5-cache/sec-policy/selinux-base-9999 b/metadata/md5-cache/sec-policy/selinux-base-9999
index 386eb5f62dd6..681ce608d804 100644
--- a/metadata/md5-cache/sec-policy/selinux-base-9999
+++ b/metadata/md5-cache/sec-policy/selinux-base-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.3 virtual/udev !<=sec-policy/selinux-base-policy-2.20120725 sys-devel/m4 >=sys-apps/checkpolicy-2.3 >=dev-vcs/git-1.8.2.1
+DEPEND=>=sys-apps/policycoreutils-2.3 virtual/udev sys-devel/m4 >=sys-apps/checkpolicy-2.3 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Gentoo base policy for SELinux
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/hardened/selinux/
 IUSE=doc +open_perms +peer_perms systemd +ubac +unconfined
 LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.3 virtual/udev !<=sec-policy/selinux-base-policy-2.20120725
+RDEPEND=>=sys-apps/policycoreutils-2.3 virtual/udev
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=a5184638411a8c84c9e5c5d7d590b23d
+_md5_=622d3c3bcf3310ae4a830d57c7960ffd
diff --git a/metadata/md5-cache/sec-policy/selinux-base-policy-9999 b/metadata/md5-cache/sec-policy/selinux-base-policy-9999
index 98d2c2455a56..bcd37c0da4b8 100644
--- a/metadata/md5-cache/sec-policy/selinux-base-policy-9999
+++ b/metadata/md5-cache/sec-policy/selinux-base-policy-9999
@@ -1,13 +1,12 @@
 DEFINED_PHASES=compile install postinst prepare pretend setup unpack
-DEPEND=>=dev-vcs/git-1.8.2.1
+DEPEND==sec-policy/selinux-base-9999[systemd?] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=SELinux policy for core modules
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/hardened/selinux/
 IUSE=systemd +unconfined
 LICENSE=GPL-2
 PDEPEND=unconfined? ( sec-policy/selinux-unconfined )
-RDEPEND==sec-policy/selinux-base-9999[systemd?]
 SLOT=0
 _eclass_exported_funcs=pkg_pretend:- pkg_postinst:- pkg_setup:- src_unpack:git-r3 src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=5e19995826840d27358b78d426023a27
+_md5_=0b89d6c16d9e1af05129742223306e80
diff --git a/metadata/md5-cache/sys-libs/musl-1.1.14-r1 b/metadata/md5-cache/sys-libs/musl-1.1.14-r2
index d01a3042f176..3f10cffa1e18 100644
--- a/metadata/md5-cache/sys-libs/musl-1.1.14-r1
+++ b/metadata/md5-cache/sys-libs/musl-1.1.14-r2
@@ -9,4 +9,4 @@ SLOT=0
 SRC_URI=http://www.musl-libc.org/releases/musl-1.1.14.tar.gz http://dev.gentoo.org/~blueness/musl-misc/getconf.c http://dev.gentoo.org/~blueness/musl-misc/getent.c http://dev.gentoo.org/~blueness/musl-misc/iconv.c
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=d8c715753db1281027cc4b7b533fd034
+_md5_=7aafd0739565dbda9e42f15c01e836ad
diff --git a/metadata/md5-cache/sys-libs/musl-9999 b/metadata/md5-cache/sys-libs/musl-9999
index 04fb490b0e5c..48c3205cbffa 100644
--- a/metadata/md5-cache/sys-libs/musl-9999
+++ b/metadata/md5-cache/sys-libs/musl-9999
@@ -9,4 +9,4 @@ SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/musl-misc/getconf.c http://dev.gentoo.org/~blueness/musl-misc/getent.c http://dev.gentoo.org/~blueness/musl-misc/iconv.c
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_unpack:git-r3 src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=0d8f5eb60512c2bd9f6b770c80b60b66
+_md5_=bd93b6360f1abf9db73f735dc12f2c33
diff --git a/metadata/md5-cache/virtual/qmail-1.03 b/metadata/md5-cache/virtual/qmail-1.03
index 4fc30af6e861..8da5053d2ed8 100644
--- a/metadata/md5-cache/virtual/qmail-1.03
+++ b/metadata/md5-cache/virtual/qmail-1.03
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for qmail
 EAPI=0
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-RDEPEND=|| ( ~mail-mta/netqmail-1.05 ~mail-mta/netqmail-1.06 ~mail-mta/mini-qmail-1.05 ~mail-mta/mini-qmail-1.06 ~mail-mta/qmail-ldap-1.03 )
+RDEPEND=|| ( ~mail-mta/netqmail-1.06 ~mail-mta/mini-qmail-1.05 ~mail-mta/mini-qmail-1.06 ~mail-mta/qmail-ldap-1.03 )
 SLOT=0
 _eclass_exported_funcs=-
-_md5_=1ceeba3569aa5634b8782def1ed2111d
+_md5_=dafcbce4b837e997d26293b9327169dd
diff --git a/metadata/md5-cache/www-apache/passenger-5.0.26 b/metadata/md5-cache/www-apache/passenger-5.0.26
deleted file mode 100644
index d60384b68123..000000000000
--- a/metadata/md5-cache/www-apache/passenger-5.0.26
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-ruby/rake[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] >=dev-ruby/rake-0.8.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rake-0.8.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
-EAPI=5
-HOMEPAGE=https://www.phusionpassenger.com/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] >=dev-ruby/rake-0.8.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rake-0.8.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=http://s3.amazonaws.com/phusion-passenger/releases/passenger-5.0.26.tar.gz
-_eclass_exported_funcs=pkg_postinst:apache-module pkg_setup:- src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	depend.apache	e3c541cb90838388f81620d630c28f41	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e6449c2d3f9ca073d312e24b53cb7dee
diff --git a/metadata/md5-cache/www-apache/passenger-5.0.27 b/metadata/md5-cache/www-apache/passenger-5.0.27
deleted file mode 100644
index 1a435023d675..000000000000
--- a/metadata/md5-cache/www-apache/passenger-5.0.27
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-ruby/rake[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] >=dev-ruby/rake-0.8.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rake-0.8.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
-EAPI=5
-HOMEPAGE=https://www.phusionpassenger.com/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] >=dev-ruby/rake-0.8.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rake-0.8.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=http://s3.amazonaws.com/phusion-passenger/releases/passenger-5.0.27.tar.gz
-_eclass_exported_funcs=pkg_postinst:apache-module pkg_setup:- src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	depend.apache	e3c541cb90838388f81620d630c28f41	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1d522fdc0e2ef85ff9d61be97fe243aa
diff --git a/metadata/md5-cache/www-servers/monkeyd-1.6.7 b/metadata/md5-cache/www-servers/monkeyd-1.6.9
index c319064ed725..b0452a20e546 100644
--- a/metadata/md5-cache/www-servers/monkeyd-1.6.7
+++ b/metadata/md5-cache/www-servers/monkeyd-1.6.9
@@ -9,7 +9,7 @@ LICENSE=GPL-2
 RDEPEND=php? ( dev-lang/php ) cgi? ( dev-lang/php[cgi] )
 REQUIRED_USE=monkeyd_plugins_tls? ( !static-plugins ) elibc_uclibc? ( !debug ) cgi? ( php )
 SLOT=0
-SRC_URI=http://monkey-project.com/releases/1.6/monkey-1.6.7.tar.gz
+SRC_URI=http://monkey-project.com/releases/1.6/monkey-1.6.9.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=dec9c06c13faf9a82bf535c854317da5
+_md5_=24c872bf4dfe3c5d0a602729c65a28ce
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.5.1 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.5.1
deleted file mode 100644
index 0d7540f9e2b4..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=x11-libs/gtk+:2= xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:= virtual/libintl:= virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12
-DESCRIPTION=Alternate application launcher for Xfce
-EAPI=5
-HOMEPAGE=http://gottcode.org/xfce4-whiskermenu-plugin/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2= xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:= virtual/libintl:=
-SLOT=0
-SRC_URI=http://gottcode.org/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.5.1-src.tar.bz2
-_eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
-_eclasses_=cmake-utils	9e0d156beee613940cde06d0bc00791b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=17b6016da5babc6c47feded4a33eef2f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.5.2 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.5.2
deleted file mode 100644
index c1837a3a00ac..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=x11-libs/gtk+:2= xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:= virtual/libintl:= virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12
-DESCRIPTION=Alternate application launcher for Xfce
-EAPI=5
-HOMEPAGE=http://gottcode.org/xfce4-whiskermenu-plugin/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2= xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:= virtual/libintl:=
-SLOT=0
-SRC_URI=https://github.com/gottcode/xfce4-whiskermenu-plugin/archive/v1.5.2.tar.gz -> xfce4-whiskermenu-plugin-1.5.2.tar.gz
-_eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
-_eclasses_=cmake-utils	9e0d156beee613940cde06d0bc00791b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=990e64af3836f12962274d321935af12
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.5.3 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.5.3
index ade777db3acf..e239a52f0742 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.5.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.5.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=x11-libs/gtk+:2= xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:= virtual/libintl:= sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4
+DEPEND=virtual/libintl:= x11-libs/gtk+:2= xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:= sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4
 DESCRIPTION=Alternate application launcher for Xfce
 EAPI=6
 HOMEPAGE=https://gottcode.org/xfce4-whiskermenu-plugin
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2= xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:= virtual/libintl:=
+RDEPEND=virtual/libintl:= x11-libs/gtk+:2= xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
 SLOT=0
 SRC_URI=https://github.com/gottcode/xfce4-whiskermenu-plugin/archive/v1.5.3.tar.gz -> xfce4-whiskermenu-plugin-1.5.3.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	9e0d156beee613940cde06d0bc00791b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d279704d35d6cb6693fc350427e2dcde
+_md5_=fb55e3dad953824c0efc97b11e8d5791