2016-12-29 13:22:49 UTC

41 files changed, 105 insertions, 146 deletions

diff --git a/metadata/md5-cache/app-admin/perl-cleaner-2.21 b/metadata/md5-cache/app-admin/perl-cleaner-2.21
deleted file mode 100644
index ddc5d418c506..000000000000
--- a/metadata/md5-cache/app-admin/perl-cleaner-2.21
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=User land tool for cleaning up old perl installs
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/proj/en/perl/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore sys-apps/paludis )
-SLOT=0
-SRC_URI=mirror://gentoo/perl-cleaner-2.21.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.21.tar.bz2
-_eclass_exported_funcs=src_install:-
-_md5_=871848f570a04898b99776c7da17b758
diff --git a/metadata/md5-cache/app-admin/perl-cleaner-2.23 b/metadata/md5-cache/app-admin/perl-cleaner-2.23
new file mode 100644
index 000000000000..d4277e3c9428
--- /dev/null
+++ b/metadata/md5-cache/app-admin/perl-cleaner-2.23
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=User land tool for cleaning up old perl installs
+EAPI=6
+HOMEPAGE=https://www.gentoo.org/proj/en/perl/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore sys-apps/paludis )
+SLOT=0
+SRC_URI=mirror://gentoo/perl-cleaner-2.23.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.23.tar.bz2
+_eclass_exported_funcs=src_prepare:- src_install:-
+_eclasses_=prefix	99dcca42e6528d8fe3c214bf5731aaf2
+_md5_=c8dcb63690ad910022906d7b9f8db802
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-5.2.3.3 b/metadata/md5-cache/app-office/libreoffice-bin-5.2.3.3
index a944f4235905..e5c5c4fe54a3 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-5.2.3.3
+++ b/metadata/md5-cache/app-office/libreoffice-bin-5.2.3.3
@@ -7,11 +7,11 @@ IUSE=gnome java kde aqua kde elibc_FreeBSD java python_targets_python2_7 python_
 KEYWORDS=-* amd64 x86
 LICENSE=LGPL-3
 PDEPEND==app-office/libreoffice-l10n-5.2.3.3*
-RDEPEND=app-text/hunspell:0/0 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.56.0 dev-libs/icu:0/58.1 >=media-gfx/graphite2-1.2.0 media-libs/glew:0/1.10 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 >=sys-devel/gcc-4.9.3 >=sys-libs/glibc-2.22 virtual/jpeg:62 kde? ( >=kde-frameworks/kdelibs-4.14.24:4 >=dev-qt/qtcore-4.8.6-r2:4 >=dev-qt/qtgui-4.8.6-r4:4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.55:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= =dev-libs/liborcus-0.11* dev-libs/librevenge dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.0d:0 >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/glew-1.10:= >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/jpeg:0 x11-libs/cairo[X,-xlib-xcb] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/opengl net-print/cups dev-libs/dbus-glib gnome? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) gnome? ( gnome-base/dconf ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 gnome? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) !app-office/libreoffice !app-office/openoffice media-fonts/liberation-fonts media-fonts/libertine media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) kde? ( >=kde-apps/kioclient-4.4:4[aqua=] ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-text/hunspell:0/0 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.56.0 dev-libs/icu:0/58.1 >=media-gfx/graphite2-1.2.0 || ( media-libs/glew:0/1.10 media-libs/glew:1.10 ) media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 >=sys-devel/gcc-4.9.3 >=sys-libs/glibc-2.22 virtual/jpeg:62 kde? ( >=kde-frameworks/kdelibs-4.14.24:4 >=dev-qt/qtcore-4.8.6-r2:4 >=dev-qt/qtgui-4.8.6-r4:4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.55:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= =dev-libs/liborcus-0.11* dev-libs/librevenge dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.0d:0 >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/glew-1.10:= >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/jpeg:0 x11-libs/cairo[X,-xlib-xcb] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/opengl net-print/cups dev-libs/dbus-glib gnome? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) gnome? ( gnome-base/dconf ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 gnome? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) !app-office/libreoffice !app-office/openoffice media-fonts/liberation-fonts media-fonts/libertine media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) kde? ( >=kde-apps/kioclient-4.4:4[aqua=] ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde )
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-5.2.3.3.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-5.2.3.3.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-5.2.3.3.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-5.2.3.3.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-5.2.3.3.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-5.2.3.3.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-5.2.3.3.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-5.2.3.3.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-5.2.3.3.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-5.2.3.3.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-5.2.3.3.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-5.2.3.3.xd3 ) ) ) )
 _eclass_exported_funcs=pkg_pretend:- pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:- src_unpack:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	kde4-base	958da2c50ab906e72cd6fc7c77146404	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e5073f9ea1bada1309a026e77a947e1c
