2017-02-04 15:44:59 UTC

42 files changed, 92 insertions, 132 deletions

diff --git a/metadata/md5-cache/app-text/jist-1.5.1-r1 b/metadata/md5-cache/app-text/jist-1.5.1-r1
index c7057f59955d..3d0d092202df 100644
--- a/metadata/md5-cache/app-text/jist-1.5.1-r1
+++ b/metadata/md5-cache/app-text/jist-1.5.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/json:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/json:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json:*[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/webmock[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/webmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock[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? ( 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_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[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_ruby21? ( dev-ruby/json:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/webmock:0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock:0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A ruby gem to publish a gist
 EAPI=5
 HOMEPAGE=https://github.com/ConradIrwin/jist
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-ruby/json:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/json:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json:*[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_ruby21? ( dev-ruby/json:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:*[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/jist-1.5.1.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=41c299e6688035bdf449417422791b9f
+_md5_=60ca9607255d7072eece98358152f3ed
diff --git a/metadata/md5-cache/app-text/webgen-1.3.0 b/metadata/md5-cache/app-text/webgen-1.3.0
deleted file mode 100644
index 55b50a02735d..000000000000
--- a/metadata/md5-cache/app-text/webgen-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) test? ( dev-ruby/kramdown[ruby_targets_ruby20] dev-ruby/minitest:5[ruby_targets_ruby20] dev-ruby/rdiscount[ruby_targets_ruby20] >=dev-ruby/sass-3.2:0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) test? ( dev-ruby/kramdown[ruby_targets_ruby21] dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/rdiscount[ruby_targets_ruby21] >=dev-ruby/sass-3.2:0[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby20? ( >=dev-ruby/cmdparse-2.0.0:0[ruby_targets_ruby20] dev-ruby/systemu[ruby_targets_ruby20] dev-ruby/kramdown[ruby_targets_ruby20] builder? ( >=dev-ruby/builder-2.1.0[ruby_targets_ruby20] ) highlight? ( >=dev-ruby/coderay-0.8.312[ruby_targets_ruby20] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >=dev-ruby/cmdparse-2.0.0:0[ruby_targets_ruby21] dev-ruby/systemu[ruby_targets_ruby21] dev-ruby/kramdown[ruby_targets_ruby21] builder? ( >=dev-ruby/builder-2.1.0[ruby_targets_ruby21] ) highlight? ( >=dev-ruby/coderay-0.8.312[ruby_targets_ruby21] ) markdown? ( dev-ruby/maruku[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/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] ) )
-DESCRIPTION=A template-based static website generator
-EAPI=5
-HOMEPAGE=http://webgen.gettalong.org
-IUSE=builder highlight markdown test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/cmdparse-2.0.0:0[ruby_targets_ruby20] dev-ruby/systemu[ruby_targets_ruby20] dev-ruby/kramdown[ruby_targets_ruby20] builder? ( >=dev-ruby/builder-2.1.0[ruby_targets_ruby20] ) highlight? ( >=dev-ruby/coderay-0.8.312[ruby_targets_ruby20] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >=dev-ruby/cmdparse-2.0.0:0[ruby_targets_ruby21] dev-ruby/systemu[ruby_targets_ruby21] dev-ruby/kramdown[ruby_targets_ruby21] builder? ( >=dev-ruby/builder-2.1.0[ruby_targets_ruby21] ) highlight? ( >=dev-ruby/coderay-0.8.312[ruby_targets_ruby21] ) markdown? ( dev-ruby/maruku[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 )
-SLOT=0
-SRC_URI=mirror://rubygems/webgen-1.3.0.gem
-_eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=386a8821e2861d3443a91c9a98095565
diff --git a/metadata/md5-cache/dev-db/pgadmin3-1.22.1-r1 b/metadata/md5-cache/dev-db/pgadmin3-1.22.1-r1
index b6a3b5521491..f80c3d83ba2c 100644
--- a/metadata/md5-cache/dev-db/pgadmin3-1.22.1-r1
+++ b/metadata/md5-cache/dev-db/pgadmin3-1.22.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=wxWidgets GUI for PostgreSQL
 EAPI=5
 HOMEPAGE=http://www.pgadmin.org/
 IUSE=debug +databasedesigner
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=POSTGRESQL
 RDEPEND=x11-libs/wxGTK:3.0=[X] >=dev-db/postgresql-8.4.0:= >=dev-libs/libxml2-2.6.18 >=dev-libs/libxslt-1.1
 SLOT=0
 SRC_URI=mirror://postgresql/pgadmin3/release/v1.22.1/src/pgadmin3-1.22.1.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
-_md5_=9feb6ce4bc68310d0a7fc138141e36b0
+_md5_=81632744bf1bee89642eca0c70c00c93
diff --git a/metadata/md5-cache/dev-perl/Filesys-Df-0.920.0-r1 b/metadata/md5-cache/dev-perl/Filesys-Df-0.920.0-r1
index 3a52000a5a3f..a69e7eeb7b23 100644
--- a/metadata/md5-cache/dev-perl/Filesys-Df-0.920.0-r1
+++ b/metadata/md5-cache/dev-perl/Filesys-Df-0.920.0-r1
@@ -3,11 +3,11 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Disk free based on Filesys::Statvfs
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Filesys-Df/
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IG/IGUTHRIE/Filesys-Df-0.92.tar.gz
 _eclass_exported_funcs=src_unpack:perl-module src_prepare:perl-module src_configure:perl-module src_compile:perl-module src_test:perl-module src_install:perl-module
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=7069f7ffbf7c78cec04a48d4ff62e4a9
+_md5_=0094542fc0b0965bd824d0d90eddf0e5
diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.800.0 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.800.0
index e23f665ce6a0..0c0490313c36 100644
--- a/metadata/md5-cache/dev-perl/Net-SSLeay-1.800.0
+++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.800.0
@@ -4,11 +4,11 @@ DESCRIPTION=Perl extension for using OpenSSL
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Net-SSLeay/
 IUSE=libressl test minimal examples examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=openssl
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) virtual/perl-MIME-Base64 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/Net-SSLeay-1.80.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:perl-module src_compile:perl-module src_test:perl-module src_install:perl-module
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=94f48a0a0cfb2e886ae23e16a509d52d
+_md5_=a60238167a50eeeddd1aa594e2177434
diff --git a/metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.2-r2 b/metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.2-r2
index a4bfb64d2c06..afd85663cef9 100644
--- a/metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.2-r2
+++ b/metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.2-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Tar file management class
 EAPI=6
 HOMEPAGE=http://pear.php.net/package/Archive_Tar
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 PDEPEND=dev-php/PEAR-PEAR
 RDEPEND=dev-lang/php:*[bzip2,pcre(+),zlib]
 SLOT=0
 SRC_URI=http://pear.php.net/get/Archive_Tar-1.4.2.tgz
 _eclass_exported_funcs=src_install:-
-_md5_=6f8c1a078ab3e85ff0664e05b7fb0877
+_md5_=80627fb04aacaef0736d750ddbd74669
diff --git a/metadata/md5-cache/dev-php/jpgraph-4.0.2 b/metadata/md5-cache/dev-php/jpgraph-4.0.2
index f6148701e9bd..899e7d8daac0 100644
--- a/metadata/md5-cache/dev-php/jpgraph-4.0.2
+++ b/metadata/md5-cache/dev-php/jpgraph-4.0.2
@@ -3,10 +3,10 @@ DESCRIPTION=Object-oriented graphing library for PHP
 EAPI=6
 HOMEPAGE=http://jpgraph.net/
 IUSE=truetype examples
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~sparc ~x86
 LICENSE=QPL-1.0
 RDEPEND=truetype? ( media-fonts/corefonts ) dev-lang/php[gd,truetype?]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mjo/distfiles/jpgraph-4.0.2.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
-_md5_=34ba3f2f990f58f20f4294098d1fb1ab
+_md5_=3fa68ccf8532a3855d0fa52b879fd420
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.9 b/metadata/md5-cache/dev-python/alabaster-0.7.9
index 499a995cdc84..62f75100f0ef 100644
--- a/metadata/md5-cache/dev-python/alabaster-0.7.9
+++ b/metadata/md5-cache/dev-python/alabaster-0.7.9
@@ -4,7 +4,7 @@ DESCRIPTION=A configurable sidebar-enabled Sphinx theme
 EAPI=6
 HOMEPAGE=https://github.com/bitprophet/alabaster
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/a/alabaster/alabaster-0.7.9.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=79c92b4001474c66c01f0a59bd52750c
+_md5_=173359ff61fc3443a179936fa9289a8b
diff --git a/metadata/md5-cache/dev-python/attrs-16.3.0-r1 b/metadata/md5-cache/dev-python/attrs-16.3.0-r1
index 48e144ad1a3a..e640d18c4311 100644
--- a/metadata/md5-cache/dev-python/attrs-16.3.0-r1
+++ b/metadata/md5-cache/dev-python/attrs-16.3.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Attributes without boilerplate
 EAPI=6
 HOMEPAGE=https://github.com/hynek/attrs https://attrs.readthedocs.org/ http://pypi.python.org/pypi/attrs
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/zope-interface[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/a/attrs/attrs-16.3.0.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=484791978044beb34874447e8e108662
+_md5_=ee577a68dd4da618b34bfb4bca34e45f
diff --git a/metadata/md5-cache/dev-python/billiard-3.3.0.23 b/metadata/md5-cache/dev-python/billiard-3.3.0.23
index a91ec190ceac..ec3712d99ebe 100644
--- a/metadata/md5-cache/dev-python/billiard-3.3.0.23
+++ b/metadata/md5-cache/dev-python/billiard-3.3.0.23
@@ -4,7 +4,7 @@ DESCRIPTION=Python multiprocessing fork
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/billiard https://github.com/celery/billiard
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/b/billiard/billiard-3.3.0.23.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a8b0f83145d28d18d0cc735686968970
+_md5_=6eda354b21daae4f90abe11ca0f36a4e
diff --git a/metadata/md5-cache/dev-python/celery-3.1.24-r1 b/metadata/md5-cache/dev-python/celery-3.1.24-r1
index 5c6d0770a28b..1844bfddff54 100644
--- a/metadata/md5-cache/dev-python/celery-3.1.24-r1
+++ b/metadata/md5-cache/dev-python/celery-3.1.24-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Asynchronous task queue/job queue based on distributed message passi
 EAPI=5
 HOMEPAGE=http://celeryproject.org/ https://pypi.python.org/pypi/celery
 IUSE=doc examples redis sqs test yaml zeromq python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=<dev-python/kombu-3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/kombu-3.0.36[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/anyjson-0.3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/billiard-3.3.0.23[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/billiard-3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/greenlet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/c/celery/celery-3.1.24.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=738aad726c570221c83916efad76aae5
+_md5_=610e3b4f9bfc12bd5b515972cec4a976
diff --git a/metadata/md5-cache/dev-python/kombu-3.0.37 b/metadata/md5-cache/dev-python/kombu-3.0.37
index c67d452902c9..fbe6a38655e9 100644
--- a/metadata/md5-cache/dev-python/kombu-3.0.37
+++ b/metadata/md5-cache/dev-python/kombu-3.0.37
@@ -4,7 +4,7 @@ DESCRIPTION=AMQP Messaging Framework for Python
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/kombu https://github.com/celery/kombu
 IUSE=amqplib doc examples msgpack sqs test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/anyjson-0.3.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/py-amqp-1.4.9[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/py-amqp-2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyro:4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-python/pyzmq-13.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( >=dev-python/pyzmq-13.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( >=dev-python/pyzmq-13.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) amqplib? ( >=dev-python/amqplib-1.0.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sqs? ( >=dev-python/boto-2.13.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) msgpack? ( >=dev-python/msgpack-0.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=sqs? ( python_targets_python2_7 ) doc? ( python_targets_python2_7 amqplib sqs ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/k/kombu/kombu-3.0.37.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=60111afe7a09e5cab651c0cdc1097483
+_md5_=5dd58bb1b95ed53cae7d408b1623d395
diff --git a/metadata/md5-cache/dev-ruby/ox-2.4.9 b/metadata/md5-cache/dev-ruby/ox-2.4.9
new file mode 100644
index 000000000000..c06678c5cf85
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ox-2.4.9
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A fast XML parser and Object marshaller
+EAPI=5
+HOMEPAGE=http://www.ohler.com/ox/ https://github.com/ohler55/ox
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://github.com/ohler55/ox/archive/v2.4.9.tar.gz -> ox-2.4.9.tar.gz
+_eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
+_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=f495c03d38fa7a8de7d122a842495c19
diff --git a/metadata/md5-cache/dev-vcs/gitolite-3.6.6 b/metadata/md5-cache/dev-vcs/gitolite-3.6.6
index 2e6beb201add..82a9aa9f73ff 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-3.6.6
+++ b/metadata/md5-cache/dev-vcs/gitolite-3.6.6
@@ -4,11 +4,11 @@ DESCRIPTION=Highly flexible server for git directory version tracker
 EAPI=6
 HOMEPAGE=https://github.com/sitaramc/gitolite
 IUSE=selinux tools vim-syntax
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo selinux? ( sec-policy/selinux-gitosis ) vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/JSON dev-lang/perl:=
 SLOT=0
 SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.6.6.tar.gz -> gitolite-3.6.6.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:perl-module src_compile:perl-module src_test:perl-module src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8a3b7a33fe61afeb7ba4920747fa18a1
+_md5_=ff11b9c015a38fdacf1d3d22b7029bcd
diff --git a/metadata/md5-cache/games-arcade/blobwars-1.19 b/metadata/md5-cache/games-arcade/blobwars-1.19
deleted file mode 100644
index 7370e7260ef8..000000000000
--- a/metadata/md5-cache/games-arcade/blobwars-1.19
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-ttf media-libs/sdl-image media-libs/sdl-net sys-libs/zlib virtual/libintl sys-devel/gettext >=sys-apps/sed-4
-DESCRIPTION=Platform game about a blob and his quest to rescue MIAs from an alien invader
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/blobwars/ https://sourceforge.net/apps/mediawiki/blobwars/index.php?title=Main_Page
-KEYWORDS=amd64 x86
-LICENSE=BSD CC-BY-SA-3.0 CC-BY-3.0 GPL-2 LGPL-2.1 fairuse public-domain
-RDEPEND=media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-ttf media-libs/sdl-image media-libs/sdl-net sys-libs/zlib virtual/libintl games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/blobwars/blobwars-1.19.tar.gz
-_eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:games src_unpack:base src_prepare:- src_configure:games src_compile:- src_install:-
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	ea170b525f6a38a006be05c9d9429f13	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=decc85194a5097cb403edb70ef5aa95c
diff --git a/metadata/md5-cache/gnome-base/gdm-3.20.1 b/metadata/md5-cache/gnome-base/gdm-3.20.1
index 16e17953e130..3051b0809638 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.20.1
+++ b/metadata/md5-cache/gnome-base/gdm-3.20.1
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME Display Manager for managing graphical display servers and use
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GDM
 IUSE=accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh x86
 LICENSE=GPL-2+ branding? ( CC-Sampling-Plus-1.0 )
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.36:2[dbus] >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0:1.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.12 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam >=sys-apps/systemd-186:0=[pam] sys-auth/pambase[systemd] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 x11-apps/xhost accessibility? ( >=app-accessibility/orca-3.10 gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) !gnome-extra/fast-user-switch-applet
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.20/gdm-3.20.1.tar.xz branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:gnome2 src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c4ea6f9f250b5355e9e948e7007dead0	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=aabd905557ade91fd327349bc1567cbb
+_md5_=284942a9334514893cdf2b3d9c308cbe
diff --git a/metadata/md5-cache/gnome-base/gdm-3.22.1-r1 b/metadata/md5-cache/gnome-base/gdm-3.22.1-r1
index e97f141e6b5f..656b8770a887 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.22.1-r1
+++ b/metadata/md5-cache/gnome-base/gdm-3.22.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME Display Manager for managing graphical display servers and use
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GDM
 IUSE=accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86
 LICENSE=GPL-2+ branding? ( CC-Sampling-Plus-1.0 )
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.36:2[dbus] >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0:1.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.12 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam >=sys-apps/systemd-186:0=[pam] sys-auth/pambase[systemd] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 x11-apps/xhost accessibility? ( >=app-accessibility/orca-3.10 gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) !gnome-extra/fast-user-switch-applet
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.22/gdm-3.22.1.tar.xz branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:gnome2 src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c4ea6f9f250b5355e9e948e7007dead0	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=516395f32694696335e11b935fb3407d
+_md5_=63e2fb2e4ef499f7782fed8632ff1fa8
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.20.1 b/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.20.1
index e2865ddac1dd..49d5175417c2 100644
--- a/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.20.1
+++ b/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.20.1
@@ -4,7 +4,7 @@ DESCRIPTION=Tool to customize GNOME 3 options
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/action/show/Apps/GnomeTweakTool
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/glib:2[dbus] >=dev-python/pygobject-3.10.2:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gsettings-desktop-schemas-3.4 >=gnome-base/gnome-desktop-3.6.0.1:3=[introspection] >=x11-libs/gtk+-3.12:3[introspection] net-libs/libsoup:2.4[introspection] x11-libs/libnotify[introspection] >=gnome-base/gnome-settings-daemon-3 gnome-base/gnome-shell >=gnome-base/nautilus-3
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tweak-tool/3.20/gnome-tweak-tool-3.20.1.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c4ea6f9f250b5355e9e948e7007dead0	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d487a260c384cca0ce6f8f447442276b
+_md5_=acd2e521d3e62b7107eb2e507cdf93d0
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.22.0 b/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.22.0
index d2499046168b..0b88c49d4345 100644
--- a/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.22.0
+++ b/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.22.0
@@ -4,7 +4,7 @@ DESCRIPTION=Tool to customize GNOME 3 options
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/action/show/Apps/GnomeTweakTool
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/glib:2[dbus] >=dev-python/pygobject-3.10.2:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-base/gnome-desktop-3.6.0.1:3=[introspection] >=x11-libs/gtk+-3.12:3[introspection] net-libs/libsoup:2.4[introspection] x11-libs/libnotify[introspection] >=gnome-base/gnome-settings-daemon-3 gnome-base/gnome-shell >=gnome-base/nautilus-3
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tweak-tool/3.22/gnome-tweak-tool-3.22.0.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c4ea6f9f250b5355e9e948e7007dead0	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4ffba6886183d77d085f88bfa603f5f1
+_md5_=d2a0558d05a89c2f6ddc05295982ff4c
diff --git a/metadata/md5-cache/gnome-extra/synapse-0.2.99.2 b/metadata/md5-cache/gnome-extra/synapse-0.2.99.2
index 47b3bc04835f..28f26ff3d032 100644
--- a/metadata/md5-cache/gnome-extra/synapse-0.2.99.2
+++ b/metadata/md5-cache/gnome-extra/synapse-0.2.99.2
@@ -4,11 +4,11 @@ DESCRIPTION=A program launcher in the style of GNOME Do
 EAPI=5
 HOMEPAGE=https://launchpad.net/synapse-project/
 IUSE=plugins +zeitgeist
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/libgee:0.8 >=dev-libs/glib-2.28.0:2 dev-libs/json-glib dev-libs/keybinder:3 dev-libs/libunique:1 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtkhotkey >=x11-libs/gtk+-3.0.0:3 x11-libs/libnotify x11-libs/pango x11-themes/adwaita-icon-theme plugins? ( >=net-libs/rest-0.7 ) zeitgeist? ( dev-libs/libzeitgeist >=gnome-extra/zeitgeist-0.9.14[fts] )
 SLOT=0
 SRC_URI=https://launchpad.net/synapse-project/0.3/0.2.99.2/+download/synapse-0.2.99.2.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_unpack:gnome2 src_prepare:- src_configure:- src_compile:autotools-utils src_test:autotools-utils src_install:autotools-utils
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	ea170b525f6a38a006be05c9d9429f13	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c4ea6f9f250b5355e9e948e7007dead0	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vala	ca3f1c504058f5de407febddfae73167	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=cb79a2763bee85275764a103344170ac
+_md5_=3ecf6128d53a108dfbc63b4d4b42a000
diff --git a/metadata/md5-cache/lxde-base/menu-cache-1.0.2 b/metadata/md5-cache/lxde-base/menu-cache-1.0.2
index 6484978cba0a..ef3704bfca3e 100644
--- a/metadata/md5-cache/lxde-base/menu-cache-1.0.2
+++ b/metadata/md5-cache/lxde-base/menu-cache-1.0.2
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 x11-libs/libfm-extra sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=Library to create and utilize caches to speed up freedesktop application menus
 EAPI=6
 HOMEPAGE=http://lxde.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/libfm-extra
 SLOT=0/2
 SRC_URI=mirror://sourceforge/lxde/menu-cache-1.0.2.tar.xz
 _eclass_exported_funcs=-
-_md5_=5332d68a7be0b70c59122e6f01a2d7ec
+_md5_=a2f91d155040ba6a7883318f4f3a1e0e
diff --git a/metadata/md5-cache/media-libs/gd-2.2.4 b/metadata/md5-cache/media-libs/gd-2.2.4
index e159bb2eb27a..f85a2261e7a7 100644
--- a/metadata/md5-cache/media-libs/gd-2.2.4
+++ b/metadata/md5-cache/media-libs/gd-2.2.4
@@ -4,7 +4,7 @@ DESCRIPTION=A graphics library for fast image creation
 EAPI=6
 HOMEPAGE=http://libgd.org/ http://www.boutell.com/gd/
 IUSE=fontconfig jpeg png static-libs tiff truetype webp xpm zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=gd IJG HPND BSD
 RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xpm? ( >=x11-libs/libXpm-3.5.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=prefix? ( fontconfig )
@@ -12,4 +12,4 @@ SLOT=2/3
 SRC_URI=https://github.com/libgd/libgd/releases/download/gd-2.2.4/libgd-2.2.4.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=75aee5a8ff9908cf74654426accf1ff4
+_md5_=c4b43824c46829ca3dd7166f5806e5c5
diff --git a/metadata/md5-cache/media-libs/qhull-2012.1-r4 b/metadata/md5-cache/media-libs/qhull-2012.1-r4
index 21836684d2af..7a444af3915f 100644
--- a/metadata/md5-cache/media-libs/qhull-2012.1-r4
+++ b/metadata/md5-cache/media-libs/qhull-2012.1-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Geometry library
 EAPI=5
 HOMEPAGE=http://www.qhull.org/
 IUSE=doc static-libs
-KEYWORDS=~amd64 arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.qhull.org//download/qhull-2012.1-src.tgz
 _eclass_exported_funcs=pkg_preinst:- src_prepare:cmake-utils src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ad71bf0c5a22b5d32fa7687b59348bca
+_md5_=cdb02309c6ad0d2c34c349e2083912a7
diff --git a/metadata/md5-cache/media-libs/sbc-1.2 b/metadata/md5-cache/media-libs/sbc-1.2
deleted file mode 100644
index 2141eab34846..000000000000
--- a/metadata/md5-cache/media-libs/sbc-1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=virtual/pkgconfig
-DESCRIPTION=An audio codec to connect bluetooth high quality audio devices like headphones or loudspeakers
-EAPI=5
-HOMEPAGE=https://git.kernel.org/?p=bluetooth/sbc.git http://www.bluez.org/sbc-10/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm hppa ia64 ppc ppc64 x86
-LICENSE=GPL-2 LGPL-2.1
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://kernel/linux/bluetooth/sbc-1.2.tar.xz
-_eclass_exported_funcs=src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
-_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=77bf521f36262702abc92cac7022e365
diff --git a/metadata/md5-cache/media-libs/x265-2.2 b/metadata/md5-cache/media-libs/x265-2.2
index be3e24086c7a..0e792405e591 100644
--- a/metadata/md5-cache/media-libs/x265-2.2
+++ b/metadata/md5-cache/media-libs/x265-2.2
@@ -4,11 +4,11 @@ DESCRIPTION=Library for encoding video streams into the H.265/HEVC format
 EAPI=5
 HOMEPAGE=http://x265.org/
 IUSE=+10bit +12bit numa pic test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm hppa ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/102
 SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_2.2.tar.gz http://ftp.videolan.org/pub/videolan/x265/x265_2.2.tar.gz
 _eclass_exported_funcs=src_unpack:- src_prepare:cmake-utils src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	7bb10a841be2368af0c00f27dd67560b	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a53177dbf7992e26a61436425634ed3f
+_md5_=36989d903db543d7d363818ed4bb814a
diff --git a/metadata/md5-cache/media-plugins/libvisual-projectm-2.1.0-r1 b/metadata/md5-cache/media-plugins/libvisual-projectm-2.1.0-r1
index 7c8884898121..12a89e023ba3 100644
--- a/metadata/md5-cache/media-plugins/libvisual-projectm-2.1.0-r1
+++ b/metadata/md5-cache/media-plugins/libvisual-projectm-2.1.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A libvisual graphical music visualization plugin similar to milkdrop
 EAPI=6
 HOMEPAGE=http://projectm.sourceforge.net
 IUSE=debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2
 RDEPEND=>=media-libs/libprojectm-2.1.0 media-libs/libsdl =media-libs/libvisual-0.4* virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/projectm/projectM-complete-2.1.0-Source.tar.gz
 _eclass_exported_funcs=src_prepare:cmake-utils src_configure:cmake-utils src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dd9cda5690690968f178e04a376ab995
+_md5_=791b1adc8092cf1bc7dbbf84b35bee70
diff --git a/metadata/md5-cache/media-sound/flacon-2.1.1 b/metadata/md5-cache/media-sound/flacon-2.1.1
index b728cc6dbc98..d243a3e1e1b1 100644
--- a/metadata/md5-cache/media-sound/flacon-2.1.1
+++ b/metadata/md5-cache/media-sound/flacon-2.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Extracts audio tracks from an audio CD image to separate tracks
 EAPI=6
 HOMEPAGE=https://flacon.github.io/
 IUSE=qt5 test linguas_cs linguas_cs_CZ linguas_de linguas_es linguas_es_MX linguas_fr linguas_gl linguas_hu linguas_it linguas_ja_JP linguas_lt linguas_nb linguas_nl linguas_pl linguas_pl_PL linguas_pt_BR linguas_pt_PT linguas_ro_RO linguas_ru linguas_sr linguas_sr@latin linguas_tr linguas_uk linguas_zh_CN test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/uchardet !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) media-sound/shntool
 SLOT=0
 SRC_URI=https://github.com/flacon/flacon/archive/v2.1.1.tar.gz -> flacon-2.1.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:cmake-utils src_test:- src_install:cmake-utils
 _eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5464ef304a89396b27864ada5878575f
+_md5_=c0fdb42e6259cc9e8b5fc8ea0818e31f
diff --git a/metadata/md5-cache/media-sound/guayadeque-0.4.5_p20170110 b/metadata/md5-cache/media-sound/guayadeque-0.4.5_p20170110
index a389ba4415e9..0f7bf45f7fdb 100644
--- a/metadata/md5-cache/media-sound/guayadeque-0.4.5_p20170110
+++ b/metadata/md5-cache/media-sound/guayadeque-0.4.5_p20170110
@@ -4,7 +4,7 @@ DESCRIPTION=Music management program designed for all music enthusiasts
 EAPI=6
 HOMEPAGE=http://guayadeque.org/
 IUSE=ayatana ipod +minimal linguas_bg linguas_ca_ES linguas_cs linguas_de linguas_el linguas_es linguas_fr linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_nb linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sr linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_uk
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=dev-db/wxsqlite3-3.2.1 dev-libs/glib:2 media-libs/flac media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 >=media-libs/taglib-1.6.4 net-misc/curl sys-apps/dbus x11-libs/wxGTK:3.0[X] ayatana? ( >=dev-libs/libindicate-0.7 ) ipod? ( media-libs/libgpod ) !minimal? ( media-libs/gnonlin:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-libnice:1.0 media-plugins/gst-plugins-pulse:1.0 media-plugins/gst-plugins-soup:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 )
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/anonbeat/guayadeque/archive/9fec4f7b85095fa2d9f8e4d39c0cf5015f7624fa.tar.gz -> guayadeque-0.4.5_p20170110.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_unpack:vcs-snapshot src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
-_md5_=9aa7a1d0d284532a6ca63c94c5a02ae5
+_md5_=d8cd133dc2ba9808e1c117c523c23e89
diff --git a/metadata/md5-cache/media-video/gpac-0.6.1-r2 b/metadata/md5-cache/media-video/gpac-0.6.1-r2
index 60733a8523f5..c92ab8eb66be 100644
--- a/metadata/md5-cache/media-video/gpac-0.6.1-r2
+++ b/metadata/md5-cache/media-video/gpac-0.6.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Implementation of the MPEG-4 Systems standard developed from scratch
 EAPI=6
 HOMEPAGE=http://gpac.wp.mines-telecom.fr/
 IUSE=a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X
-KEYWORDS=alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=a52? ( media-libs/a52dec ) aac? ( >=media-libs/faad2-2.0 ) alsa? ( media-libs/alsa-lib ) dvb? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) mad? ( >=media-libs/libmad-0.15.1b ) opengl? ( virtual/opengl media-libs/freeglut virtual/glu ) >=media-libs/libogg-1.1 png? ( >=media-libs/libpng-1.4:0= ) vorbis? ( >=media-libs/libvorbis-1.1 ) theora? ( media-libs/libtheora ) truetype? ( >=media-libs/freetype-2.1.4:2 ) xml? ( >=dev-libs/libxml2-2.6.0:2 ) xvid? ( >=media-libs/xvid-1.0.1 ) sdl? ( media-libs/libsdl ) jpeg2k? ( media-libs/openjpeg:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pulseaudio? ( media-sound/pulseaudio ) X? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXv x11-libs/libXext )
 SLOT=0
 SRC_URI=https://github.com/gpac/gpac/archive/v0.6.1.tar.gz -> gpac-0.6.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=336750d55ceb8daa7c543c591b8a8bd3
+_md5_=5e89cd36c3e8252080c389654f317e98
diff --git a/metadata/md5-cache/net-im/bitlbee-3.5.1 b/metadata/md5-cache/net-im/bitlbee-3.5.1
index 57279c1a3ae0..d6400b3ef25b 100644
--- a/metadata/md5-cache/net-im/bitlbee-3.5.1
+++ b/metadata/md5-cache/net-im/bitlbee-3.5.1
@@ -4,7 +4,7 @@ DESCRIPTION=irc to IM gateway that support multiple IM protocols
 EAPI=6
 HOMEPAGE=https://www.bitlbee.org/
 IUSE=debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd msn oscar purple twitter +xmpp
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) ) ) virtual/logger xinetd? ( sys-apps/xinetd )
 REQUIRED_USE=|| ( purple xmpp msn oscar ) xmpp? ( !nss )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://get.bitlbee.org/src/bitlbee-3.5.1.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=35a3e8f7b57d67f6028d3981bfcb9423
+_md5_=bfded2d62e14df90303178c7bf20f5ea
diff --git a/metadata/md5-cache/net-libs/nodejs-6.9.4 b/metadata/md5-cache/net-libs/nodejs-6.9.4
index 884b22101688..04b7f2157707 100644
--- a/metadata/md5-cache/net-libs/nodejs-6.9.4
+++ b/metadata/md5-cache/net-libs/nodejs-6.9.4
@@ -4,7 +4,7 @@ DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=6
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.9.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://nodejs.org/dist/v6.9.4/node-v6.9.4.tar.xz
 _eclass_exported_funcs=pkg_pretend:- pkg_postinst:- pkg_setup:python-single-r1 src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=e47d35d226ef4ef4f74b7e2ed9bf337b
+_md5_=856bdba1959a1cbd053794044ce31c5d
diff --git a/metadata/md5-cache/net-misc/dhcpcd-ui-0.7.5-r1 b/metadata/md5-cache/net-misc/dhcpcd-ui-0.7.5-r1
index cb478c952fa6..3317c1ac63f1 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-ui-0.7.5-r1
+++ b/metadata/md5-cache/net-misc/dhcpcd-ui-0.7.5-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Desktop notification and configuration for dhcpcd
 EAPI=6
 HOMEPAGE=http://roy.marples.name/projects/dhcpcd-ui/
 IUSE=debug gtk gtk3 qt4 libnotify
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=>=net-misc/dhcpcd-6.4.4 qt4? ( dev-qt/qtsvg:4 )
 REQUIRED_USE=?? ( gtk gtk3 qt4 ) gtk3? ( !gtk ) gtk? ( !gtk3 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://roy.marples.name/downloads/dhcpcd/dhcpcd-ui-0.7.5.tar.bz2
 _eclass_exported_funcs=pkg_setup:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=059bce50f0e05e021715205faf2a9c9d
+_md5_=54179c7e59c444145593c112ef0ccc04
diff --git a/metadata/md5-cache/net-misc/quagga-1.1.1 b/metadata/md5-cache/net-misc/quagga-1.1.1
index 59b9e8cd4f00..a0073282ee0d 100644
--- a/metadata/md5-cache/net-misc/quagga-1.1.1
+++ b/metadata/md5-cache/net-misc/quagga-1.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=A free routing daemon replacing Zebra supporting RIP, OSPF and BGP
 EAPI=6
 HOMEPAGE=http://quagga.net/
 IUSE=bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam protobuf +readline snmp tcp-zebra
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ppc ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm hppa ~ppc ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap ) protobuf? ( dev-libs/protobuf-c:0= ) readline? ( sys-libs/readline:0= pam? ( sys-libs/pam ) ) snmp? ( net-analyzer/net-snmp ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/iproute2
 SLOT=0
 SRC_URI=mirror://nongnu/quagga/quagga-1.1.1.tar.gz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=3691d9131770f6dde02407bc69e6e34b
+_md5_=cd5d12794c130e585a7bd247a1aa211e
diff --git a/metadata/md5-cache/sci-libs/arpack-3.1.5 b/metadata/md5-cache/sci-libs/arpack-3.1.5
index 2a2ad6a48600..3ff768b81b10 100644
--- a/metadata/md5-cache/sci-libs/arpack-3.1.5
+++ b/metadata/md5-cache/sci-libs/arpack-3.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=Arnoldi package library to solve large scale eigenvalue problems
 EAPI=5
 HOMEPAGE=http://www.caam.rice.edu/software/ARPACK/ http://forge.scilab.org/index.php/p/arpack-ng/
 IUSE=doc examples mpi static-libs
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/fortran
 SLOT=0
 SRC_URI=http://forge.scilab.org/upload/arpack-ng/files/arpack-ng_3.1.5.tar.gz doc? ( http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )
 _eclass_exported_funcs=pkg_setup:fortran-2 src_prepare:autotools-utils src_configure:- src_compile:autotools-utils src_test:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=33a40ef7f226354017736c0f0cf765d1
+_md5_=37c575d9eff5519f6e44336cb6829806
diff --git a/metadata/md5-cache/sys-apps/ifplugd-0.28-r10 b/metadata/md5-cache/sys-apps/ifplugd-0.28-r10
index 2ca4b9a99ab9..b6b2028f7a17 100644
--- a/metadata/md5-cache/sys-apps/ifplugd-0.28-r10
+++ b/metadata/md5-cache/sys-apps/ifplugd-0.28-r10
@@ -4,10 +4,10 @@ DESCRIPTION=Brings up/down ethernet ports automatically with cable detection
 EAPI=6
 HOMEPAGE=http://0pointer.de/lennart/projects/ifplugd/
 IUSE=doc selinux
-KEYWORDS=~arm ~amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libdaemon-0.5 >=sys-apps/baselayout-1.12 selinux? ( sec-policy/selinux-ifplugd )
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.28.tar.gz
 _eclass_exported_funcs=src_configure:- src_install:-
-_md5_=1b72df2d31671944ac957e6dedb12f48
+_md5_=54f9ea0caeead49161c94917b5270bc0
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.10-r3 b/metadata/md5-cache/sys-apps/sandbox-2.10-r3
index 3acf04098d2d..07fc30e78805 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.10-r3
+++ b/metadata/md5-cache/sys-apps/sandbox-2.10-r3
@@ -4,10 +4,10 @@ DESCRIPTION=sandbox'd LD_PRELOAD hack
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/sandbox-2.10.tar.xz https://dev.gentoo.org/~vapier/dist/sandbox-2.10.tar.xz
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	7bb10a841be2368af0c00f27dd67560b	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=e3ca91d8ffbfc022d9f6b970487b1aa3
+_md5_=cd8e2d4a48129594261f19ce40d9c293
diff --git a/metadata/md5-cache/sys-fs/e4rat-0.2.3-r1 b/metadata/md5-cache/sys-fs/e4rat-0.2.3-r1
deleted file mode 100644
index 1f90b03cd64b..000000000000
--- a/metadata/md5-cache/sys-fs/e4rat-0.2.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-lang/perl:= >=dev-libs/boost-1.42:= sys-fs/e2fsprogs sys-process/audit sys-process/lsof sys-devel/make >=dev-util/cmake-3.5.2
-DESCRIPTION=Toolset to accelerate the boot process and application startup
-EAPI=5
-HOMEPAGE=http://e4rat.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl:= >=dev-libs/boost-1.42:= sys-fs/e2fsprogs sys-process/audit sys-process/lsof
-SLOT=0
-SRC_URI=mirror://sourceforge/e4rat/e4rat_0.2.3_src.tar.gz
-_eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:cmake-utils src_configure:cmake-utils src_compile:cmake-utils src_test:cmake-utils src_install:-
-_eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bfe26289a677600339ac133b24f3a1d2
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2 b/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2
index 5514b490515c..d94c2b1b664b 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Open source read-write NTFS driver that runs under FUSE
 EAPI=5
 HOMEPAGE=http://www.tuxera.com/community/ntfs-3g-download/
 IUSE=acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr
-KEYWORDS=alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!<sys-apps/util-linux-2.20.1-r2 !sys-fs/ntfsprogs ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 ) external-fuse? ( >=sys-fs/fuse-2.8.0 )
 SLOT=0/87
 SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2016.2.22.tgz
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	0498b698e76cdc94930b59a00c73dd9c	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=086f348e9e9589c74b02a48ff0deba47
+_md5_=31003d9a6c87e1ec234d980e4543bbac
diff --git a/metadata/md5-cache/www-client/lynx-2.8.9_pre11 b/metadata/md5-cache/www-client/lynx-2.8.9_pre11
index fa60909d6014..62acb646d6ff 100644
--- a/metadata/md5-cache/www-client/lynx-2.8.9_pre11
+++ b/metadata/md5-cache/www-client/lynx-2.8.9_pre11
@@ -4,10 +4,10 @@ DESCRIPTION=An excellent console-based web browser with ssl support
 EAPI=6
 HOMEPAGE=http://lynx.isc.org/
 IUSE=bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2.6.4:= ) ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn )
 SLOT=0
 SRC_URI=http://invisible-mirror.net/archives/lynx/tarballs/lynx2.8.9dev.11.tar.bz2
 _eclass_exported_funcs=pkg_setup:- src_configure:- src_install:-
-_md5_=845ab5a1c02381b0af247be21c904612
+_md5_=3c88a3649ec6734bb9838fdc6b6b1740
diff --git a/metadata/md5-cache/x11-misc/alock-1.0.0 b/metadata/md5-cache/x11-misc/alock-1.0.0
index f0de83c5232a..c65ef2891447 100644
--- a/metadata/md5-cache/x11-misc/alock-1.0.0
+++ b/metadata/md5-cache/x11-misc/alock-1.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=locks the local X display until a password is entered
 EAPI=6
 HOMEPAGE=http://darkshed.net/projects/alock https://github.com/mgumz/alock
 IUSE=doc imlib pam
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXcursor imlib? ( media-libs/imlib2[X] ) pam? ( virtual/pam ) doc? ( app-text/asciidoc )
 SLOT=0
 SRC_URI=https://github.com/mgumz/alock/archive/v1.0.0.tar.gz -> alock-1.0.0.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f711418caddd37cbe32c6e9b32c0a84e
+_md5_=03e7eedeb8c3a1d6bd4b9a1ac2dddfad
diff --git a/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1 b/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1
index 30a7f823fbea..a6974f220388 100644
--- a/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1
+++ b/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=A scalable icon theme called Faenza
 EAPI=5
 HOMEPAGE=http://tiheum.deviantart.com/art/Faenza-Icons-173323228
 IUSE=minimal
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=!minimal? ( x11-themes/adwaita-icon-theme ) x11-themes/hicolor-icon-theme
 RESTRICT=binchecks strip
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/faenza-icon-theme/faenza-icon-theme_1.3.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1e6d97b2144be9b62d42d1ffdd9d64af
+_md5_=e5c720cd0e0d2ee4c567a99fc7d27606
diff --git a/metadata/md5-cache/x11-themes/shiki-colors-4.6 b/metadata/md5-cache/x11-themes/shiki-colors-4.6
index 97afba697ce2..c2c47627ee6e 100644
--- a/metadata/md5-cache/x11-themes/shiki-colors-4.6
+++ b/metadata/md5-cache/x11-themes/shiki-colors-4.6
@@ -4,9 +4,9 @@ EAPI=5
 HOMEPAGE=https://code.google.com/p/gnome-colors/
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=|| ( x11-wm/metacity x11-wm/muffin x11-wm/mutter xfce-base/xfwm4 ) x11-themes/gtk-engines:2
+RDEPEND=|| ( x11-wm/muffin x11-wm/mutter xfce-base/xfwm4 ) x11-themes/gtk-engines:2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://gnome-colors.googlecode.com/files/shiki-colors-4.6.tar.gz https://dev.gentoo.org/~pacho/Shiki-Gentoo-4.6.tar.bz2
 _eclass_exported_funcs=src_compile:- src_install:-
-_md5_=3e8ca41f7fc52c551277a0afa40d329b
+_md5_=ec00562db20d2081e5563f134bee3d7d