+_md5_=35ea9bf18e4974282b945b347766cf30
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-4.2.6 b/metadata/md5-cache/dev-ruby/actionmailer-4.2.6
index 3e8fdedcbd1c..b8c992bd57ff 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-4.2.6
+++ b/metadata/md5-cache/dev-ruby/actionmailer-4.2.6
@@ -4,7 +4,7 @@ DESCRIPTION=Framework for designing email-service layers
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/actionpack-4.2.6[ruby_targets_ruby20] ~dev-ruby/actionview-4.2.6[ruby_targets_ruby20] ~dev-ruby/activejob-4.2.6[ruby_targets_ruby20] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby20] =dev-ruby/mail-2*:*[ruby_targets_ruby20] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/actionpack-4.2.6[ruby_targets_ruby21] ~dev-ruby/actionview-4.2.6[ruby_targets_ruby21] ~dev-ruby/activejob-4.2.6[ruby_targets_ruby21] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby21] =dev-ruby/mail-2*:*[ruby_targets_ruby21] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/actionpack-4.2.6[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.6[ruby_targets_ruby22] ~dev-ruby/activejob-4.2.6[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_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=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.6.tar.gz -> rails-4.2.6.tgz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=54ced5838fc380c5c820ec992fbaf3c2
+_md5_=9a3a2e90720856b6f64304d4e5d39685
diff --git a/metadata/md5-cache/dev-ruby/actionpack-4.2.6 b/metadata/md5-cache/dev-ruby/actionpack-4.2.6
index 727ac2e21a09..bba73e5fc400 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-4.2.6
+++ b/metadata/md5-cache/dev-ruby/actionpack-4.2.6
@@ -4,7 +4,7 @@ DESCRIPTION=Eases web-request routing, handling, and response
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.2.6[ruby_targets_ruby20] ~dev-ruby/actionview-4.2.6[ruby_targets_ruby20] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby20] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby20] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby20] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.6[ruby_targets_ruby21] ~dev-ruby/actionview-4.2.6[ruby_targets_ruby21] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby21] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby21] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby21] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.6[ruby_targets_ruby22] ~dev-ruby/actionview-4.2.6[ruby_targets_ruby22] >=dev-ruby/rack-1.6.0:1.6[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby22] ) ruby_targets_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=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.6.tar.gz -> rails-4.2.6.tgz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1f525de0d9b0881f28cbc61944c13c23
+_md5_=781b1ef24d33905a6e0b020e6381f818
diff --git a/metadata/md5-cache/dev-ruby/actionview-4.2.6 b/metadata/md5-cache/dev-ruby/actionview-4.2.6
index 277a77c1ed08..e7e36338156a 100644
--- a/metadata/md5-cache/dev-ruby/actionview-4.2.6
+++ b/metadata/md5-cache/dev-ruby/actionview-4.2.6
@@ -4,7 +4,7 @@ DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails/
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.2.6[ruby_targets_ruby20] >=dev-ruby/builder-3.1:*[ruby_targets_ruby20] =dev-ruby/builder-3*:*[ruby_targets_ruby20] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby20] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby20] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.6[ruby_targets_ruby21] >=dev-ruby/builder-3.1:*[ruby_targets_ruby21] =dev-ruby/builder-3*:*[ruby_targets_ruby21] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby21] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby21] >=dev-ruby/rails-dom-testing-1.0.5:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.6[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] >=dev-ruby/rails-dom-testing-1.0.5:1[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=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.6.tar.gz -> rails-4.2.6.tgz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dcfc2b3f79d462b66521a6e38b7f257f
+_md5_=ed3f955ce3124a288eb2011623d4c31f
diff --git a/metadata/md5-cache/dev-ruby/activejob-4.2.6 b/metadata/md5-cache/dev-ruby/activejob-4.2.6
index 41ae5f75eb8e..67dd8156425d 100644
--- a/metadata/md5-cache/dev-ruby/activejob-4.2.6
+++ b/metadata/md5-cache/dev-ruby/activejob-4.2.6
@@ -4,7 +4,7 @@ DESCRIPTION=Job framework with pluggable queues
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.2.6[ruby_targets_ruby20] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.6[ruby_targets_ruby21] >=dev-ruby/globalid-0.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.6[ruby_targets_ruby22] >=dev-ruby/globalid-0.3.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 )
@@ -12,4 +12,4 @@ SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.6.tar.gz -> rails-4.2.6.tgz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=afc2c83b5589b219e11665142c28506b
+_md5_=b729cf9995f62a6be510e334fac76c40
diff --git a/metadata/md5-cache/dev-ruby/activemodel-4.2.6 b/metadata/md5-cache/dev-ruby/activemodel-4.2.6
index 1431d30205a7..d572187c5dbb 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-4.2.6
+++ b/metadata/md5-cache/dev-ruby/activemodel-4.2.6
@@ -4,7 +4,7 @@ DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Acti
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.2.6:*[ruby_targets_ruby20] >=dev-ruby/builder-3.1:*[ruby_targets_ruby20] =dev-ruby/builder-3*:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.6:*[ruby_targets_ruby21] >=dev-ruby/builder-3.1:*[ruby_targets_ruby21] =dev-ruby/builder-3*:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.6:*[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[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=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.6.tar.gz -> rails-4.2.6.tgz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4fa696208a0854a5131213460ac06ee4
+_md5_=9c8ed7a5007ed8e7746d4af4ba5027cb
diff --git a/metadata/md5-cache/dev-ruby/activerecord-4.2.6 b/metadata/md5-cache/dev-ruby/activerecord-4.2.6
index 49ff0a704dab..f4e582dbb2de 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-4.2.6
+++ b/metadata/md5-cache/dev-ruby/activerecord-4.2.6
@@ -4,7 +4,7 @@ DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails/
 IUSE=mysql postgres sqlite test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.2.6[ruby_targets_ruby20] ~dev-ruby/activemodel-4.2.6[ruby_targets_ruby20] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby20] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby20] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby20] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby20] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.6[ruby_targets_ruby21] ~dev-ruby/activemodel-4.2.6[ruby_targets_ruby21] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby21] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby21] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby21] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby21] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.6[ruby_targets_ruby22] ~dev-ruby/activemodel-4.2.6[ruby_targets_ruby22] >=dev-ruby/arel-6.0:6.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.13:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.15.0[ruby_targets_ruby22] ) ) ruby_targets_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=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.6.tar.gz -> rails-4.2.6.tgz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=05be64f273a8c81b2abdc34f347e8530
+_md5_=4c588875e9ccaa7c050f7a92805b050a
diff --git a/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4 b/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4
index 06e3a9a6ed3e..97b6dfdc3c07 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4
+++ b/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4
@@ -4,7 +4,7 @@ DESCRIPTION=Used to extract and deprecate old-style finder option hashes in Acti
 EAPI=5
 HOMEPAGE=https://github.com/rails
 IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 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 )
@@ -12,4 +12,4 @@ SLOT=1.0
 SRC_URI=https://github.com/rails/activerecord-deprecated_finders/archive/v1.0.4.tar.gz -> activerecord-deprecated_finders-1.0.4.tar.gz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a1c33a2018576a35a14054e7fdd6d1aa
+_md5_=7220624ec1d25ff58ca46bfa7e5d1b84
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.2.6 b/metadata/md5-cache/dev-ruby/activesupport-4.2.6
index cc6949a32953..549b1de0ad73 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-4.2.6
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.2.6
@@ -4,7 +4,7 @@ DESCRIPTION=Utility Classes and Extension to the Standard Library
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby20] >=dev-ruby/json-1.7.7:0[ruby_targets_ruby20] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby20] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby20] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby21] >=dev-ruby/json-1.7.7:0[ruby_targets_ruby21] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby21] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby21] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby22] >=dev-ruby/json-1.7.7:0[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] >=dev-ruby/thread_safe-0.3.4:0[ruby_targets_ruby22] ) ruby_targets_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=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.6.tar.gz -> rails-4.2.6.tgz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=106d76214ed0f68408d574455ec843c0
+_md5_=5c993cf8fde943dc035235908f5f8113
diff --git a/metadata/md5-cache/dev-ruby/github_api-0.12.4 b/metadata/md5-cache/dev-ruby/github_api-0.12.4
index ad1ab582dc6a..9ba572036b7b 100644
--- a/metadata/md5-cache/dev-ruby/github_api-0.12.4
+++ b/metadata/md5-cache/dev-ruby/github_api-0.12.4
@@ -4,7 +4,7 @@ DESCRIPTION=A Ruby wrapper for the GitHub REST API v3
 EAPI=5
 HOMEPAGE=https://github.com/peter-murach/github
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby20] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby20] >=dev-ruby/faraday-0.8[ruby_targets_ruby20] <dev-ruby/faraday-0.10[ruby_targets_ruby20] >=dev-ruby/hashie-3.4[ruby_targets_ruby20] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby20] <dev-ruby/multi_json-2.0[ruby_targets_ruby20] >=dev-ruby/nokogiri-1.6.6[ruby_targets_ruby20] dev-ruby/oauth2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] >=dev-ruby/descendants_tracker-0.0.4[ruby_targets_ruby21] >=dev-ruby/faraday-0.8[ruby_targets_ruby21] <dev-ruby/faraday-0.10[ruby_targets_ruby21] >=dev-ruby/hashie-3.4[ruby_targets_ruby21] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby21] <dev-ruby/multi_json-2.0[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.6.6[ruby_targets_ruby21] dev-ruby/oauth2[ruby_targets_ruby21] ) 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 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/peter-murach/github/archive/v0.12.4.tar.gz -> github_api-0.12.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	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=32eaa5ef6f8eff7be6bd1e98f3dce374
+_md5_=7966306ccd9c2d5b77f89f1e12bee3a0
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.3.6 b/metadata/md5-cache/dev-ruby/globalid-0.3.6
index 83804b4d1ed8..fee9ae7d1a00 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.3.6
+++ b/metadata/md5-cache/dev-ruby/globalid-0.3.6
@@ -4,7 +4,7 @@ DESCRIPTION=Reference models by URI
 EAPI=5
 HOMEPAGE=https://github.com/rails/globalid
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_ruby22] ) ruby_targets_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
 SRC_URI=https://github.com/rails/globalid/archive/v0.3.6.tar.gz -> globalid-0.3.6.tar.gz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ce802c1a3a955178c0802ee555bc5cb1
+_md5_=c4eeb9f35456b46b3b80abd08e3a745b
diff --git a/metadata/md5-cache/dev-ruby/hashie-3.4.4 b/metadata/md5-cache/dev-ruby/hashie-3.4.4
index 179a7b329218..fbdd0ea8c6d3 100644
--- a/metadata/md5-cache/dev-ruby/hashie-3.4.4
+++ b/metadata/md5-cache/dev-ruby/hashie-3.4.4
@@ -4,7 +4,7 @@ DESCRIPTION=Hashie is a small collection of tools that make hashes more powerful
 EAPI=5
 HOMEPAGE=http://intridea.com/posts/hashie-the-hash-toolkit
 IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_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=3
 SRC_URI=mirror://rubygems/hashie-3.4.4.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1b81cb99fc223fbead4b7dffca9ae214
+_md5_=2e7036d01a9df727000cadb4bfd1a25c
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.6.11 b/metadata/md5-cache/dev-ruby/i18n-0.6.11
index 2e2bfa46180c..de45a0856ab0 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.6.11
+++ b/metadata/md5-cache/dev-ruby/i18n-0.6.11
@@ -4,7 +4,7 @@ DESCRIPTION=Add Internationalization support to your Ruby application
 EAPI=5
 HOMEPAGE=http://rails-i18n.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=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 )
@@ -12,4 +12,4 @@ SLOT=0.6
 SRC_URI=mirror://rubygems/i18n-0.6.11.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1f659b910a3dbb1f0b837e8a9e409ccd
+_md5_=91e6850e62ca666a92ce16b12f988c99
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.6.9-r1 b/metadata/md5-cache/dev-ruby/i18n-0.6.9-r1
index b4e4c7ac52b7..33c3db7eddb4 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.6.9-r1
+++ b/metadata/md5-cache/dev-ruby/i18n-0.6.9-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Add Internationalization support to your Ruby application
 EAPI=5
 HOMEPAGE=http://rails-i18n.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc 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
+KEYWORDS=~amd64 ~arm ~hppa ~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_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 )
@@ -12,4 +12,4 @@ SLOT=0.6
 SRC_URI=mirror://rubygems/i18n-0.6.9.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4545150d9bac4f8f888c29e5573acee1
+_md5_=6cba119ae918d7ca686002d87e2dad49
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.7.0 b/metadata/md5-cache/dev-ruby/i18n-0.7.0
index 777c2cfb8ea5..3fd6932940a9 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.7.0
+++ b/metadata/md5-cache/dev-ruby/i18n-0.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=Add Internationalization support to your Ruby application
 EAPI=5
 HOMEPAGE=http://rails-i18n.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=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 )
@@ -12,4 +12,4 @@ SLOT=0.7
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v0.7.0.tar.gz -> i18n-0.7.0.tar.gz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0453eaa683698adb88de65703abb0995
+_md5_=7c636531da72f7d2e487b41f2ef885f4
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.7.0-r1 b/metadata/md5-cache/dev-ruby/i18n-0.7.0-r1
index 38284d571339..4d7f9604533e 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.7.0-r1
+++ b/metadata/md5-cache/dev-ruby/i18n-0.7.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Add Internationalization support to your Ruby application
 EAPI=5
 HOMEPAGE=http://rails-i18n.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=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 )
@@ -12,4 +12,4 @@ SLOT=0.7
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v0.7.0.tar.gz -> i18n-0.7.0.tar.gz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b6950f31c6fa07f47bd43a38b3e8bf2f
+_md5_=9cda0bb8f16f6731043bcbadb7e2abd4
diff --git a/metadata/md5-cache/dev-ruby/jeweler-2.0.1-r2 b/metadata/md5-cache/dev-ruby/jeweler-2.0.1-r2
index 1a9815dfe2f4..9591afb97412 100644
--- a/metadata/md5-cache/dev-ruby/jeweler-2.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/jeweler-2.0.1-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Rake tasks to manage gems, versioning and generate new projects
 EAPI=5
 HOMEPAGE=https://wiki.github.com/technicalpickles/jeweler
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( dev-ruby/rake[ruby_targets_ruby20] >=dev-ruby/git-1.2.5[ruby_targets_ruby20] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby20] dev-ruby/github_api[ruby_targets_ruby20] >=dev-ruby/highline-1.6.15[ruby_targets_ruby20] >=dev-ruby/bundler-1.0[ruby_targets_ruby20] dev-ruby/rdoc[ruby_targets_ruby20] dev-ruby/builder:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] >=dev-ruby/git-1.2.5[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.5.10[ruby_targets_ruby21] dev-ruby/github_api[ruby_targets_ruby21] >=dev-ruby/highline-1.6.15[ruby_targets_ruby21] >=dev-ruby/bundler-1.0[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] dev-ruby/builder:*[ruby_targets_ruby21] ) 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 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://rubygems/jeweler-2.0.1.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=38744cf0339b6c3c73f1980e28dbe41b
+_md5_=5ff9e937e87bc8a3c33fcecf12423cb6
diff --git a/metadata/md5-cache/dev-ruby/kramdown-1.4.2 b/metadata/md5-cache/dev-ruby/kramdown-1.4.2
index e9f8bcf37b26..8dfb51cbaf26 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-1.4.2
+++ b/metadata/md5-cache/dev-ruby/kramdown-1.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=Yet-another-markdown-parser but fast, pure Ruby, using strict syntax
 EAPI=5
 HOMEPAGE=http://kramdown.rubyforge.org/
 IUSE=latex elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) 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 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://rubygems/kramdown-1.4.2.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=254e41e55fa2ff6a1280e237ac40b38d
+_md5_=68d9b6f031ab1e1eb4fff24d94b2833d
diff --git a/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3 b/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3
index 2e00c7384b87..c21081f55c34 100644
--- a/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3
+++ b/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3
@@ -4,7 +4,7 @@ DESCRIPTION=Deprecated sanitizer API extracted from Action View
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails-deprecated_sanitizer
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2[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
 SRC_URI=mirror://rubygems/rails-deprecated_sanitizer-1.0.3.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bf11d42cfd966a2b3b56f82ea4b0567c
+_md5_=3f41bbd9ad2c394c7ff7c2a255ee0098
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.7 b/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.7
index ed668a04beb3..258504332039 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.7
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.7
@@ -4,7 +4,7 @@ DESCRIPTION=Compare doms and assert certain elements exists in doms using Nokogi
 EAPI=5
 HOMEPAGE=https://github.com/kaspth/rails-dom-testing
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( dev-ruby/activesupport:4.2[ruby_targets_ruby20] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby20] =dev-ruby/nokogiri-1.6*[ruby_targets_ruby20] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/activesupport:4.2[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby21] =dev-ruby/nokogiri-1.6*[ruby_targets_ruby21] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/activesupport:4.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] =dev-ruby/nokogiri-1.6*[ruby_targets_ruby22] >=dev-ruby/rails-deprecated_sanitizer-1.0.1[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=1
 SRC_URI=mirror://rubygems/rails-dom-testing-1.0.7.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a54f1f3f318fb7ad789168836b0d0074
+_md5_=7f74ef6b2e35f0568f9b73430488fb76
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.0 b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.0
index 78d8856eba48..78884d6f6f3e 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.0
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Compare doms and assert certain elements exists in doms using Nokogi
 EAPI=5
 HOMEPAGE=https://github.com/kaspth/rails-dom-testing
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby20] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby20] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby20] =dev-ruby/nokogiri-1.6*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby21] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby21] =dev-ruby/nokogiri-1.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] =dev-ruby/nokogiri-1.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=2
 SRC_URI=mirror://rubygems/rails-dom-testing-2.0.0.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=199f5d3355c064b5804670fa57a567b6
+_md5_=a773c5a84b33a7fabc1a5efe27ea4092
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.1 b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.1
index 19a5684c6a47..ef6f1dedeeff 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.1
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Compare doms and assert certain elements exists in doms using Nokogi
 EAPI=5
 HOMEPAGE=https://github.com/kaspth/rails-dom-testing
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby20] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby20] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby20] =dev-ruby/nokogiri-1.6*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby21] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby21] =dev-ruby/nokogiri-1.6*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby22] =dev-ruby/nokogiri-1.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=2
 SRC_URI=mirror://rubygems/rails-dom-testing-2.0.1.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=199f5d3355c064b5804670fa57a567b6
+_md5_=a773c5a84b33a7fabc1a5efe27ea4092
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3
index 26613599325f..af0b05a0c3c8 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3
@@ -4,7 +4,7 @@ DESCRIPTION=Sanitize HTML fragments in Rails applications
 EAPI=5
 HOMEPAGE=https://github.com/rafaelfranca/rails-html-sanitizer
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( dev-ruby/loofah:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/loofah:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/loofah: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 )
@@ -12,4 +12,4 @@ SLOT=1
 SRC_URI=mirror://rubygems/rails-html-sanitizer-1.0.3.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4b55c83e7825f2541d7c5c85b6b1b164
+_md5_=08ca51f97428a0f130ae2679409fb65c
diff --git a/metadata/md5-cache/dev-ruby/railties-4.2.6 b/metadata/md5-cache/dev-ruby/railties-4.2.6
index edd66577fa53..470ea886b1c3 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.2.6
+++ b/metadata/md5-cache/dev-ruby/railties-4.2.6
@@ -4,7 +4,7 @@ DESCRIPTION=Tools for creating, working with, and running Rails applications
 EAPI=5
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=>=app-eselect/eselect-rails-0.21 ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.2.6[ruby_targets_ruby20] ~dev-ruby/actionpack-4.2.6[ruby_targets_ruby20] >=dev-ruby/thor-0.18.1[ruby_targets_ruby20] >=dev-ruby/rake-0.8.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.6[ruby_targets_ruby21] ~dev-ruby/actionpack-4.2.6[ruby_targets_ruby21] >=dev-ruby/thor-0.18.1[ruby_targets_ruby21] >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/activesupport-4.2.6[ruby_targets_ruby22] ~dev-ruby/actionpack-4.2.6[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[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 )
@@ -13,4 +13,4 @@ SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.6.tar.gz -> rails-4.2.6.tgz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7afb89c1c659d014b6663a455e8faee4
+_md5_=9bf3ccd645fbe38a804dbd7e342a4992
diff --git a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r2 b/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r2
index b3d1969c8174..cb93ec51ed1b 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r2
+++ b/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Making tests easy on the fingers and eyes
 EAPI=5
 HOMEPAGE=http://thoughtbot.com/projects/shoulda
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby20] >=dev-ruby/shoulda-matchers-1.4.1:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby21] >=dev-ruby/shoulda-matchers-1.4.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby22] >=dev-ruby/shoulda-matchers-1.4.1:0[ruby_targets_ruby22] ) ruby_targets_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 )
@@ -13,4 +13,4 @@ SLOT=3
 SRC_URI=https://github.com/thoughtbot/shoulda/archive/v3.5.0.tar.gz -> shoulda-3.5.0.tar.gz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1c2fd7ab4b38e202fd7c2766c698118f
+_md5_=c017d4448ef463639e3279972e096070
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0 b/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0
index d09add669afd..6d309df36d27 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0
@@ -4,7 +4,7 @@ DESCRIPTION=Making tests easy on the fingers and eyes
 EAPI=5
 HOMEPAGE=https://github.com/thoughtbot/shoulda-matchers
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby22] ) ruby_targets_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
 SRC_URI=mirror://rubygems/shoulda-matchers-2.8.0.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b2e9faab387db068a8eed98a79e9c0b4
+_md5_=58afbbeedf395a021c645fb8bf2e94be
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.0 b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.0
index f6ddb0dfc4c1..e10c45f17b40 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.0
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Making tests easy on the fingers and eyes
 EAPI=5
 HOMEPAGE=https://github.com/thoughtbot/shoulda-matchers
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby22] ) ruby_targets_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=3
 SRC_URI=mirror://rubygems/shoulda-matchers-3.1.0.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3ccda46572fa416c938fc272ad9020ab
+_md5_=f65bfc25b4145b4b8790d8e921c20ee5
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1
index 7126a07b1ceb..e74e370a09dc 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Making tests easy on the fingers and eyes
 EAPI=5
 HOMEPAGE=https://github.com/thoughtbot/shoulda-matchers
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby22] ) ruby_targets_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=3
 SRC_URI=mirror://rubygems/shoulda-matchers-3.1.1.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3ccda46572fa416c938fc272ad9020ab
+_md5_=f65bfc25b4145b4b8790d8e921c20ee5
diff --git a/metadata/md5-cache/dev-ruby/stringex-2.6.1 b/metadata/md5-cache/dev-ruby/stringex-2.6.1
index b7c89f52cbfb..a3a92561cda5 100644
--- a/metadata/md5-cache/dev-ruby/stringex-2.6.1
+++ b/metadata/md5-cache/dev-ruby/stringex-2.6.1
@@ -4,7 +4,7 @@ DESCRIPTION=Extensions for Ruby's String class
 EAPI=5
 HOMEPAGE=https://github.com/rsl/stringex
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc64 ~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 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://rubygems/stringex-2.6.1.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e5d774303c4b5d0c8b59298f818814f4
+_md5_=958345663994cb877a2a0a5fc719eb75
diff --git a/metadata/md5-cache/dev-ruby/treetop-1.6.5 b/metadata/md5-cache/dev-ruby/treetop-1.6.5
index 1ec93c24c8f6..fafceb2d812f 100644
--- a/metadata/md5-cache/dev-ruby/treetop-1.6.5
+++ b/metadata/md5-cache/dev-ruby/treetop-1.6.5
@@ -4,7 +4,7 @@ DESCRIPTION=Treetop is a language for describing languages
 EAPI=5
 HOMEPAGE=https://github.com/cjheath/treetop
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby22] ) ruby_targets_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
 SRC_URI=mirror://rubygems/treetop-1.6.5.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d35f219292beb0f13b398a881160a7f7
+_md5_=f921f018ef50eee8e81fc7a819674982
diff --git a/metadata/md5-cache/media-sound/abcm2ps-8.13.2 b/metadata/md5-cache/media-sound/abcm2ps-8.13.2
new file mode 100644
index 000000000000..50ea69e12385
--- /dev/null
+++ b/metadata/md5-cache/media-sound/abcm2ps-8.13.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install
+DEPEND=pango? ( x11-libs/pango media-libs/freetype:2 ) virtual/pkgconfig
+DESCRIPTION=A program to convert abc files to Postscript files
+EAPI=6
+HOMEPAGE=http://moinejf.free.fr/
+IUSE=examples pango
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=pango? ( x11-libs/pango media-libs/freetype:2 )
+SLOT=0
+SRC_URI=http://moinejf.free.fr/abcm2ps-8.13.2.tar.gz http://moinejf.free.fr/transpose_abc.pl
+_eclass_exported_funcs=src_configure:- src_compile:- src_install:-
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=f3f1883d57a825046050da3982a4dab8
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-9.2.0 b/metadata/md5-cache/media-video/mkvtoolnix-9.2.0
deleted file mode 100644
index c793846ab353..000000000000
--- a/metadata/md5-cache/media-video/mkvtoolnix-9.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) || ( ( dev-lang/ruby:2.3 virtual/rubygems[ruby_targets_ruby23] ) ( dev-lang/ruby:2.2 virtual/rubygems[ruby_targets_ruby22] ) ( dev-lang/ruby:2.1 virtual/rubygems[ruby_targets_ruby21] ) ( dev-lang/ruby:2.0 virtual/rubygems[ruby_targets_ruby20] ) ) sys-devel/gettext virtual/pkgconfig test? ( dev-cpp/gtest ) !<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=Tools to create, alter, and inspect Matroska files
-EAPI=5
-HOMEPAGE=http://www.bunkus.org/videotools/mkvtoolnix
-IUSE=curl debug pch test qt5
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 )
-SLOT=0
-SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-9.2.0.tar.xz
-_eclass_exported_funcs=pkg_pretend:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2e1d290f8b1dc3f4117d7f5003e08826
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-9.3.1 b/metadata/md5-cache/media-video/mkvtoolnix-9.3.1
deleted file mode 100644
index df00cba14e52..000000000000
--- a/metadata/md5-cache/media-video/mkvtoolnix-9.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) || ( ( dev-lang/ruby:2.3 virtual/rubygems[ruby_targets_ruby23] ) ( dev-lang/ruby:2.2 virtual/rubygems[ruby_targets_ruby22] ) ( dev-lang/ruby:2.1 virtual/rubygems[ruby_targets_ruby21] ) ( dev-lang/ruby:2.0 virtual/rubygems[ruby_targets_ruby20] ) ) sys-devel/gettext virtual/pkgconfig test? ( dev-cpp/gtest ) !<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=Tools to create, alter, and inspect Matroska files
-EAPI=5
-HOMEPAGE=http://www.bunkus.org/videotools/mkvtoolnix
-IUSE=curl debug pch test qt5
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 )
-SLOT=0
-SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-9.3.1.tar.xz
-_eclass_exported_funcs=pkg_pretend:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2e1d290f8b1dc3f4117d7f5003e08826
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-9.4.0 b/metadata/md5-cache/media-video/mkvtoolnix-9.4.0
deleted file mode 100644
index 23e6745b6e53..000000000000
--- a/metadata/md5-cache/media-video/mkvtoolnix-9.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) || ( ( dev-lang/ruby:2.3 virtual/rubygems[ruby_targets_ruby23] ) ( dev-lang/ruby:2.2 virtual/rubygems[ruby_targets_ruby22] ) ( dev-lang/ruby:2.1 virtual/rubygems[ruby_targets_ruby21] ) ( dev-lang/ruby:2.0 virtual/rubygems[ruby_targets_ruby20] ) ) sys-devel/gettext virtual/pkgconfig test? ( dev-cpp/gtest ) !<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=Tools to create, alter, and inspect Matroska files
-EAPI=5
-HOMEPAGE=http://www.bunkus.org/videotools/mkvtoolnix
-IUSE=curl debug pch test qt5
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 )
-SLOT=0
-SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-9.4.0.tar.xz
-_eclass_exported_funcs=pkg_pretend:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2e1d290f8b1dc3f4117d7f5003e08826
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-9.5.0 b/metadata/md5-cache/media-video/mkvtoolnix-9.5.0
deleted file mode 100644
index 6f6bd827cc52..000000000000
--- a/metadata/md5-cache/media-video/mkvtoolnix-9.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) || ( ( dev-lang/ruby:2.3 virtual/rubygems[ruby_targets_ruby23] ) ( dev-lang/ruby:2.2 virtual/rubygems[ruby_targets_ruby22] ) ( dev-lang/ruby:2.1 virtual/rubygems[ruby_targets_ruby21] ) ( dev-lang/ruby:2.0 virtual/rubygems[ruby_targets_ruby20] ) ) sys-devel/gettext virtual/pkgconfig test? ( dev-cpp/gtest ) !<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=Tools to create, alter, and inspect Matroska files
-EAPI=5
-HOMEPAGE=http://www.bunkus.org/videotools/mkvtoolnix
-IUSE=curl debug pch test qt5
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 )
-SLOT=0
-SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-9.5.0.tar.xz
-_eclass_exported_funcs=pkg_pretend:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2e1d290f8b1dc3f4117d7f5003e08826
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-9.4.2 b/metadata/md5-cache/media-video/mkvtoolnix-9.7.1
index 25554c9c2b8a..e806589d51b5 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-9.4.2
+++ b/metadata/md5-cache/media-video/mkvtoolnix-9.7.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) || ( ( dev-lang/ruby:2.3 virtual/rubygems[ruby_targets_ruby23] ) ( dev-lang/ruby:2.2 virtual/rubygems[ruby_targets_ruby22] ) ( dev-lang/ruby:2.1 virtual/rubygems[ruby_targets_ruby21] ) ( dev-lang/ruby:2.0 virtual/rubygems[ruby_targets_ruby20] ) ) sys-devel/gettext virtual/pkgconfig test? ( dev-cpp/gtest ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) || ( ( dev-lang/ruby:2.3 virtual/rubygems[ruby_targets_ruby23] ) ( dev-lang/ruby:2.2 virtual/rubygems[ruby_targets_ruby22] ) ( dev-lang/ruby:2.1 virtual/rubygems[ruby_targets_ruby21] ) ) sys-devel/gettext virtual/pkgconfig test? ( dev-cpp/gtest ) !<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=Tools to create, alter, and inspect Matroska files
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.bunkus.org/videotools/mkvtoolnix
 IUSE=curl debug pch test qt5
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 )
 SLOT=0
-SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-9.4.2.tar.xz
+SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-9.7.1.tar.xz
 _eclass_exported_funcs=pkg_pretend:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2e1d290f8b1dc3f4117d7f5003e08826
+_md5_=454f4d5ece4d0002bdb94485f5d3058b
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.4.0-r1 b/metadata/md5-cache/net-analyzer/netdata-1.4.0-r1
index 1bf43656e0a9..78a993f965e4 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.4.0-r1
+++ b/metadata/md5-cache/net-analyzer/netdata-1.4.0-r1
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://firehol.org/download/netdata/releases/v1.4.0/netdata-1.4.0.tar.xz
 _eclass_exported_funcs=pkg_postinst:fcaps pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=771467f230d3fb5aeebd21c48a93e18a
+_md5_=6d897ba3be7d7f5cfd01a8a14a2c1ea9
diff --git a/metadata/md5-cache/net-dns/knot-2.3.1 b/metadata/md5-cache/net-dns/knot-2.3.1
deleted file mode 100644
index 9b04d6d57131..000000000000
--- a/metadata/md5-cache/net-dns/knot-2.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst test
-DEPEND=>=net-libs/gnutls-3.3 >=dev-libs/jansson-2.3 >=dev-db/lmdb-0.9.15 >=dev-libs/userspace-rcu-0.5.4 caps? ( >=sys-libs/libcap-ng-0.6.4 ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) idn? ( net-dns/libidn ) dev-libs/libedit systemd? ( sys-apps/systemd ) virtual/pkgconfig doc? ( dev-python/sphinx ) virtual/pkgconfig
-DESCRIPTION=High-performance authoritative-only DNS server
-EAPI=6
-HOMEPAGE=http://www.knot-dns.cz/
-IUSE=debug dnstap doc caps +fastparser idn systemd
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=net-libs/gnutls-3.3 >=dev-libs/jansson-2.3 >=dev-db/lmdb-0.9.15 >=dev-libs/userspace-rcu-0.5.4 caps? ( >=sys-libs/libcap-ng-0.6.4 ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) idn? ( net-dns/libidn ) dev-libs/libedit systemd? ( sys-apps/systemd )
-SLOT=0
-SRC_URI=https://secure.nic.cz/files/knot-dns/knot-2.3.1.tar.xz
-_eclass_exported_funcs=pkg_postinst:- src_configure:- src_compile:- src_test:- src_install:-
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=47723f2ec5fb81b3ffea4da01ab8e3cf
diff --git a/metadata/md5-cache/net-dns/knot-2.3.3 b/metadata/md5-cache/net-dns/knot-2.3.3
new file mode 100644
index 000000000000..9101adf521bc
--- /dev/null
+++ b/metadata/md5-cache/net-dns/knot-2.3.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=>=net-libs/gnutls-3.3:= >=dev-libs/jansson-2.3 >=dev-db/lmdb-0.9.15 >=dev-libs/userspace-rcu-0.5.4 caps? ( >=sys-libs/libcap-ng-0.6.4 ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) idn? ( net-dns/libidn ) dev-libs/libedit systemd? ( sys-apps/systemd ) virtual/pkgconfig doc? ( dev-python/sphinx ) virtual/pkgconfig
+DESCRIPTION=High-performance authoritative-only DNS server
+EAPI=6
+HOMEPAGE=http://www.knot-dns.cz/
+IUSE=debug dnstap doc caps +fastparser idn systemd
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=net-libs/gnutls-3.3:= >=dev-libs/jansson-2.3 >=dev-db/lmdb-0.9.15 >=dev-libs/userspace-rcu-0.5.4 caps? ( >=sys-libs/libcap-ng-0.6.4 ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) idn? ( net-dns/libidn ) dev-libs/libedit systemd? ( sys-apps/systemd )
+SLOT=0
+SRC_URI=https://secure.nic.cz/files/knot-dns/knot-2.3.3.tar.xz
+_eclass_exported_funcs=pkg_postinst:- src_configure:- src_compile:- src_test:- src_install:-
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
+_md5_=93cde5e2ebb7fa045f8cc2a007d9b312