2016-12-29 11:03:05 UTC

author: Repository QA checks <repo-qa-checks@gentoo.org> 2016-12-29 11:03:07 +0000
committer: Repository QA checks <repo-qa-checks@gentoo.org> 2016-12-29 11:03:07 +0000
commit: 5fa27cc25eef439cb20ab2acf44d1dec83794eca (patch)
tree: 8619d00089101a8e794d206415a1e44f268ec706 /metadata/md5-cache
parent: Merge updates from master (diff)
download: gentoo-5fa27cc25eef439cb20ab2acf44d1dec83794eca.tar.gz
gentoo-5fa27cc25eef439cb20ab2acf44d1dec83794eca.tar.bz2
gentoo-5fa27cc25eef439cb20ab2acf44d1dec83794eca.zip
162 files changed, 320 insertions, 345 deletions
diff --git a/metadata/md5-cache/app-admin/drush-6.5.0 b/metadata/md5-cache/app-admin/drush-6.5.0
deleted file mode 100644
index 8435cf879a34..000000000000
--- a/metadata/md5-cache/app-admin/drush-6.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Command line shell and scripting interface for Drupal
-EAPI=5
-HOMEPAGE=https://github.com/drush-ops/drush
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[cli,ctype,json,simplexml] dev-php/PEAR-Console_Table
-SLOT=0
-SRC_URI=https://github.com/drush-ops/drush/archive/6.5.0.tar.gz -> drush-6.5.0.tar.gz
-_eclass_exported_funcs=src_prepare:- src_install:-
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=e666eb7cce7377d7d3ecb3cdec452b63
diff --git a/metadata/md5-cache/app-admin/drush-6.7.0 b/metadata/md5-cache/app-admin/drush-6.7.0
index 166bc852f86c..33ec76234988 100644
--- a/metadata/md5-cache/app-admin/drush-6.7.0
+++ b/metadata/md5-cache/app-admin/drush-6.7.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Command line shell and scripting interface for Drupal
 EAPI=5
 HOMEPAGE=https://github.com/drush-ops/drush
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[cli,ctype,json,simplexml] dev-php/PEAR-Console_Table
 SLOT=0
 SRC_URI=https://github.com/drush-ops/drush/archive/6.7.0.tar.gz -> drush-6.7.0.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=445a834999b866452b38dd1cc1e474dc
+_md5_=33c5686abbe244112dac38a0f2a96554
diff --git a/metadata/md5-cache/app-admin/puppetserver-2.4.0 b/metadata/md5-cache/app-admin/puppetserver-2.4.0
index e61d31f52b33..10a06bbe75d4 100644
--- a/metadata/md5-cache/app-admin/puppetserver-2.4.0
+++ b/metadata/md5-cache/app-admin/puppetserver-2.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Puppet Server is the next-generation application for managing Puppet
 EAPI=5
 HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
 IUSE=puppetdb
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.7.0 app-admin/puppet-agent[puppetdb?]
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-2.4.0.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_compile:- src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=3fd7ae2da64123757ed69a320a6133c7
+_md5_=1853464530ad7026f777e4da2e9767cf
diff --git a/metadata/md5-cache/app-admin/sshguard-1.7.1 b/metadata/md5-cache/app-admin/sshguard-1.7.1
index a7cf72543933..199b1e15bf1a 100644
--- a/metadata/md5-cache/app-admin/sshguard-1.7.1
+++ b/metadata/md5-cache/app-admin/sshguard-1.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=protects hosts from brute force attacks against ssh
 EAPI=6
 HOMEPAGE=http://sshguard.sourceforge.net/
 IUSE=ipfilter kernel_FreeBSD kernel_linux
-KEYWORDS=amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) ) sys-apps/openrc virtual/logger
 SLOT=0
 SRC_URI=mirror://sourceforge/sshguard/sshguard-1.7.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=29771835fbfa17c9624086812ee24ab0
+_md5_=42a8761adeb7b5a6a98f92c38f8cdd02
diff --git a/metadata/md5-cache/app-arch/pxz-5.0_pre20110811 b/metadata/md5-cache/app-arch/pxz-5.0_pre20110811
index 9562e1013317..dc554cd952b1 100644
--- a/metadata/md5-cache/app-arch/pxz-5.0_pre20110811
+++ b/metadata/md5-cache/app-arch/pxz-5.0_pre20110811
@@ -3,11 +3,11 @@ DEPEND=app-arch/xz-utils sys-devel/gcc[openmp]
 DESCRIPTION=Parallel implementation of the XZ compression utility
 EAPI=3
 HOMEPAGE=http://jnovy.fedorapeople.org/pxz/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-arch/xz-utils
 SLOT=0
 SRC_URI=mirror://gentoo/pxz-5.0_pre20110811.tar.xz
 _eclass_exported_funcs=src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1617933f5910937af3fd77b1eec9c5bd
+_md5_=a230d8a697062812c6a73802d2194ccf
diff --git a/metadata/md5-cache/app-arch/unshield-1.4 b/metadata/md5-cache/app-arch/unshield-1.4
index 556341eca8bb..479ec3dcf7c3 100644
--- a/metadata/md5-cache/app-arch/unshield-1.4
+++ b/metadata/md5-cache/app-arch/unshield-1.4
@@ -4,11 +4,11 @@ DESCRIPTION=InstallShield CAB file extractor
 EAPI=6
 HOMEPAGE=https://github.com/twogood/unshield
 IUSE=libressl
-KEYWORDS=amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~ppc x86
 LICENSE=MIT
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/twogood/unshield/archive/1.4.tar.gz -> unshield-1.4.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	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=065f4de4db0859d8fb784e594f91f580
+_md5_=ac5229b12a283c07ab372feb757f1520
diff --git a/metadata/md5-cache/app-backup/bacula-7.4.3 b/metadata/md5-cache/app-backup/bacula-7.4.3
index 281b17c9fb74..fb4e9070a8be 100644
--- a/metadata/md5-cache/app-backup/bacula-7.4.3
+++ b/metadata/md5-cache/app-backup/bacula-7.4.3
@@ -4,7 +4,7 @@ DESCRIPTION=Featureful client/server network backup suite
 EAPI=5
 HOMEPAGE=http://www.bacula.org/
 IUSE=acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X
-KEYWORDS=amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=AGPL-3
 RDEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt4? ( dev-qt/qtsvg:4 x11-libs/qwt:5 ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) !bacula-clientonly? ( !bacula-nosd? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 REQUIRED_USE=|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly ) static? ( bacula-clientonly )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/bacula/bacula-7.4.3.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_unpack:qt4-r2 src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=d32bbfcf7fe8862130e3549e6de8d884
+_md5_=25bd2b6547308fc8349151b5688319c5
diff --git a/metadata/md5-cache/app-backup/btrbk-0.24.0 b/metadata/md5-cache/app-backup/btrbk-0.24.0
index 981c64d48d73..63b50972d5e4 100644
--- a/metadata/md5-cache/app-backup/btrbk-0.24.0
+++ b/metadata/md5-cache/app-backup/btrbk-0.24.0
@@ -4,11 +4,11 @@ DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
 EAPI=6
 HOMEPAGE=https://digint.ch/btrbk/
 IUSE=+pv
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-3.18.2
 SLOT=0
 SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.24.0.tar.xz
 _eclass_exported_funcs=src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=c1f55a54b93cf838478988e62ae08b89
+_md5_=4db3543b8e4110b80fedb41e2d34fb38
diff --git a/metadata/md5-cache/app-backup/burp-1.4.40-r5 b/metadata/md5-cache/app-backup/burp-1.4.40-r5
index dbb5207ebb02..8d1e04f47063 100644
--- a/metadata/md5-cache/app-backup/burp-1.4.40-r5
+++ b/metadata/md5-cache/app-backup/burp-1.4.40-r5
@@ -4,11 +4,11 @@ DESCRIPTION=Network backup and restore client and server for Unix and Windows
 EAPI=5
 HOMEPAGE=http://burp.grke.org/
 IUSE=acl afs ipv6 libressl nls tcpd xattr
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=AGPL-3
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-libs/uthash sys-libs/libcap ~net-libs/librsync-0.9.7 sys-libs/ncurses:0= sys-libs/zlib acl? ( sys-apps/acl ) afs? ( net-fs/openafs ) nls? ( sys-devel/gettext ) tcpd? ( sys-apps/tcp-wrappers ) xattr? ( sys-apps/attr ) virtual/logger
 SLOT=0
 SRC_URI=mirror://sourceforge/burp/burp-1.4.40.tar.bz2 http://burp.grke.org/downloads/burp-1.4.40/burp-1.4.40.tar.bz2
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=0aaa8ac40a24eb392f6e40eb04b1fe40
+_md5_=ffefbe7909bb391bf19b7c5c19ccaa63
diff --git a/metadata/md5-cache/app-backup/duplicity-0.7.10 b/metadata/md5-cache/app-backup/duplicity-0.7.10
index 7710c129f8c3..da85280eb54c 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.7.10
+++ b/metadata/md5-cache/app-backup/duplicity-0.7.10
@@ -4,7 +4,7 @@ DESCRIPTION=Secure backup system using gnupg to encrypt data
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/duplicity/
 IUSE=s3 test python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-3
 RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/lockfile dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] s3? ( dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.10/+download/duplicity-0.7.10.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_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b71ac4970382547956f9a3dcd45dad05
+_md5_=b1bb585abe4f42e4f79b92fbab1fbe23
diff --git a/metadata/md5-cache/app-benchmarks/bonnie++-1.97.2 b/metadata/md5-cache/app-benchmarks/bonnie++-1.97.2
index 4310d9ac1448..9ba34e5aa295 100644
--- a/metadata/md5-cache/app-benchmarks/bonnie++-1.97.2
+++ b/metadata/md5-cache/app-benchmarks/bonnie++-1.97.2
@@ -3,9 +3,9 @@ DESCRIPTION=Hard drive bottleneck testing benchmark suite
 EAPI=6
 HOMEPAGE=http://www.coker.com.au/bonnie++/
 IUSE=debug
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.coker.com.au/bonnie++/experimental/bonnie++-1.97.2.tgz
 _eclass_exported_funcs=src_configure:- src_install:-
-_md5_=b60da83d036067d64ac0247333b7f108
+_md5_=89d81bf0156200be32911936ceff1e03
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-1.0_pre20161017 b/metadata/md5-cache/app-benchmarks/sysbench-1.0_pre20161017
index 637408148da1..f8b7810b7ab2 100644
--- a/metadata/md5-cache/app-benchmarks/sysbench-1.0_pre20161017
+++ b/metadata/md5-cache/app-benchmarks/sysbench-1.0_pre20161017
@@ -4,11 +4,11 @@ DESCRIPTION=System performance benchmark
 EAPI=6
 HOMEPAGE=https://github.com/akopytov/sysbench
 IUSE=aio lua mysql postgres test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=aio? ( dev-libs/libaio ) lua? ( dev-lang/lua:= ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= )
 REQUIRED_USE=mysql? ( lua ) postgres? ( lua )
 SLOT=0
 SRC_URI=https://github.com/akopytov/sysbench/archive/48124f838b00ff83a044fbf046a9d8d0b1602d90.tar.gz -> sysbench-48124f838b00ff83a044fbf046a9d8d0b1602d90.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_test:-
-_md5_=b501d1f70aaaf84bab9bcd8b3da9a518
+_md5_=2c97ac651f4ff78828f87b98dc034364
diff --git a/metadata/md5-cache/app-crypt/gpa-0.9.9 b/metadata/md5-cache/app-crypt/gpa-0.9.9
index b287965ac8a8..4f1ba514f17b 100644
--- a/metadata/md5-cache/app-crypt/gpa-0.9.9
+++ b/metadata/md5-cache/app-crypt/gpa-0.9.9
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU Privacy Assistant (GPA) is a graphical user interface for Gn
 EAPI=5
 HOMEPAGE=http://gpa.wald.intevation.org
 IUSE=nls linguas_ar linguas_cs linguas_de linguas_es linguas_fr linguas_ja linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sv linguas_tr linguas_zh_TW
-KEYWORDS=alpha amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-2.10.0:2 >=dev-libs/libgpg-error-1.4 >=dev-libs/libassuan-1.1.0 >=app-crypt/gnupg-2 >=app-crypt/gpgme-1.5.0
 SLOT=0
 SRC_URI=mirror://gnupg/gpa/gpa-0.9.9.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:-
-_md5_=421e35da7ccec8ddb6cfee0ed58c9609
+_md5_=3926513a7d97454e6d14db0535f25314
diff --git a/metadata/md5-cache/app-editors/le-1.16.3 b/metadata/md5-cache/app-editors/le-1.16.3
index 6dfd7ed20788..173531241dba 100644
--- a/metadata/md5-cache/app-editors/le-1.16.3
+++ b/metadata/md5-cache/app-editors/le-1.16.3
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=Terminal text editor
 EAPI=6
 HOMEPAGE=http://lav.yar.ru/programs.html
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://lav.yar.ru/download/le/le-1.16.3.tar.gz
 _eclass_exported_funcs=src_install:-
-_md5_=dba36e40039ba8ca6266187043004867
+_md5_=22709fafb66551f3a5840fe2289f1eca
diff --git a/metadata/md5-cache/app-editors/mg-20160421 b/metadata/md5-cache/app-editors/mg-20160421
index fef6ee76f4e0..44201f8fe48b 100644
--- a/metadata/md5-cache/app-editors/mg-20160421
+++ b/metadata/md5-cache/app-editors/mg-20160421
@@ -4,11 +4,11 @@ DESCRIPTION=MicroGnuEmacs, a port from the BSDs
 EAPI=6
 HOMEPAGE=http://homepage.boetes.org/software/mg/
 IUSE=livecd
-KEYWORDS=alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=public-domain
 RDEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
 SLOT=0
 SRC_URI=http://homepage.boetes.org/software/mg/mg-20160421.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_compile:- src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=e36623e46cbf016e64b524e91200eeff
+_md5_=6ca62c03b258d7b90a1b3b3982603b08
diff --git a/metadata/md5-cache/app-i18n/enca-1.19-r1 b/metadata/md5-cache/app-i18n/enca-1.19-r1
index 155f201860d5..6b322fe28fcc 100644
--- a/metadata/md5-cache/app-i18n/enca-1.19-r1
+++ b/metadata/md5-cache/app-i18n/enca-1.19-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Detect and convert encoding of text files
 EAPI=6
 HOMEPAGE=https://cihar.com/software/enca/
 IUSE=doc +iconv recode 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=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=iconv? ( virtual/libiconv[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(-)?] ) recode? ( app-text/recode[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
 SRC_URI=https://dl.cihar.com/enca/enca-1.19.tar.xz
 _eclass_exported_funcs=pkg_pretend:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=430c434bf316d508bfbbc8b02f527ffb
+_md5_=2d6b1cd8745927c18a7c7389d1e08355
diff --git a/metadata/md5-cache/app-laptop/tp_smapi-0.42-r1 b/metadata/md5-cache/app-laptop/tp_smapi-0.42-r1
index 8c6c8f535367..bd3512d78c26 100644
--- a/metadata/md5-cache/app-laptop/tp_smapi-0.42-r1
+++ b/metadata/md5-cache/app-laptop/tp_smapi-0.42-r1
@@ -4,11 +4,11 @@ DESCRIPTION=IBM ThinkPad SMAPI BIOS driver
 EAPI=6
 HOMEPAGE=https://github.com/evgeni/tp_smapi
 IUSE=hdaps kernel_linux
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/dmidecode kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/evgeni/tp_smapi/releases/download/tp-smapi/0.42/tp_smapi-0.42.tgz
 _eclass_exported_funcs=pkg_pretend:- pkg_preinst:linux-mod pkg_postrm:linux-mod pkg_postinst:linux-mod pkg_setup:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	linux-mod	0ccff2c1a7d70cf1678059b64bcf9183	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=817b74acf8dd6c3c67effd688eff4de0
+_md5_=a78c092bc637e18b63c4619aaac02b7d
diff --git a/metadata/md5-cache/app-misc/screenfetch-3.7.0 b/metadata/md5-cache/app-misc/screenfetch-3.7.0
index 3fd049803d72..6e9631e081b0 100644
--- a/metadata/md5-cache/app-misc/screenfetch-3.7.0
+++ b/metadata/md5-cache/app-misc/screenfetch-3.7.0
@@ -3,10 +3,10 @@ DESCRIPTION=Bash Screenshot Information Tool
 EAPI=6
 HOMEPAGE=https://github.com/KittyKatt/screenFetch
 IUSE=X
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/KittyKatt/screenFetch/archive/v3.7.0.tar.gz -> screenfetch-3.7.0.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=65c75a96277fa4589ab1f54e04a7bb4d
+_md5_=a605e136b1b5cb3e4c1f6ee84f4ed2f7
diff --git a/metadata/md5-cache/app-mobilephone/obexftp-0.24-r1 b/metadata/md5-cache/app-mobilephone/obexftp-0.24-r1
index 8901196065e9..95e2a3348fe3 100644
--- a/metadata/md5-cache/app-mobilephone/obexftp-0.24-r1
+++ b/metadata/md5-cache/app-mobilephone/obexftp-0.24-r1
@@ -4,11 +4,11 @@ DESCRIPTION=File transfer over OBEX for mobile phones
 EAPI=5
 HOMEPAGE=http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp
 IUSE=perl python ruby tcl 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
-KEYWORDS=amd64 hppa ~ppc ~x86
+KEYWORDS=amd64 hppa ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/openobex-1.7 net-wireless/bluez perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=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(+)?] ) ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) tcl? ( dev-lang/tcl:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/openobex/obexftp-0.24-Source.tar.gz
 _eclass_exported_funcs=pkg_setup:python-single-r1 src_prepare:cmake-utils src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=62e21ade3c199ca37db3a5b74dedbb77
+_md5_=60ea128d26bf4f6bd77a9f60eff23d84
diff --git a/metadata/md5-cache/app-portage/g-cpan-0.16.9 b/metadata/md5-cache/app-portage/g-cpan-0.16.9
index 33e8f01e4a3b..0ab1d4b6f3a9 100644
--- a/metadata/md5-cache/app-portage/g-cpan-0.16.9
+++ b/metadata/md5-cache/app-portage/g-cpan-0.16.9
@@ -4,11 +4,11 @@ DESCRIPTION=Autogenerate and install ebuilds for CPAN modules
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Perl/g-cpan
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=virtual/perl-File-Path virtual/perl-File-Spec dev-perl/Log-Agent virtual/perl-Memoize virtual/perl-IO dev-perl/Shell-EnvImporter virtual/perl-Term-ANSIColor >=dev-perl/YAML-0.60 >=sys-apps/portage-2.0.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=https://github.com/gentoo-perl/g-cpan/archive/v0.16.9.tar.gz -> g-cpan-0.16.9.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:perl-module src_configure:perl-module src_compile:perl-module src_test:perl-module src_install:-
 _eclasses_=multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358
-_md5_=e66366046a8fcc91ee891abf249104d6
+_md5_=96fbbfaddf460187aea0c9854f61aad7
diff --git a/metadata/md5-cache/app-text/jabref-bin-3.4 b/metadata/md5-cache/app-text/jabref-bin-3.4
index ba2c4ebcd72d..05f8b2f98b33 100644
--- a/metadata/md5-cache/app-text/jabref-bin-3.4
+++ b/metadata/md5-cache/app-text/jabref-bin-3.4
@@ -4,11 +4,11 @@ DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
 EAPI=5
 HOMEPAGE=http://www.jabref.org/
 IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-3.4.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:java-pkg-2 src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ebed4d62a89c8ea596d43089a40d8204
+_md5_=eaf37125ee5c3dc8f43d1e9b0df9a0cb
diff --git a/metadata/md5-cache/app-text/jabref-bin-3.7 b/metadata/md5-cache/app-text/jabref-bin-3.7
index b9dc5f1c6b89..134c0931275a 100644
--- a/metadata/md5-cache/app-text/jabref-bin-3.7
+++ b/metadata/md5-cache/app-text/jabref-bin-3.7
@@ -4,11 +4,11 @@ DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
 EAPI=6
 HOMEPAGE=http://www.jabref.org/
 IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-3.7.jar
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_unpack:- src_prepare:java-pkg-2 src_compile:java-pkg-2 src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3ab31f00ef2264a41db7c616cb715c78
+_md5_=a6a48b5f4042f6506f45288f68a9d821
diff --git a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.72 b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.72
index 622173986b7e..d7586a75233c 100644
--- a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.72
+++ b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.72
@@ -4,11 +4,11 @@ DESCRIPTION=A toolset for processing LinuxDoc DTD SGML files
 EAPI=5
 HOMEPAGE=https://gitlab.com/agmartin/linuxdoc-tools
 IUSE=doc
-KEYWORDS=amd64 ~ia64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ia64 ~ppc x86 ~x86-fbsd
 LICENSE=GPL-3+ MIT SGMLUG
 RDEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= || ( sys-apps/gawk sys-apps/mawk ) sys-apps/groff virtual/latex-base
 SLOT=0
 SRC_URI=https://gitlab.com/agmartin/linuxdoc-tools/repository/archive.tar.gz?ref=v0.9.72 -> linuxdoc-tools-0.9.72.tar.gz
 _eclass_exported_funcs=pkg_prerm:sgml-catalog pkg_postrm:- pkg_postinst:- src_unpack:vcs-snapshot src_prepare:- src_configure:- src_compile:- src_test:autotools-utils src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	latex-package	58e25573cc86e53dddea91261009b301	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	perl-functions	aac50de73be0a80ebe780e0b20850130	sgml-catalog	b6e9d36507f43d79b6df9cb78d6eb4dd	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd
-_md5_=398e81eaf08217ca0bd2db7cc159d373
+_md5_=0a41e012df993ee2db1e8ec49ac36d56
diff --git a/metadata/md5-cache/app-text/stardict-3.0.6-r3 b/metadata/md5-cache/app-text/stardict-3.0.6-r3
index 788dbf517ed9..08042579640d 100644
--- a/metadata/md5-cache/app-text/stardict-3.0.6-r3
+++ b/metadata/md5-cache/app-text/stardict-3.0.6-r3
@@ -4,7 +4,7 @@ DESCRIPTION=A international dictionary supporting fuzzy and glob style matching
 EAPI=6
 HOMEPAGE=http://stardict-4.sourceforge.net/
 IUSE=advertisement debug dictdotcn espeak examples +gucharmap +htmlparse man perl +powerwordparse pronounce python qqwry spell tools updateinfo +wikiparse +wordnet +xdxfparse python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=CPL-1.0 GPL-3 LGPL-2
 RDEPEND=>=dev-libs/glib-2.16:2 dev-libs/libsigc++:2= sys-libs/zlib:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.20:2 x11-libs/libX11 x11-libs/pango gucharmap? ( gnome-extra/gucharmap:0= ) spell? ( >=app-text/enchant-1.2 ) tools? ( dev-libs/libpcre:= dev-libs/libxml2:= virtual/mysql python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ) espeak? ( >=app-accessibility/espeak-1.29 ) perl? ( dev-lang/perl )
 REQUIRED_USE=tools? ( python? ( python_targets_python2_7 ) )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/stardict-4/stardict-3.0.6.tar.bz2 pronounce? ( https://stardict-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 ) qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:- pkg_setup:python-single-r1 src_prepare:- src_configure:- src_compile:gnome2 src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c62053d67b95f18a26dc64cb965e933b
+_md5_=aa0f806789c4de4d10573cf52afae9c6
diff --git a/metadata/md5-cache/app-text/writerperfect-0.9.5 b/metadata/md5-cache/app-text/writerperfect-0.9.5
index 85828e78aeac..3042aceb7fae 100644
--- a/metadata/md5-cache/app-text/writerperfect-0.9.5
+++ b/metadata/md5-cache/app-text/writerperfect-0.9.5
@@ -4,11 +4,11 @@ DESCRIPTION=Various formats to Open document format converter
 EAPI=6
 HOMEPAGE=http://libwpd.sf.net
 IUSE=abiword +cdr debug ebook freehand gsf keynote +mspub +mwaw pagemaker +visio +wpd +wpg +wps
-KEYWORDS=amd64 ~x86 ~x86-linux ~x86-solaris
+KEYWORDS=amd64 x86 ~x86-linux ~x86-solaris
 LICENSE=|| ( LGPL-2.1 MPL-2.0 )
 RDEPEND==app-text/libodfgen-0.1* >=dev-libs/librevenge-0.0.1 media-libs/libeot abiword? ( =app-text/libabw-0.1* ) cdr? ( =media-libs/libcdr-0.1* ) ebook? ( =app-text/libebook-0.1* ) freehand? ( =media-libs/libfreehand-0.1* ) gsf? ( gnome-extra/libgsf ) keynote? ( =app-text/libetonyek-0.1* ) mspub? ( =app-text/libmspub-0.1* ) mwaw? ( =app-text/libmwaw-0.3* ) pagemaker? ( media-libs/libpagemaker ) visio? ( =media-libs/libvisio-0.1* ) wpd? ( app-text/libwpd:0.10 ) wpg? ( =app-text/libwpg-0.3* ) wps? ( =app-text/libwps-0.4* )
 REQUIRED_USE=|| ( abiword cdr ebook freehand keynote mspub mwaw pagemaker visio wpd wpg wps )
 SLOT=0
 SRC_URI=mirror://sourceforge/libwpd/writerperfect-0.9.5.tar.xz
 _eclass_exported_funcs=src_configure:-
-_md5_=7f4da3858cf022240d1ef9261cc3bc45
+_md5_=680e25ec570967bcce830601e2d77979
diff --git a/metadata/md5-cache/dev-cpp/pngpp-0.2.5 b/metadata/md5-cache/dev-cpp/pngpp-0.2.5
index ee94fa33b06e..508569e63f32 100644
--- a/metadata/md5-cache/dev-cpp/pngpp-0.2.5
+++ b/metadata/md5-cache/dev-cpp/pngpp-0.2.5
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install test
 DESCRIPTION=A simple but powerful C++ interface to libpng
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/pngpp/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=media-libs/libpng-1.2:0
 SLOT=0
 SRC_URI=mirror://nongnu/pngpp/png++-0.2.5.tar.gz
 _eclass_exported_funcs=src_compile:- src_test:- src_install:-
-_md5_=0503915c4081ed38d5c7a322567a735d
+_md5_=1fc987e2aa790389c4f03fe36ea2eeb9
diff --git a/metadata/md5-cache/dev-cpp/yaml-cpp-0.5.3 b/metadata/md5-cache/dev-cpp/yaml-cpp-0.5.3
index 010a95994744..2916115e9baf 100644
--- a/metadata/md5-cache/dev-cpp/yaml-cpp-0.5.3
+++ b/metadata/md5-cache/dev-cpp/yaml-cpp-0.5.3
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/boost-1.49.0-r2 sys-devel/make >=dev-util/cmake-3.2.2
 DESCRIPTION=YAML parser and emitter in C++
 EAPI=6
 HOMEPAGE=https://github.com/jbeder/yaml-cpp
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.49.0-r2
 SLOT=0
 SRC_URI=https://github.com/jbeder/yaml-cpp/archive/release-0.5.3.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=65d532a43777356ab3c2807d142118cc
+_md5_=c686f9e6945091f4da1c47dad6874d55
diff --git a/metadata/md5-cache/dev-erlang/cache_tab-1.0.4 b/metadata/md5-cache/dev-erlang/cache_tab-1.0.4
index eb3b8bcc780f..41fbf528718f 100644
--- a/metadata/md5-cache/dev-erlang/cache_tab-1.0.4
+++ b/metadata/md5-cache/dev-erlang/cache_tab-1.0.4
@@ -3,11 +3,11 @@ DEPEND=>=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 dev-lang/erlang dev-ut
 DESCRIPTION=In-memory cache Erlang and Elixir library
 EAPI=6
 HOMEPAGE=https://github.com/processone/cache_tab
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/cache_tab/archive/1.0.4.tar.gz -> cache_tab-1.0.4.tar.gz
 _eclass_exported_funcs=src_prepare:rebar src_compile:rebar src_test:rebar src_install:rebar
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=f699c160a0ee426407118b4c1f0fcb52
+_md5_=6c5566e44047f18c3b02d1068324ec3a
diff --git a/metadata/md5-cache/dev-erlang/esip-1.0.8 b/metadata/md5-cache/dev-erlang/esip-1.0.8
index d9e686d3ead1..9d721b36a751 100644
--- a/metadata/md5-cache/dev-erlang/esip-1.0.8
+++ b/metadata/md5-cache/dev-erlang/esip-1.0.8
@@ -3,11 +3,11 @@ DEPEND=>=dev-erlang/fast_tls-1.0.7 >=dev-erlang/stun-1.0.7 >=dev-erlang/p1_utils
 DESCRIPTION=ProcessOne SIP server component
 EAPI=6
 HOMEPAGE=https://github.com/processone/esip
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/fast_tls-1.0.7 >=dev-erlang/stun-1.0.7 >=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/esip/archive/1.0.8.tar.gz -> esip-1.0.8.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:rebar src_test:rebar src_install:rebar
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=b58685f476a0bebe6a67197dea4d4692
+_md5_=8f80608b0b9b2c0b03cd2bdf65ae49c7
diff --git a/metadata/md5-cache/dev-erlang/fast_tls-1.0.7 b/metadata/md5-cache/dev-erlang/fast_tls-1.0.7
index 30576f677f08..538594cc8652 100644
--- a/metadata/md5-cache/dev-erlang/fast_tls-1.0.7
+++ b/metadata/md5-cache/dev-erlang/fast_tls-1.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=TLS/SSL native driver for Erlang and Elixir
 EAPI=6
 HOMEPAGE=https://github.com/processone/fast_tls
 IUSE=libressl
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/fast_tls/archive/1.0.7.tar.gz -> fast_tls-1.0.7.tar.gz
 _eclass_exported_funcs=src_prepare:rebar src_compile:rebar src_test:rebar src_install:rebar
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=bb7224ad47632adbed6ba65cab216e2d
+_md5_=3c46f429b8021419c05278849aceea6b
diff --git a/metadata/md5-cache/dev-erlang/fast_xml-1.1.15 b/metadata/md5-cache/dev-erlang/fast_xml-1.1.15
index d904ce584a2c..9401808ffc69 100644
--- a/metadata/md5-cache/dev-erlang/fast_xml-1.1.15
+++ b/metadata/md5-cache/dev-erlang/fast_xml-1.1.15
@@ -4,11 +4,11 @@ DESCRIPTION=Fast Expat based Erlang XML parsing library
 EAPI=6
 HOMEPAGE=https://github.com/processone/fast_xml
 IUSE=test
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 dev-libs/expat dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/fast_xml/archive/1.1.15.tar.gz -> fast_xml-1.1.15.tar.gz
 _eclass_exported_funcs=src_prepare:rebar src_compile:rebar src_test:rebar src_install:rebar
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=0670ae9a8597ea5ced13d9a46ce3751c
+_md5_=14298a61db46676bc2c9df6f4d73669c
diff --git a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.6 b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.6
index f1416e0b681b..c6432d3cdbc8 100644
--- a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.6
+++ b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.6
@@ -3,11 +3,11 @@ DEPEND=>=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 dev-libs/libyaml dev-l
 DESCRIPTION=Fast Yaml native library for Erlang and Elixir
 EAPI=6
 HOMEPAGE=https://github.com/processone/fast_yaml
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 dev-libs/libyaml dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/fast_yaml/archive/1.0.6.tar.gz -> fast_yaml-1.0.6.tar.gz
 _eclass_exported_funcs=src_prepare:rebar src_compile:rebar src_test:rebar src_install:rebar
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=27220bf521ee6a852296e822e5b776f2
+_md5_=e7a9a5eb03a6310b9ba8a7c76cb4c900
diff --git a/metadata/md5-cache/dev-erlang/hamcrest-0.1.0_p20160709 b/metadata/md5-cache/dev-erlang/hamcrest-0.1.0_p20160709
index 711e4a84faa0..7238120edbbd 100644
--- a/metadata/md5-cache/dev-erlang/hamcrest-0.1.0_p20160709
+++ b/metadata/md5-cache/dev-erlang/hamcrest-0.1.0_p20160709
@@ -4,11 +4,11 @@ DESCRIPTION=Erlang port of Hamcrest
 EAPI=6
 HOMEPAGE=https://github.com/hyperthunk/hamcrest-erlang
 IUSE=test
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/dev-erlang/hamcrest/hamcrest-0.1.0_p20160709.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:rebar src_test:- src_install:rebar
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=b063ef23d145c3b837d1da5c08fddfd4
+_md5_=75c44b5d94db093df81cc60381729022
diff --git a/metadata/md5-cache/dev-erlang/iconv-1.0.2 b/metadata/md5-cache/dev-erlang/iconv-1.0.2
index e4e1ae02fda4..4306a5c1f593 100644
--- a/metadata/md5-cache/dev-erlang/iconv-1.0.2
+++ b/metadata/md5-cache/dev-erlang/iconv-1.0.2
@@ -3,11 +3,11 @@ DEPEND=>=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 virtual/libiconv dev-l
 DESCRIPTION=Fast encoding conversion library for Erlang and Elixir
 EAPI=6
 HOMEPAGE=https://github.com/processone/iconv
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 virtual/libiconv dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/iconv/archive/1.0.2.tar.gz -> iconv-1.0.2.tar.gz
 _eclass_exported_funcs=src_prepare:rebar src_compile:rebar src_test:rebar src_install:rebar
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=d5aeb7db907f64183c4f13a633ca1e60
+_md5_=c047390467c10533f9c8eab191d80c52
diff --git a/metadata/md5-cache/dev-erlang/jiffy-0.14.8 b/metadata/md5-cache/dev-erlang/jiffy-0.14.8
index 9c234d509e07..86e6275a0306 100644
--- a/metadata/md5-cache/dev-erlang/jiffy-0.14.8
+++ b/metadata/md5-cache/dev-erlang/jiffy-0.14.8
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
 DESCRIPTION=JSON NIFs for Erlang
 EAPI=6
 HOMEPAGE=https://github.com/davisp/jiffy
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=MIT BSD
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/davisp/jiffy/archive/0.14.8.tar.gz -> jiffy-0.14.8.tar.gz
 _eclass_exported_funcs=src_prepare:rebar src_compile:rebar src_test:rebar src_install:rebar
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=62c567a1abac3a24918b8911b33da96d
+_md5_=f2e640c568365fa61f432a08b29fdb6d
diff --git a/metadata/md5-cache/dev-erlang/lager-3.2.2 b/metadata/md5-cache/dev-erlang/lager-3.2.2
index fa77512e2865..560d6576429a 100644
--- a/metadata/md5-cache/dev-erlang/lager-3.2.2
+++ b/metadata/md5-cache/dev-erlang/lager-3.2.2
@@ -3,11 +3,11 @@ DEPEND=>=dev-erlang/goldrush-0.1.8 >=dev-lang/erlang-17.1 dev-lang/erlang dev-ut
 DESCRIPTION=Logging framework for Erlang/OTP
 EAPI=6
 HOMEPAGE=https://github.com/basho/lager
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/goldrush-0.1.8 >=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/basho/lager/archive/3.2.2.tar.gz -> lager-3.2.2.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:rebar src_test:rebar src_install:rebar
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=87d07a56088698c0c22d5afcb158fecf
+_md5_=509c7a26141feb2f7c8035a92659f107
diff --git a/metadata/md5-cache/dev-erlang/meck-0.8.4 b/metadata/md5-cache/dev-erlang/meck-0.8.4
index 490a1cdf6a05..7fa63ed1f493 100644
--- a/metadata/md5-cache/dev-erlang/meck-0.8.4
+++ b/metadata/md5-cache/dev-erlang/meck-0.8.4
@@ -4,11 +4,11 @@ DESCRIPTION=Mocking library for Erlang
 EAPI=6
 HOMEPAGE=https://github.com/eproxus/meck
 IUSE=test
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/eproxus/meck/archive/0.8.4.tar.gz -> meck-0.8.4.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:rebar src_test:- src_install:rebar
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=2649f8bd813f03472246a5e66b4d5d40
+_md5_=7b4457b12e11d05c8cd1eb62113e387c
diff --git a/metadata/md5-cache/dev-erlang/p1_utils-1.0.5 b/metadata/md5-cache/dev-erlang/p1_utils-1.0.5
index 00302253ffb4..9a5c55ccd525 100644
--- a/metadata/md5-cache/dev-erlang/p1_utils-1.0.5
+++ b/metadata/md5-cache/dev-erlang/p1_utils-1.0.5
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
 DESCRIPTION=Erlang utility modules from ProcessOne
 EAPI=6
 HOMEPAGE=https://github.com/processone/p1_utils
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/p1_utils/archive/1.0.5.tar.gz -> p1_utils-1.0.5.tar.gz
 _eclass_exported_funcs=src_prepare:rebar src_compile:rebar src_test:rebar src_install:rebar
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=895b4485a7ee1ca9fa590ecc390eab4b
+_md5_=9274e2f5929a26e3f8b9e1d4a2b3627c
diff --git a/metadata/md5-cache/dev-erlang/proper-1.2 b/metadata/md5-cache/dev-erlang/proper-1.2
index 727359a3a41a..c68c21581885 100644
--- a/metadata/md5-cache/dev-erlang/proper-1.2
+++ b/metadata/md5-cache/dev-erlang/proper-1.2
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
 DESCRIPTION=QuickCheck-inspired property-based testing tool for Erlang
 EAPI=6
 HOMEPAGE=https://github.com/manopapad/proper
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=GPL-3
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/manopapad/proper/archive/v1.2.tar.gz -> proper-1.2.tar.gz
 _eclass_exported_funcs=src_prepare:rebar src_configure:- src_compile:rebar src_test:rebar src_install:rebar
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=002c7decac55460ac4d36f009a7b2a3c
+_md5_=20bc8386b4873844e8399e2b0868756e
diff --git a/metadata/md5-cache/dev-erlang/protobuffs-0.9.0 b/metadata/md5-cache/dev-erlang/protobuffs-0.9.0
index 6e2dca974c64..56bef7f7c474 100644
--- a/metadata/md5-cache/dev-erlang/protobuffs-0.9.0
+++ b/metadata/md5-cache/dev-erlang/protobuffs-0.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=Google's Protocol Buffers for Erlang
 EAPI=6
 HOMEPAGE=https://github.com/basho/erlang_protobuffs
 IUSE=test
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/basho/erlang_protobuffs/archive/0.9.0.tar.gz -> protobuffs-0.9.0.tar.gz
 _eclass_exported_funcs=src_prepare:rebar src_compile:rebar src_test:- src_install:rebar
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=e25551649fec3f04c1192b0d3724efb9
+_md5_=c602a57e503870b37d9d5962a4562189
diff --git a/metadata/md5-cache/dev-erlang/riak_pb-2.1.4.2 b/metadata/md5-cache/dev-erlang/riak_pb-2.1.4.2
index b1ffd87e8e73..e71aa1f3b546 100644
--- a/metadata/md5-cache/dev-erlang/riak_pb-2.1.4.2
+++ b/metadata/md5-cache/dev-erlang/riak_pb-2.1.4.2
@@ -3,11 +3,11 @@ DEPEND=>=dev-erlang/protobuffs-0.9.0 >=dev-erlang/hamcrest-0.1.0_p20160709 >=dev
 DESCRIPTION=Riak Protocol Buffers messages
 EAPI=6
 HOMEPAGE=https://github.com/basho/riak_pb
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/protobuffs-0.9.0 >=dev-erlang/hamcrest-0.1.0_p20160709 >=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/basho/riak_pb/archive/2.1.4.2.tar.gz -> riak_pb-2.1.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:rebar src_compile:rebar src_test:rebar src_install:rebar
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=8b6ed7c9d0f36bdb91ebf8f8b120314f
+_md5_=6632fb109eabbe623afeb83d61ef1a21
diff --git a/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.0 b/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.0
index 61c905f63416..ffd8abcbfd1c 100644
--- a/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.0
+++ b/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.0
@@ -3,11 +3,11 @@ DEPEND=>=dev-erlang/protobuffs-0.9.0 >=dev-erlang/hamcrest-0.1.0_p20160709 >=dev
 DESCRIPTION=Riak Protocol Buffers messages
 EAPI=6
 HOMEPAGE=https://github.com/basho/riak_pb
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/protobuffs-0.9.0 >=dev-erlang/hamcrest-0.1.0_p20160709 >=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/basho/riak_pb/archive/2.2.0.0.tar.gz -> riak_pb-2.2.0.0.tar.gz
 _eclass_exported_funcs=src_prepare:rebar src_compile:rebar src_test:rebar src_install:rebar
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=0b226fb5b32928d282114fc9dc4eafad
+_md5_=4954f3919e897ae7b2945d1936861151
diff --git a/metadata/md5-cache/dev-erlang/riakc-2.4.2 b/metadata/md5-cache/dev-erlang/riakc-2.4.2
index 971405ede2ff..60efcdfef9ff 100644
--- a/metadata/md5-cache/dev-erlang/riakc-2.4.2
+++ b/metadata/md5-cache/dev-erlang/riakc-2.4.2
@@ -3,11 +3,11 @@ DEPEND=>=dev-erlang/riak_pb-2.1.4.2 >=dev-lang/erlang-17.1 dev-lang/erlang dev-u
 DESCRIPTION=Erlang clients for Riak
 EAPI=6
 HOMEPAGE=https://github.com/basho/riak-erlang-client
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/riak_pb-2.1.4.2 >=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/basho/riak-erlang-client/archive/2.4.2.tar.gz -> riakc-2.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:rebar src_test:rebar src_install:rebar
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=65159c266391d18f9c67a4ebb40e3728
+_md5_=3a382ff6931020ca73a9cb003d45ff0f
diff --git a/metadata/md5-cache/dev-erlang/stringprep-1.0.6 b/metadata/md5-cache/dev-erlang/stringprep-1.0.6
index cd7ceccb47f3..01402710ae35 100644
--- a/metadata/md5-cache/dev-erlang/stringprep-1.0.6
+++ b/metadata/md5-cache/dev-erlang/stringprep-1.0.6
@@ -3,11 +3,11 @@ DEPEND=>=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 dev-lang/erlang dev-ut
 DESCRIPTION=Fast Stringprep implementation for Erlang and Elixir
 EAPI=6
 HOMEPAGE=https://github.com/processone/stringprep
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0 tcltk
 RDEPEND=>=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/stringprep/archive/1.0.6.tar.gz -> stringprep-1.0.6.tar.gz
 _eclass_exported_funcs=src_prepare:rebar src_compile:rebar src_test:rebar src_install:rebar
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=ae47499277c7ffb56e0c7f6668d2b67a
+_md5_=4d6d5b4b08f1a2515c0d184c6a85bcd6
diff --git a/metadata/md5-cache/dev-erlang/stun-1.0.7 b/metadata/md5-cache/dev-erlang/stun-1.0.7
index 63d287cc7711..c5683e8e79ff 100644
--- a/metadata/md5-cache/dev-erlang/stun-1.0.7
+++ b/metadata/md5-cache/dev-erlang/stun-1.0.7
@@ -3,11 +3,11 @@ DEPEND=>=dev-erlang/fast_tls-1.0.7 >=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang
 DESCRIPTION=STUN and TURN library for Erlang and Elixir
 EAPI=6
 HOMEPAGE=https://github.com/processone/stun
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-erlang/fast_tls-1.0.7 >=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/stun/archive/1.0.7.tar.gz -> stun-1.0.7.tar.gz
 _eclass_exported_funcs=src_prepare:rebar src_compile:rebar src_test:rebar src_install:rebar
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=e5caf38b03ffcb2633c4e4cdd9936e82
+_md5_=fe0d7bf7c85088821629239c0bafef95
diff --git a/metadata/md5-cache/dev-lang/swig-3.0.8 b/metadata/md5-cache/dev-lang/swig-3.0.8
index c6aabb08b522..1f6c418da2c4 100644
--- a/metadata/md5-cache/dev-lang/swig-3.0.8
+++ b/metadata/md5-cache/dev-lang/swig-3.0.8
@@ -4,11 +4,11 @@ DESCRIPTION=Simplified Wrapper and Interface Generator
 EAPI=5
 HOMEPAGE=http://www.swig.org/
 IUSE=ccache doc pcre
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+ BSD BSD-2
 RDEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/swig/swig-3.0.8.tar.gz
 _eclass_exported_funcs=src_configure:- src_install:-
-_md5_=24be66b55bfba472c52067f9e13d22c3
+_md5_=0ff0009260074930fa9eb2a23bc40349
diff --git a/metadata/md5-cache/dev-libs/leatherman-0.9.0 b/metadata/md5-cache/dev-libs/leatherman-0.9.0
index 69c5664c15a9..dbcaba54ca30 100644
--- a/metadata/md5-cache/dev-libs/leatherman-0.9.0
+++ b/metadata/md5-cache/dev-libs/leatherman-0.9.0
@@ -4,7 +4,7 @@ DESCRIPTION=A C++ toolkit
 EAPI=5
 HOMEPAGE=https://github.com/puppetlabs/leatherman
 IUSE=debug test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
-KEYWORDS=amd64 ~hppa ~ppc ppc64 ~x86
+KEYWORDS=amd64 ~hppa ~ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] net-misc/curl ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/0.9.0.tar.gz -> leatherman-0.9.0.tar.gz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:- src_configure:- src_compile:ruby-ng src_test:ruby-ng src_install:-
 _eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3e43485a44bab221b1655c1063f9a16c
+_md5_=1aa969ecc92c92295bc4b42fb45efd2c
diff --git a/metadata/md5-cache/dev-libs/libcdio-0.93 b/metadata/md5-cache/dev-libs/libcdio-0.93
index d131556454d5..e8e58cd56cc7 100644
--- a/metadata/md5-cache/dev-libs/libcdio-0.93
+++ b/metadata/md5-cache/dev-libs/libcdio-0.93
@@ -4,11 +4,11 @@ DESCRIPTION=A library to encapsulate CD-ROM reading and control
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/libcdio/
 IUSE=cddb +cxx minimal static-libs 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=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0/15
 SRC_URI=mirror://gnu/libcdio/libcdio-0.93.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=135cb6b87f9183f76cc6ceb89fdca844
+_md5_=e7eee2db2928811fc619dc42b9142d1a
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1
index 81ecaed84fa0..9dacf5107258 100644
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1
@@ -4,11 +4,11 @@ DESCRIPTION=an advanced CDDA reader with error correction
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/libcdio/
 IUSE=+cxx static-libs 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=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3+ GPL-2+ LGPL-2.1
 RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.93[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.93+1.tar.gz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:autotools-multilib src_test:autotools-multilib src_install:autotools-multilib
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=45e11809c8b05a172cb345aa59b7af40
+_md5_=9da69933edffc8f8c5e51fbc255e927a
diff --git a/metadata/md5-cache/dev-libs/openobex-1.7.1 b/metadata/md5-cache/dev-libs/openobex-1.7.1
index ef7acf8a3b1d..698a4e850bf4 100644
--- a/metadata/md5-cache/dev-libs/openobex-1.7.1
+++ b/metadata/md5-cache/dev-libs/openobex-1.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Implementation of the OBEX protocol used for transferring data to mo
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/openobex/
 IUSE=bluetooth irda usb
-KEYWORDS=amd64 ~arm hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bluetooth? ( net-wireless/bluez:= ) usb? ( virtual/libusb:= )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/openobex/1.7.1/openobex-1.7.1-Source.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9f5a11935eda0f582594c705f42d540b
+_md5_=9255d448fc2a4e87eda1d0825449c701
diff --git a/metadata/md5-cache/dev-lisp/sbcl-1.3.11 b/metadata/md5-cache/dev-lisp/sbcl-1.3.11
index 9ba57b1222d3..0728ccf76379 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-1.3.11
+++ b/metadata/md5-cache/dev-lisp/sbcl-1.3.11
@@ -4,11 +4,11 @@ DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Li
 EAPI=6
 HOMEPAGE=http://sbcl.sourceforge.net/
 IUSE=debug doc source +threads +unicode pax_kernel zlib
-KEYWORDS=amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-lisp/asdf-3.1:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/1.3.11
 SRC_URI=mirror://sourceforge/sbcl/sbcl-1.3.11-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.3.11-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.3.9-armhf-linux-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-macos? ( mirror://sourceforge/sbcl/sbcl-1.1.6-x86-darwin-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 )
 _eclass_exported_funcs=src_unpack:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=73621f25aab4084e63f836c1fe97f8d9
+_md5_=36594b42024e6ffc03106f930ad6b59f
diff --git a/metadata/md5-cache/dev-perl/Capture-Tiny-0.360.0 b/metadata/md5-cache/dev-perl/Capture-Tiny-0.360.0
index 7e6f0c7aa14f..a8cf67c42ec4 100644
--- a/metadata/md5-cache/dev-perl/Capture-Tiny-0.360.0
+++ b/metadata/md5-cache/dev-perl/Capture-Tiny-0.360.0
@@ -4,11 +4,11 @@ DESCRIPTION=Capture STDOUT and STDERR from Perl, XS or external programs
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Capture-Tiny/
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.36.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	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=43a9fae54056f6a40409300d6458f0a3
+_md5_=1e1be7b39c006c9cc21e7f8a650b792d
diff --git a/metadata/md5-cache/dev-perl/DBD-Pg-3.5.3 b/metadata/md5-cache/dev-perl/DBD-Pg-3.5.3
index d7ee54f36707..c141751fdde7 100644
--- a/metadata/md5-cache/dev-perl/DBD-Pg-3.5.3
+++ b/metadata/md5-cache/dev-perl/DBD-Pg-3.5.3
@@ -3,11 +3,11 @@ DEPEND=virtual/perl-version >=dev-perl/DBI-1.614.0 dev-db/postgresql:* virtual/p
 DESCRIPTION=PostgreSQL database driver for the DBI module
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/DBD-Pg/
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-version >=dev-perl/DBI-1.614.0 dev-db/postgresql:* dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.5.3.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:perl-module src_compile:perl-module src_test:perl-module src_install:perl-module
 _eclasses_=multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358
-_md5_=6088c5c23e52da191331e1a8a8ad372c
+_md5_=331aff1205e0928695bd6839a0df46b2
diff --git a/metadata/md5-cache/dev-perl/DBD-SQLite-1.500.0 b/metadata/md5-cache/dev-perl/DBD-SQLite-1.500.0
index 7b69805b145b..df1673b3786b 100644
--- a/metadata/md5-cache/dev-perl/DBD-SQLite-1.500.0
+++ b/metadata/md5-cache/dev-perl/DBD-SQLite-1.500.0
@@ -4,11 +4,11 @@ DESCRIPTION=Self Contained RDBMS in a DBI Driver
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/DBD-SQLite/
 IUSE=test system-sqlite
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=system-sqlite? ( >=dev-db/sqlite-3.10.2[extensions(+)] ) >=dev-perl/DBI-1.570.0 !<dev-perl/DBD-SQLite-1 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.50.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:perl-module src_compile:perl-module src_test:perl-module src_install:perl-module
 _eclasses_=multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358
-_md5_=70cdf5f0c52dbad9a7b343564a0db4d2
+_md5_=638ee0dafb112fe1e292841a7d9d6c66
diff --git a/metadata/md5-cache/dev-perl/DBI-1.636.0 b/metadata/md5-cache/dev-perl/DBI-1.636.0
index 7bff4340ba3c..d6166f2a4840 100644
--- a/metadata/md5-cache/dev-perl/DBI-1.636.0
+++ b/metadata/md5-cache/dev-perl/DBI-1.636.0
@@ -4,11 +4,11 @@ DESCRIPTION=Database independent interface for Perl
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/DBI/
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/PlRPC-0.200.0 >=virtual/perl-Sys-Syslog-0.170.0 virtual/perl-File-Spec !<=dev-perl/SQL-Statement-1.330.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMB/DBI-1.636.tar.gz
 _eclass_exported_funcs=src_prepare:perl-module src_configure:perl-module src_compile:perl-module src_test:- src_install:perl-module
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=7b6d001bfde0df935d3c9020687fa40a
+_md5_=f903ba13b0e3a41f3c0c00372e13597c
diff --git a/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.110.0 b/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.110.0
index 41253bad9756..a598ec020b0f 100644
--- a/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.110.0
+++ b/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.110.0
@@ -4,11 +4,11 @@ DESCRIPTION=Domain and host name validation
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Data-Validate-Domain/
 IUSE=test
-KEYWORDS=amd64 ~hppa ~x86
+KEYWORDS=amd64 ~hppa x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-perl/Net-Domain-TLD dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-Domain-0.11.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	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=2771fb48c2881377709b51ae413bbf0c
+_md5_=bf59315badacb29544d996d29b4fae4f
diff --git a/metadata/md5-cache/dev-perl/Data-Validate-IP-0.240.0 b/metadata/md5-cache/dev-perl/Data-Validate-IP-0.240.0
index ef8b883d7b5c..b23038c5d83a 100644
--- a/metadata/md5-cache/dev-perl/Data-Validate-IP-0.240.0
+++ b/metadata/md5-cache/dev-perl/Data-Validate-IP-0.240.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight IPv4 and IPv6 validation module
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Data-Validate-IP/
 IUSE=test
-KEYWORDS=amd64 ~hppa ~x86
+KEYWORDS=amd64 ~hppa x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter >=dev-perl/NetAddr-IP-4 virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-IP-0.24.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	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=b765f76e039fabb1c1072ff5c19e0113
+_md5_=894b2225817d141b933eddd1315c178b
diff --git a/metadata/md5-cache/dev-perl/Monitoring-Plugin-0.390.0 b/metadata/md5-cache/dev-perl/Monitoring-Plugin-0.390.0
index 91e697ad90a6..ba9b50e2e89c 100644
--- a/metadata/md5-cache/dev-perl/Monitoring-Plugin-0.390.0
+++ b/metadata/md5-cache/dev-perl/Monitoring-Plugin-0.390.0
@@ -4,11 +4,11 @@ DESCRIPTION=Modules to streamline Nagios, Icinga, Shinken, etc. plugins
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Monitoring-Plugin/
 IUSE=test
-KEYWORDS=amd64 ~hppa ~x86
+KEYWORDS=amd64 ~hppa x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Class-Accessor dev-perl/Config-Tiny virtual/perl-File-Spec dev-perl/Math-Calc-Units dev-perl/Params-Validate dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NI/NIERLEIN/Monitoring-Plugin-0.39.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	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=b631c4f499cf8ab7307b03834f77d963
+_md5_=c9d36239df697c99aaa928feb11df4c8
diff --git a/metadata/md5-cache/dev-perl/Net-CUPS-0.630.0 b/metadata/md5-cache/dev-perl/Net-CUPS-0.630.0
index 9b4d499044f1..5f5bac5223fa 100644
--- a/metadata/md5-cache/dev-perl/Net-CUPS-0.630.0
+++ b/metadata/md5-cache/dev-perl/Net-CUPS-0.630.0
@@ -4,11 +4,11 @@ DESCRIPTION=CUPS C API Interface
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Net-CUPS/
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=net-print/cups dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NI/NINE/Net-CUPS-0.63.tar.gz
 _eclass_exported_funcs=src_prepare:perl-module src_configure:perl-module src_compile:perl-module src_test:perl-module src_install:perl-module
 _eclasses_=multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358
-_md5_=432403a7be118ebfff61dbd8776838b9
+_md5_=6fc10c12a5070f0a2ca75913700fdc38
diff --git a/metadata/md5-cache/dev-perl/ORLite-1.980.0-r1 b/metadata/md5-cache/dev-perl/ORLite-1.980.0-r1
index a8630a26fcf0..3773ba8d5fe3 100644
--- a/metadata/md5-cache/dev-perl/ORLite-1.980.0-r1
+++ b/metadata/md5-cache/dev-perl/ORLite-1.980.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Extremely light weight SQLite-specific ORM
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/ORLite/
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Path-2.08 >=virtual/perl-File-Temp-0.20 >=dev-perl/Params-Util-1 >=dev-perl/DBI-1.607 >=dev-perl/DBD-SQLite-1.27 >=dev-perl/File-Remove-1.40 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/ORLite-1.98.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	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=bc8fb28150d7c19b7f3933cf43414247
+_md5_=345de9d24246d2053e3ac85744cabffe
diff --git a/metadata/md5-cache/dev-perl/SOAP-Lite-1.190.0 b/metadata/md5-cache/dev-perl/SOAP-Lite-1.190.0
index 20fbfe4757a5..ea1b8d800be2 100644
--- a/metadata/md5-cache/dev-perl/SOAP-Lite-1.190.0
+++ b/metadata/md5-cache/dev-perl/SOAP-Lite-1.190.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight interface to the SOAP protocol both on client and server
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/SOAP-Lite/
 IUSE=ssl test xmpp
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Inspector >=dev-perl/IO-SessionData-1.30.0 dev-perl/libwww-perl virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils dev-perl/Task-Weaken dev-perl/URI >=dev-perl/XML-Parser-2.230.0 dev-perl/MIME-tools ssl? ( dev-perl/IO-Socket-SSL dev-perl/LWP-Protocol-https dev-perl/Crypt-SSLeay ) xmpp? ( dev-perl/Net-Jabber ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.19.tar.gz
 _eclass_exported_funcs=src_unpack:perl-module src_prepare:perl-module src_configure:perl-module src_compile:perl-module src_test:- src_install:perl-module
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=5ec773cd66e8bc8cf141d72a508af401
+_md5_=93f95c6fcb2210bb80c5bdc863423bfd
diff --git a/metadata/md5-cache/dev-perl/WWW-Mechanize-1.750.0 b/metadata/md5-cache/dev-perl/WWW-Mechanize-1.750.0
index 57bf4ddab56d..130b17f7b424 100644
--- a/metadata/md5-cache/dev-perl/WWW-Mechanize-1.750.0
+++ b/metadata/md5-cache/dev-perl/WWW-Mechanize-1.750.0
@@ -4,11 +4,11 @@ DESCRIPTION=Handy web browsing in a Perl object
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/WWW-Mechanize/
 IUSE=test
-KEYWORDS=amd64 ~arm ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~ppc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IO-Socket-SSL || ( ( >dev-perl/libwww-perl-6 dev-perl/HTML-Form ) <dev-perl/libwww-perl-6 ) >=dev-perl/URI-1.36 >=dev-perl/HTML-Parser-3.34 dev-perl/HTML-Tree dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/WWW-Mechanize-1.75.tar.gz
 _eclass_exported_funcs=src_unpack:perl-module src_prepare:- src_configure:perl-module src_compile:perl-module src_test:perl-module src_install:perl-module
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=59312718954770d5a3491ada5a6e7995
+_md5_=ab270b53a5de8587ec7cbf72f632476c
diff --git a/metadata/md5-cache/dev-perl/WWW-Mechanize-FormFiller-0.110.0 b/metadata/md5-cache/dev-perl/WWW-Mechanize-FormFiller-0.110.0
index 85b7a55283b4..c8c172009705 100644
--- a/metadata/md5-cache/dev-perl/WWW-Mechanize-FormFiller-0.110.0
+++ b/metadata/md5-cache/dev-perl/WWW-Mechanize-FormFiller-0.110.0
@@ -3,11 +3,11 @@ DEPEND=dev-perl/Data-Random || ( ( dev-perl/libwww-perl dev-perl/HTML-Form ) dev
 DESCRIPTION=Framework to automate HTML forms
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/WWW-Mechanize-FormFiller/
-KEYWORDS=amd64 ~sparc ~x86
+KEYWORDS=amd64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-Random || ( ( dev-perl/libwww-perl dev-perl/HTML-Form ) dev-perl/libwww-perl ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/CORION/WWW-Mechanize-FormFiller-0.11.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	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=bfd8799c2d6040ddeea9ffa522d1ed66
+_md5_=7f163a562c44475596996d3bbc95f418
diff --git a/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0 b/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0
index 173fc81c6747..9312df840dc7 100644
--- a/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0
+++ b/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight regexp-based XML parser
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/XML-Parser-Lite/
 IUSE=test minimal
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/XML-Parser-Lite-0.721.tar.gz
 _eclass_exported_funcs=src_prepare:perl-module src_configure:perl-module src_compile:perl-module src_test:- src_install:perl-module
 _eclasses_=multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358
-_md5_=68456dfa1980e092536968ffbc641582
+_md5_=0a811d33e3238939e5150dbc76ef4f51
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.5.1 b/metadata/md5-cache/dev-python/beautifulsoup-4.5.1
index 5714c23f4254..a5725aa6dd7f 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-4.5.1
+++ b/metadata/md5-cache/dev-python/beautifulsoup-4.5.1
@@ -4,7 +4,7 @@ DESCRIPTION=Provides pythonic idioms for iterating, searching, and modifying an
 EAPI=6
 HOMEPAGE=https://bugs.launchpad.net/beautifulsoup/ https://pypi.python.org/pypi/beautifulsoup4
 IUSE=doc test 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( dev-python/html5lib[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/html5lib[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[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/lxml[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/lxml[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_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=4
 SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.5.1.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	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e0054f6a8d2972065225389b75367d03
+_md5_=ed7c2d8920f6bd44b28ea9b3de8ab31d
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.12.1 b/metadata/md5-cache/dev-python/llvmlite-0.12.1
index 947707e1e215..4d02fcea74d3 100644
--- a/metadata/md5-cache/dev-python/llvmlite-0.12.1
+++ b/metadata/md5-cache/dev-python/llvmlite-0.12.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python wrapper around the llvm C++ library
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/llvmlite
 IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND==sys-devel/llvm-3.7* python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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 )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=mirror://pypi/l/llvmlite/llvmlite-0.12.1.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	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b8045c7f9a9bd00945d1a06f8a2760fc
+_md5_=7881dd13bbe3d1ba9faf81b92cc70211
diff --git a/metadata/md5-cache/dev-python/mpmath-0.19-r1 b/metadata/md5-cache/dev-python/mpmath-0.19-r1
index 075e2a5d3db2..46af44e12877 100644
--- a/metadata/md5-cache/dev-python/mpmath-0.19-r1
+++ b/metadata/md5-cache/dev-python/mpmath-0.19-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Python library for arbitrary-precision floating-point arithmetic
 EAPI=5
 HOMEPAGE=http://mpmath.org/
 IUSE=doc examples gmp matplotlib test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[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=http://mpmath.org/files/mpmath-all-0.19.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	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=910b2825aa4f9c91ba77cb178026b21e
+_md5_=e1a5e21404468334e487f0ae1f76e044
diff --git a/metadata/md5-cache/dev-python/pyicu-1.9.5 b/metadata/md5-cache/dev-python/pyicu-1.9.5
index 9e8468581d35..e361a8392725 100644
--- a/metadata/md5-cache/dev-python/pyicu-1.9.5
+++ b/metadata/md5-cache/dev-python/pyicu-1.9.5
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings for dev-libs/icu
 EAPI=6
 HOMEPAGE=https://github.com/ovalhub/pyicu
 IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=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(-)] dev-libs/icu 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=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/P/PyICU/PyICU-1.9.5.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	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=499e0cd876272a1ac03d398e1131a93e
+_md5_=30cf8d56c487fec004acbcaa95671093
diff --git a/metadata/md5-cache/dev-python/pyro-4.41 b/metadata/md5-cache/dev-python/pyro-4.41
index 975d17325885..bc461405927a 100644
--- a/metadata/md5-cache/dev-python/pyro-4.41
+++ b/metadata/md5-cache/dev-python/pyro-4.41
@@ -4,7 +4,7 @@ DESCRIPTION=Distributed object middleware for Python (RPC)
 EAPI=5
 HOMEPAGE=http://www.xs4all.nl/~irmen/pyro/ https://pypi.python.org/pypi/Pyro4 https://github.com/irmen/Pyro4
 IUSE=doc examples test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=!dev-python/pyro:0 >=dev-python/serpent-1.11[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=4
 SRC_URI=mirror://pypi/P/Pyro4/Pyro4-4.41.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	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a5b0d759f5a0be8ec6177a0d4b0a89c7
+_md5_=211227f26dfa678fbbd7514769a4c844
diff --git a/metadata/md5-cache/dev-python/pysrt-1.1.1 b/metadata/md5-cache/dev-python/pysrt-1.1.1
index 00a62b3748ff..9bc092de90b8 100644
--- a/metadata/md5-cache/dev-python/pysrt-1.1.1
+++ b/metadata/md5-cache/dev-python/pysrt-1.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python library used to edit or create SubRip files
 EAPI=6
 HOMEPAGE=https://github.com/byroot/pysrt https://pypi.python.org/pypi/pysrt
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-python/chardet[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=https://pypi.python.org/packages/f6/33/16ad65a8973cb8bcb494af09ee1b9ab5ffdd6ff300bce5d3ac7d3cb1f2cc/pysrt-1.1.1.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	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9a44af9b20b3401e5778fb8b0efc379e
+_md5_=3390974d19400f9f1c274e693e1ddb13
diff --git a/metadata/md5-cache/dev-python/sympy-1.0-r1 b/metadata/md5-cache/dev-python/sympy-1.0-r1
index b30b563b6b0a..276edad85c5b 100644
--- a/metadata/md5-cache/dev-python/sympy-1.0-r1
+++ b/metadata/md5-cache/dev-python/sympy-1.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Computer Algebra System in pure Python
 EAPI=5
 HOMEPAGE=http://sympy.org
 IUSE=doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test texmacs theano python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-python/mpmath[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-python/pexpect-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) imaging? ( dev-python/pillow[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(-)] ) ipython? ( dev-python/ipython[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(-)] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2: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(-)] python_targets_python2_7? ( dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[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(-)] ) pyglet? ( python_targets_python2_7? ( dev-python/pyglet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) texmacs? ( app-office/texmacs ) theano? ( python_targets_python2_7? ( dev-python/theano[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) 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 ) doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/sympy/sympy/releases/download/sympy-1.0/sympy-1.0.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	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9412a3b325e46c1f8ac913ee45aed8d8
+_md5_=b5fe5879d626a25c95d0dbe87f113f4b
diff --git a/metadata/md5-cache/dev-python/tagpy-2013.1 b/metadata/md5-cache/dev-python/tagpy-2013.1
index ebd685a6165c..10e2a7d7362e 100644
--- a/metadata/md5-cache/dev-python/tagpy-2013.1
+++ b/metadata/md5-cache/dev-python/tagpy-2013.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python Bindings for TagLib
 EAPI=6
 HOMEPAGE=http://mathema.tician.de//software/tagpy https://pypi.python.org/pypi/tagpy
 IUSE=examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/boost-1.49.0:=[python,threads,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(-)] >=media-libs/taglib-1.7.2 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/t/tagpy/tagpy-2013.1.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	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=28e5837ef5c3e665fcf289f3ea1dfbdf
+_md5_=cf6a7f4f7164d115003f80b2a75fda69
diff --git a/metadata/md5-cache/dev-python/theano-0.7.0 b/metadata/md5-cache/dev-python/theano-0.7.0
index 0970f990d60f..e3df652486b5 100644
--- a/metadata/md5-cache/dev-python/theano-0.7.0
+++ b/metadata/md5-cache/dev-python/theano-0.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=Define and optimize multi-dimensional arrays mathematical expression
 EAPI=5
 HOMEPAGE=https://github.com/Theano/Theano
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.6.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sci-libs/scipy-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/T/Theano/Theano-0.7.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	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ce7b9098c70a3785362ff108d219e895
+_md5_=ba8aa69884e472c6a564d7ee03522b92
diff --git a/metadata/md5-cache/dev-python/vcrpy-1.7.4 b/metadata/md5-cache/dev-python/vcrpy-1.7.4
index 65855b8578b9..733e321b02f6 100644
--- a/metadata/md5-cache/dev-python/vcrpy-1.7.4
+++ b/metadata/md5-cache/dev-python/vcrpy-1.7.4
@@ -4,7 +4,7 @@ DESCRIPTION=Automatically mock your HTTP interactions to simplify and speed up t
 EAPI=5
 HOMEPAGE=https://github.com/kevin1024/vcrpy
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/contextlib2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/httplib2-0.9.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/urllib3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/wrapt[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=mirror://pypi/v/vcrpy/vcrpy-1.7.4.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	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=660f26bd171b433b6c595fff214efb68
+_md5_=83f746f5897e8ef80ffa5899b752cd5c
diff --git a/metadata/md5-cache/dev-ruby/blankslate-3.1.3 b/metadata/md5-cache/dev-ruby/blankslate-3.1.3
index 61f0bf8b2f76..8e05ddf42700 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-3.1.3
+++ b/metadata/md5-cache/dev-ruby/blankslate-3.1.3
@@ -4,7 +4,7 @@ DESCRIPTION=Base class with almost all of the methods from Object and Kernel bei
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/blankslate
 IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://rubygems/blankslate-3.1.3.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=63d80193be04a9fa27673726f0284070
+_md5_=c859f2f771c02b62a330c31610c0c4b5
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.12.5 b/metadata/md5-cache/dev-ruby/bundler-1.12.5
index 0888a86edff7..009bb7874614 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.12.5
+++ b/metadata/md5-cache/dev-ruby/bundler-1.12.5
@@ -4,7 +4,7 @@ DESCRIPTION=An easy way to vendor gem dependencies
 EAPI=5
 HOMEPAGE=https://github.com/carlhuda/bundler
 IUSE=doc test test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) dev-vcs/git ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=https://github.com/carlhuda/bundler/archive/v1.12.5.tar.gz -> bundler-1.12.5.tar.gz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5dc5c28f7c9bdc9060ef408dcb60900d
+_md5_=d01ebe47fdf4227d14be770f3b5f787d
diff --git a/metadata/md5-cache/dev-ruby/instantiator-0.0.6 b/metadata/md5-cache/dev-ruby/instantiator-0.0.6
index 3d2844f67f22..1ea984d7d500 100644
--- a/metadata/md5-cache/dev-ruby/instantiator-0.0.6
+++ b/metadata/md5-cache/dev-ruby/instantiator-0.0.6
@@ -4,7 +4,7 @@ DESCRIPTION=Instantiate an arbitrary Ruby class
 EAPI=5
 HOMEPAGE=https://github.com/floehopper/introspection
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( dev-ruby/blankslate:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/blankslate:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/blankslate:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/blankslate:*[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://rubygems/instantiator-0.0.6.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c881f6894b33cb23ffe68d979b4b91bd
+_md5_=2f5cdec08a06f6553f34fac8d4732859
diff --git a/metadata/md5-cache/dev-ruby/introspection-0.0.3 b/metadata/md5-cache/dev-ruby/introspection-0.0.3
index ada128eb8b1e..f2e935c0c6eb 100644
--- a/metadata/md5-cache/dev-ruby/introspection-0.0.3
+++ b/metadata/md5-cache/dev-ruby/introspection-0.0.3
@@ -4,7 +4,7 @@ DESCRIPTION=Dynamic inspection of the hierarchy of method definitions on a Ruby
 EAPI=5
 HOMEPAGE=http://jamesmead.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby20] >=dev-ruby/instantiator-0.0.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby21] >=dev-ruby/instantiator-0.0.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby22] >=dev-ruby/instantiator-0.0.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby23] >=dev-ruby/instantiator-0.0.3[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://rubygems/introspection-0.0.3.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=693c147d713f91370f8ffd4d7a9f0d83
+_md5_=688fa18f8688ce07a11c66f46789dde5
diff --git a/metadata/md5-cache/dev-ruby/logue-1.0.4 b/metadata/md5-cache/dev-ruby/logue-1.0.4
index a4e7ec44f264..3227169e7567 100644
--- a/metadata/md5-cache/dev-ruby/logue-1.0.4
+++ b/metadata/md5-cache/dev-ruby/logue-1.0.4
@@ -4,7 +4,7 @@ DESCRIPTION=A module that adds logging/trace functionality
 EAPI=5
 HOMEPAGE=https://github.com/jpace/logue
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=amd64 ~hppa ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/jpace/logue/archive/v1.0.4.tar.gz -> logue-git-1.0.4.tgz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=68966658c07e5db72b93b7ec4cfd7abc
+_md5_=a9d7ec2f072bfb3649dc98e79b0dd391
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.8.4 b/metadata/md5-cache/dev-ruby/minitest-5.8.4
index 77550840424b..b86fc5eb8955 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.8.4
+++ b/metadata/md5-cache/dev-ruby/minitest-5.8.4
@@ -4,7 +4,7 @@ DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and sl
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/minitest
 IUSE=doc test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
@@ -12,4 +12,4 @@ SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.8.4.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d6d858cf600650687c0db0667911d6c9
+_md5_=6aee6174e0ce39cad868f289f6473705
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.14.0 b/metadata/md5-cache/dev-ruby/mocha-0.14.0
index 42c65c655550..eed61235000c 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.14.0
+++ b/metadata/md5-cache/dev-ruby/mocha-0.14.0
@@ -4,7 +4,7 @@ DESCRIPTION=Mocking and stubbing using a syntax like that of JMock and SchMock
 EAPI=5
 HOMEPAGE=http://gofreerange.com/mocha/docs/
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( dev-ruby/metaclass[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/metaclass[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/metaclass[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
@@ -12,4 +12,4 @@ SLOT=0.14
 SRC_URI=mirror://rubygems/mocha-0.14.0.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fea35bfaa7f3a4d86e3e411d65d2c261
+_md5_=196eedd793448e3dee093e4e2e0aebfc
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.1.0 b/metadata/md5-cache/dev-ruby/mocha-1.1.0
index 2d64b1a63d33..135da2774aca 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.1.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Mocking and stubbing using a syntax like that of JMock and SchMock
 EAPI=5
 HOMEPAGE=http://gofreerange.com/mocha/docs/
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( dev-ruby/introspection[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/introspection[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/introspection[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/introspection[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
@@ -12,4 +12,4 @@ SLOT=1.0
 SRC_URI=mirror://rubygems/mocha-1.1.0.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b0ec9f9b6d7faee7328d8e2d196dba49
+_md5_=1f38b5846a61dbc93d9e6cb1ba1bf940
diff --git a/metadata/md5-cache/dev-ruby/rake-10.5.0 b/metadata/md5-cache/dev-ruby/rake-10.5.0
index bd48afaf0f70..97dfe928cc38 100644
--- a/metadata/md5-cache/dev-ruby/rake-10.5.0
+++ b/metadata/md5-cache/dev-ruby/rake-10.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=Make-like scripting in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/jimweirich/rake
 IUSE=doc elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://rubygems/rake-10.5.0.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7a80ad4415b1ef33bfb0c250e3e7b9f4
+_md5_=f5dd12de9a1e584d6a22ac80a828617b
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.5.0 b/metadata/md5-cache/dev-ruby/rspec-3.5.0
index d87d4a733088..4852769b113e 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.5.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
-KEYWORDS=alpha amd64 ~arm ~hppa ~ppc64 ~x86
+KEYWORDS=alpha amd64 ~arm ~hppa ~ppc64 x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( =dev-ruby/rspec-core-3.5*[ruby_targets_ruby20] =dev-ruby/rspec-expectations-3.5*[ruby_targets_ruby20] =dev-ruby/rspec-mocks-3.5*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( =dev-ruby/rspec-core-3.5*[ruby_targets_ruby21] =dev-ruby/rspec-expectations-3.5*[ruby_targets_ruby21] =dev-ruby/rspec-mocks-3.5*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-core-3.5*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-3.5*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-3.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-core-3.5*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-3.5*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-3.5*[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
@@ -12,4 +12,4 @@ SLOT=3
 SRC_URI=mirror://rubygems/rspec-3.5.0.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=07d24a3e6afaf6867c1f73492c71b069
+_md5_=b001353abed38606b44fdc5133950f03
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.5.4 b/metadata/md5-cache/dev-ruby/rspec-core-3.5.4
index 30f9dbc4e06e..846c5f972bbe 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.5.4
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.5.4
@@ -4,7 +4,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-core
 IUSE=highlight test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=alpha amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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-ruby/rspec-support-3.5*[ruby_targets_ruby20] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby20] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
@@ -12,4 +12,4 @@ SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.5.4.tar.gz -> rspec-core-3.5.4-git.tgz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a78176f590472309a6daff5ad4b5a95b
+_md5_=cc14a12944016c702de8b625742a11de
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0
index d9cf134e7b4c..a0627961bccf 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-expectations
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=alpha amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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-ruby/diff-lcs-1.2.0[ruby_targets_ruby20] <dev-ruby/diff-lcs-2[ruby_targets_ruby20] =dev-ruby/rspec-support-3.5*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby21] <dev-ruby/diff-lcs-2[ruby_targets_ruby21] =dev-ruby/rspec-support-3.5*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] <dev-ruby/diff-lcs-2[ruby_targets_ruby22] =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
@@ -12,4 +12,4 @@ SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.5.0.tar.gz -> rspec-expectations-3.5.0-git.tgz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=54ed1cf9f01b06b23ba242cdba20e461
+_md5_=98ed0921d53bffa823c0099fd8dcbcef
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0
index 878e7952462d..c23439bf0957 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-mocks
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=alpha amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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-ruby/rspec-support-3.5*[ruby_targets_ruby20] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby20] =dev-ruby/diff-lcs-1*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby21] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby21] =dev-ruby/diff-lcs-1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] =dev-ruby/diff-lcs-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] =dev-ruby/diff-lcs-1*[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
@@ -12,4 +12,4 @@ SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.5.0.tar.gz -> rspec-mocks-3.5.0-git.tgz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=65dae2b453969ca200797429d68d129f
+_md5_=56f723c62ae8bdb3e4d7313f214502a9
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.5.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.5.0
index 7253af3cc58d..513521e3ab96 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.5.0
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-support
 IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=alpha amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
@@ -12,4 +12,4 @@ SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.5.0.tar.gz -> rspec-support-3.5.0-git.tgz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dd6711465d6d7cbd6f75c8adda7e466b
+_md5_=1eef7c5e21589d1c9dd873b8c3bb5102
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.5.2 b/metadata/md5-cache/dev-ruby/rubygems-2.5.2
index 226e73ffa2d9..c0796e099ce5 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.5.2
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.5.2
@@ -4,7 +4,7 @@ DESCRIPTION=Centralized Ruby extension management system
 EAPI=5
 HOMEPAGE=https://rubygems.org/
 IUSE=server test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby MIT )
 PDEPEND=server? ( >=dev-ruby/builder-2.1 )
 RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-2.5.2.tgz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4cecf24518e2c0ded6b92f2551de6c07
+_md5_=25ce3ac828c92448c6262229cd604096
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.3.11 b/metadata/md5-cache/dev-ruby/sqlite3-1.3.11
index e9d25f5acac7..76b9e58fd32b 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.3.11
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.3.11
@@ -4,7 +4,7 @@ DESCRIPTION=An extension library to access a SQLite database from Ruby
 EAPI=5
 HOMEPAGE=https://github.com/sparklemotion/sqlite3-ruby
 IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-db/sqlite-3.6.16:3 ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://rubygems/sqlite3-1.3.11.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1ee52ad0ef4f3b28940e96f8a98b9b90
+_md5_=06e630d30fa71f3f55ae1dfb8db97762
diff --git a/metadata/md5-cache/dev-ruby/thread_order-1.1.0 b/metadata/md5-cache/dev-ruby/thread_order-1.1.0
index 147da2b27314..47f3961b9cb4 100644
--- a/metadata/md5-cache/dev-ruby/thread_order-1.1.0
+++ b/metadata/md5-cache/dev-ruby/thread_order-1.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Test helper for ordering threaded code
 EAPI=5
 HOMEPAGE=https://github.com/JoshCheek/thread_order
 IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=alpha amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://rubygems/thread_order-1.1.0.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d4e52b7cab1fcdf897abe2e6190d6905
+_md5_=0dbb65756829b33f9688d6bbb0797412
diff --git a/metadata/md5-cache/dev-tex/latex2html-2015 b/metadata/md5-cache/dev-tex/latex2html-2015
index 2a1ddd169a90..f3c1c4c010b1 100644
--- a/metadata/md5-cache/dev-tex/latex2html-2015
+++ b/metadata/md5-cache/dev-tex/latex2html-2015
@@ -4,10 +4,10 @@ DESCRIPTION=Convertor written in Perl that converts LATEX documents to HTML
 EAPI=6
 HOMEPAGE=http://www.latex2html.org/
 IUSE=gif png
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl virtual/latex-base media-libs/netpbm dev-lang/perl gif? ( media-libs/giflib ) png? ( media-libs/libpng:0 )
 SLOT=0
 SRC_URI=http://mirrors.ctan.org/support/latex2html/latex2html-2015.tar.gz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_install:-
-_md5_=94f3727e61c210e8701a8132160f5541
+_md5_=5a339c80ae97cf3b47f6af25c0b20e7a
diff --git a/metadata/md5-cache/dev-util/ald-0.1.7-r2 b/metadata/md5-cache/dev-util/ald-0.1.7-r2
index 81da0aa6dd50..ee12e81b0a96 100644
--- a/metadata/md5-cache/dev-util/ald-0.1.7-r2
+++ b/metadata/md5-cache/dev-util/ald-0.1.7-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Assembly Language Debugger
 EAPI=6
 HOMEPAGE=http://ald.sourceforge.net/
 IUSE=debug ncurses
-KEYWORDS=~x86
+KEYWORDS=x86
 LICENSE=GPL-2
 RDEPEND=ncurses? ( sys-libs/ncurses:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/ald/ald-0.1.7.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=566c817945dcb0391d133f637c524558
+_md5_=6695ddfb1760490e6b65e58461941d5a
diff --git a/metadata/md5-cache/dev-util/distro-info-data-0.29 b/metadata/md5-cache/dev-util/distro-info-data-0.29
index e88ddc1c2f19..4cc335b87862 100644
--- a/metadata/md5-cache/dev-util/distro-info-data-0.29
+++ b/metadata/md5-cache/dev-util/distro-info-data-0.29
@@ -2,10 +2,10 @@ DEFINED_PHASES=-
 DESCRIPTION=Information about the Debian distributions' releases (data files)
 EAPI=6
 HOMEPAGE=https://debian.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ISC
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/distro-info-data/distro-info-data_0.29.tar.xz
 _eclass_exported_funcs=-
-_md5_=fcda44632a4247eb534387d58d137f12
+_md5_=afc5dd9a1ef8d80882cd1af51c93ee50
diff --git a/metadata/md5-cache/dev-util/shunit2-2.1.6 b/metadata/md5-cache/dev-util/shunit2-2.1.6
deleted file mode 100644
index a50131997ad7..000000000000
--- a/metadata/md5-cache/dev-util/shunit2-2.1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/perl net-misc/curl
-DESCRIPTION=Unit-test framework for Bourne-based shell scripts
-EAPI=4
-HOMEPAGE=https://github.com/kward/shunit2
-IUSE=doc test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://shunit2.googlecode.com/files/shunit2-2.1.6.tgz
-_eclass_exported_funcs=src_install:-
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=6d3ce6bea656b702299277e4229a5f89
diff --git a/metadata/md5-cache/dev-util/shunit2-2.1.6-r1 b/metadata/md5-cache/dev-util/shunit2-2.1.6-r1
index 16ccb370ea07..249b55585163 100644
--- a/metadata/md5-cache/dev-util/shunit2-2.1.6-r1
+++ b/metadata/md5-cache/dev-util/shunit2-2.1.6-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Unit-test framework for Bourne-based shell scripts
 EAPI=6
 HOMEPAGE=https://github.com/kward/shunit2
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://shunit2.googlecode.com/files/shunit2-2.1.6.tgz
 _eclass_exported_funcs=src_install:-
-_md5_=70d3d6e56af5a7a7546cde5f0b76229b
+_md5_=57e7787fbbccbb041a36bdc31eefea0d
diff --git a/metadata/md5-cache/dev-vcs/bzr-explorer-1.3.0-r1 b/metadata/md5-cache/dev-vcs/bzr-explorer-1.3.0-r1
index 80f29e92a763..6cdec75ab9fe 100644
--- a/metadata/md5-cache/dev-vcs/bzr-explorer-1.3.0-r1
+++ b/metadata/md5-cache/dev-vcs/bzr-explorer-1.3.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A high level interface to all commonly used Bazaar features
 EAPI=5
 HOMEPAGE=https://launchpad.net/bzr-explorer
 IUSE=gtk python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-vcs/bzr-2.5[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_python2_7(+)] >=dev-vcs/qbzr-0.23[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_python2_7(+)] gtk? ( dev-vcs/bzr-gtk[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_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://launchpad.net/bzr-explorer/1.3/1.3.0/+download/bzr-explorer-1.3.0.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	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5353a9bee9766346b30d1f54302ee355
+_md5_=446755aaaf2aa823c8559f2be0789790
diff --git a/metadata/md5-cache/dev-vcs/bzr-git-0.6.8-r1 b/metadata/md5-cache/dev-vcs/bzr-git-0.6.8-r1
index 5887e413ff06..06a357d718d0 100644
--- a/metadata/md5-cache/dev-vcs/bzr-git-0.6.8-r1
+++ b/metadata/md5-cache/dev-vcs/bzr-git-0.6.8-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Support for Git branches in Bazaar
 EAPI=5
 HOMEPAGE=http://bazaar-vcs.org/BzrForeignBranches/Git
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/dulwich-0.8.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_python2_7(+)] >=dev-vcs/bzr-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=http://samba.org/~jelmer/bzr/bzr-git-0.6.8.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	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=13b1d0bea1fbb8dbcb9fec12a2eea600
+_md5_=a52850a8b59e45b65b7b6170bd9f48c1
diff --git a/metadata/md5-cache/dev-vcs/bzr-gtk-0.104.0-r1 b/metadata/md5-cache/dev-vcs/bzr-gtk-0.104.0-r1
index 9d712c7f1d7e..cc4728028e3f 100644
--- a/metadata/md5-cache/dev-vcs/bzr-gtk-0.104.0-r1
+++ b/metadata/md5-cache/dev-vcs/bzr-gtk-0.104.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A GTK+ interfaces to most Bazaar operations
 EAPI=5
 HOMEPAGE=http://bazaar-vcs.org/bzr-gtk
 IUSE=gnome-keyring gpg nautilus python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-vcs/bzr-1.6_rc1[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_python2_7(+)] dev-python/pygobject[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_python2_7(+)] dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] nautilus? ( >=dev-python/nautilus-python-1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] virtual/pkgconfig ) nautilus? ( >=dev-python/nautilus-python-1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] gnome-keyring? ( dev-python/gnome-keyring-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) gpg? ( app-crypt/seahorse ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://launchpad.net/bzr-gtk/gtk3/0.104.0/+download/bzr-gtk-0.104.0.tar.gz
 _eclass_exported_funcs=pkg_setup:python-single-r1 src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=87a19d5c7fd3686d3f41af46722d91cd
+_md5_=01c86829666d852ec9312bbfd136eaab
diff --git a/metadata/md5-cache/dev-vcs/bzr-xmloutput-0.8.8-r2 b/metadata/md5-cache/dev-vcs/bzr-xmloutput-0.8.8-r2
index b8c25951e6f0..d2c6da343a54 100644
--- a/metadata/md5-cache/dev-vcs/bzr-xmloutput-0.8.8-r2
+++ b/metadata/md5-cache/dev-vcs/bzr-xmloutput-0.8.8-r2
@@ -4,7 +4,7 @@ DESCRIPTION=A Bazaar plugin that provides a option to generate XML output forbui
 EAPI=5
 HOMEPAGE=http://bazaar-vcs.org/XMLOutput
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-vcs/bzr[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_python2_7(+)] >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://launchpad.net/bzr-xmloutput/trunk/0.8.8/+download/bzr-xmloutput-0.8.8.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	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fefd7de6392fe29586fe615bf2a6b708
+_md5_=2d14e63ff7ea665cbf4658a649785532
diff --git a/metadata/md5-cache/dev-vcs/kdesvn-1.7.0 b/metadata/md5-cache/dev-vcs/kdesvn-1.7.0
index 101b16cc1aad..93042f25d83f 100644
--- a/metadata/md5-cache/dev-vcs/kdesvn-1.7.0
+++ b/metadata/md5-cache/dev-vcs/kdesvn-1.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=A frontend to the subversion vcs
 EAPI=6
 HOMEPAGE=http://kdesvn.alwins-world.de/
 IUSE=debug l10n_cs l10n_de l10n_el l10n_es l10n_fr l10n_it l10n_ja l10n_lt l10n_pt-BR l10n_ro l10n_ru +handbook aqua
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-qt/qtsql:4[sqlite] >=dev-vcs/subversion-1.7 sys-devel/gettext !kde-apps/kdesdk-kioslaves:4[subversion(+)] kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) handbook? ( kde-frameworks/kdelibs:4[handbook] ) 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
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=4
 SRC_URI=mirror://kde/stable/kdesvn/1.7.0/kdesvn-1.7.0.tar.xz
 _eclass_exported_funcs=pkg_preinst:kde4-base pkg_postrm:kde4-base pkg_postinst:kde4-base pkg_setup:kde4-base src_unpack:kde4-base src_prepare:kde4-base src_configure:- src_compile:kde4-base src_test:kde4-base src_install:kde4-base
 _eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	958da2c50ab906e72cd6fc7c77146404	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3d0b560210bdfc9aa41ef26c8a6878d2
+_md5_=7a0e51b76cd28997bcdd5111c892891f
diff --git a/metadata/md5-cache/dev-vcs/qbzr-0.23.1 b/metadata/md5-cache/dev-vcs/qbzr-0.23.1
index cc62d339814b..a1e95b002067 100644
--- a/metadata/md5-cache/dev-vcs/qbzr-0.23.1
+++ b/metadata/md5-cache/dev-vcs/qbzr-0.23.1
@@ -4,7 +4,7 @@ DESCRIPTION=Qt frontend for Bazaar
 EAPI=5
 HOMEPAGE=https://launchpad.net/qbzr
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 ~ppc ~x86
+KEYWORDS=~alpha amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-vcs/bzr-2.5 >=dev-python/PyQt4-4.1[X] 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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://edge.launchpad.net/qbzr/0.23/0.23.1/+download/qbzr-0.23.1.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:- src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=52c3475eaad6990b3d143d8e6c2573b9
+_md5_=a8e49b15ff5abb08923551486fecacff
diff --git a/metadata/md5-cache/kde-apps/gpgmepp-16.08.3 b/metadata/md5-cache/kde-apps/gpgmepp-16.08.3
index 9c1691e39d86..a91842983b87 100644
--- a/metadata/md5-cache/kde-apps/gpgmepp-16.08.3
+++ b/metadata/md5-cache/kde-apps/gpgmepp-16.08.3
@@ -4,11 +4,11 @@ DESCRIPTION=C++ bindings for gpgme
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1+
 RDEPEND=app-crypt/gpgme:= >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/gpgmepp-16.08.3.tar.xz
 _eclass_exported_funcs=pkg_preinst:kde5 pkg_postrm:kde5 pkg_postinst:kde5 pkg_setup:kde5 src_unpack:kde5 src_prepare:kde5 src_configure:kde5 src_compile:kde5 src_test:kde5 src_install:kde5
 _eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	9311eb27a7c2f59817fec0e58bf96a78	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=cc8fab49075158b496aa7ccbd1f72446
+_md5_=3ced4e0bcd7f3c0e286c7020c5138f22
diff --git a/metadata/md5-cache/kde-apps/kholidays-16.08.3 b/metadata/md5-cache/kde-apps/kholidays-16.08.3
index b4c30f7b5e8d..5941e2a7f44e 100644
--- a/metadata/md5-cache/kde-apps/kholidays-16.08.3
+++ b/metadata/md5-cache/kde-apps/kholidays-16.08.3
@@ -4,7 +4,7 @@ DESCRIPTION=Library to determine holidays and other special events for a geograp
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.6.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kholidays:4 >=dev-qt/qtcore-5.6.1:5
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=5
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kholidays-16.08.3.tar.xz
 _eclass_exported_funcs=pkg_preinst:kde5 pkg_postrm:kde5 pkg_postinst:kde5 pkg_setup:kde5 src_unpack:kde5 src_prepare:kde5 src_configure:kde5 src_compile:kde5 src_test:kde5 src_install:kde5
 _eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	9311eb27a7c2f59817fec0e58bf96a78	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b80edcb5a1a1d6ed4d41d953dedfc9fd
+_md5_=dbc65c080fe65c8d3fafe21b7772f72d
diff --git a/metadata/md5-cache/kde-misc/kshutdown-4.0 b/metadata/md5-cache/kde-misc/kshutdown-4.0
index 31e0c85e4b9a..26277621f3f5 100644
--- a/metadata/md5-cache/kde-misc/kshutdown-4.0
+++ b/metadata/md5-cache/kde-misc/kshutdown-4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Shutdown manager for desktop environmenmts like KDE Plasma
 EAPI=6
 HOMEPAGE=http://kshutdown.sourceforge.net
 IUSE=+kde debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdbusaddons:5 kde-frameworks/kglobalaccel:5 kde-frameworks/ki18n:5 kde-frameworks/kidletime:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) !kde-misc/kshutdown:4
 SLOT=5
 SRC_URI=mirror://sourceforge/kshutdown/kshutdown-source-4.0.zip
 _eclass_exported_funcs=pkg_preinst:kde5 pkg_postrm:kde5 pkg_postinst:kde5 pkg_setup:kde5 src_unpack:kde5 src_prepare:kde5 src_configure:- src_compile:kde5 src_test:kde5 src_install:kde5
 _eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	9311eb27a7c2f59817fec0e58bf96a78	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=dba85bb163da1fcddebfdafb93d28c51
+_md5_=2474786cac55928ba49d840377444df3
diff --git a/metadata/md5-cache/kde-misc/skanlite-2.0.1 b/metadata/md5-cache/kde-misc/skanlite-2.0.1
index 312436b79584..2916545d860d 100644
--- a/metadata/md5-cache/kde-misc/skanlite-2.0.1
+++ b/metadata/md5-cache/kde-misc/skanlite-2.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=KDE image scanning application
 EAPI=6
 HOMEPAGE=http://www.kde.org/applications/graphics/skanlite/
 IUSE=debug +handbook
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/libksane-14.12.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 media-libs/libpng:0= !kde-misc/skanlite:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/skanlite/2.0/skanlite-2.0.1.tar.xz
 _eclass_exported_funcs=pkg_preinst:kde5 pkg_postrm:kde5 pkg_postinst:kde5 pkg_setup:kde5 src_unpack:kde5 src_prepare:- src_configure:kde5 src_compile:kde5 src_test:kde5 src_install:kde5
 _eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	9311eb27a7c2f59817fec0e58bf96a78	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=584d02f5a7c84cb36f4f958e9e12fb6b
+_md5_=e81cf6b27c463b6897b6128f22907382
diff --git a/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta1 b/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta1
index 43696a3c89eb..b82b3883b382 100644
--- a/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta1
+++ b/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta1
@@ -4,11 +4,11 @@ DESCRIPTION=KControl module for Wacom tablets
 EAPI=6
 HOMEPAGE=http://kde-apps.org/content/show.php?action=content&content=114856
 IUSE=test debug +handbook
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/extra-cmake-modules-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kglobalaccel-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-frameworks/plasma-5.26.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libX11 x11-libs/libXi x11-libs/libXrandr x11-libs/libxcb !kde-misc/wacomtablet:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-3.0.0~beta1.tar.xz
 _eclass_exported_funcs=pkg_preinst:kde5 pkg_postrm:kde5 pkg_postinst:kde5 pkg_setup:kde5 src_unpack:kde5 src_prepare:kde5 src_configure:kde5 src_compile:kde5 src_test:kde5 src_install:kde5
 _eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	9311eb27a7c2f59817fec0e58bf96a78	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fd33128bfbb6aee296ef328432c666bc
+_md5_=bde416c74d6ed325c97169d190c65e85
diff --git a/metadata/md5-cache/lxde-base/lxpanel-0.8.1 b/metadata/md5-cache/lxde-base/lxpanel-0.8.1
index d18c23de39cd..5f0d2bac0d3e 100644
--- a/metadata/md5-cache/lxde-base/lxpanel-0.8.1
+++ b/metadata/md5-cache/lxde-base/lxpanel-0.8.1
@@ -4,7 +4,7 @@ DESCRIPTION=Lightweight X11 desktop panel for LXDE
 EAPI=5
 HOMEPAGE=http://lxde.org/
 IUSE=+alsa wifi
-KEYWORDS=~alpha amd64 arm ~arm64 ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~ppc x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/keybinder:0= x11-libs/gtk+:2 >=x11-libs/libfm-1.2.0[gtk] x11-libs/libwnck:1 x11-libs/libXmu x11-libs/libXpm x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/libX11 lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) wifi? ( net-wireless/wireless-tools )
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%200.8.x/lxpanel-0.8.1.tar.xz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c15e7c0a11beb6185758826db6c39f00
+_md5_=fc1478d3a59c16e0cdb9ea50505e5e78
diff --git a/metadata/md5-cache/lxde-base/menu-cache-1.0.1 b/metadata/md5-cache/lxde-base/menu-cache-1.0.1
index 78293641e563..fafd4b720244 100644
--- a/metadata/md5-cache/lxde-base/menu-cache-1.0.1
+++ b/metadata/md5-cache/lxde-base/menu-cache-1.0.1
@@ -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=5
 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.1.tar.xz
 _eclass_exported_funcs=-
-_md5_=16b744e561f73014643667df2b154527
+_md5_=0c6508ba6a2d0ba93a8c8185d85379ea
diff --git a/metadata/md5-cache/mail-mta/exim-4.88 b/metadata/md5-cache/mail-mta/exim-4.88
index a208c79e3d13..92f53abd0fbb 100644
--- a/metadata/md5-cache/mail-mta/exim-4.88
+++ b/metadata/md5-cache/mail-mta/exim-4.88
@@ -4,7 +4,7 @@ DESCRIPTION=A highly configurable, drop-in replacement for sendmail
 EAPI=6
 HOMEPAGE=http://www.exim.org/
 IUSE=dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X elibc_glibc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
 REQUIRED_USE=dane? ( !gnutls ) dmarc? ( spf dkim ) pkcs11? ( gnutls ) spf? ( exiscan-acl ) srs? ( exiscan-acl )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=ftp://ftp.exim.org/pub/exim/exim4/exim-4.88.tar.bz2 mirror://gentoo/system_filter.exim.gz doc? ( ftp://ftp.exim.org/pub/exim/exim4/exim-pdf-4.88.tar.bz2 )
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=c959dd017a7d6598692aa608b29e8bc6
+_md5_=bc4fe38035b096830669b78ecef573b5
diff --git a/metadata/md5-cache/media-gfx/gpicview-0.2.5 b/metadata/md5-cache/media-gfx/gpicview-0.2.5
index 94a7f4cbe9ea..29c2b81b4879 100644
--- a/metadata/md5-cache/media-gfx/gpicview-0.2.5
+++ b/metadata/md5-cache/media-gfx/gpicview-0.2.5
@@ -3,10 +3,10 @@ DEPEND=virtual/jpeg:0 >=x11-libs/gtk+-2.6:2 >=dev-util/intltool-0.40 virtual/pkg
 DESCRIPTION=A Simple and Fast Image Viewer for X
 EAPI=6
 HOMEPAGE=http://lxde.sourceforge.net/gpicview
-KEYWORDS=~alpha amd64 arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~ppc x86 ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 >=x11-libs/gtk+-2.6:2
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/gpicview-0.2.5.tar.xz
 _eclass_exported_funcs=src_install:-
-_md5_=de1de0b7332a158f269b4df5349184be
+_md5_=81b7434ec540b96ea0daa63536fb442b
diff --git a/metadata/md5-cache/media-libs/libafterimage-1.20-r1 b/metadata/md5-cache/media-libs/libafterimage-1.20-r1
index 16003e03d229..5fb3ddfa5844 100644
--- a/metadata/md5-cache/media-libs/libafterimage-1.20-r1
+++ b/metadata/md5-cache/media-libs/libafterimage-1.20-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Afterstep's standalone generic image manipulation library
 EAPI=6
 HOMEPAGE=http://www.afterstep.org/afterimage/index.php
 IUSE=+X cpu_flags_x86_mmx examples gif jpeg nls opengl png static-libs shm +shaping svg tiff truetype
-KEYWORDS=alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) opengl? ( virtual/opengl ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( gnome-base/librsvg:2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype )
 REQUIRED_USE=opengl? ( X ) shaping? ( X ) shm? ( X )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=ftp://ftp.afterstep.org/stable/libAfterImage/libAfterImage-1.20.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=6c6679bfcc4dd10faab8222a876d040c
+_md5_=a8d3a71aa63b096d01da9c86dfca49f0
diff --git a/metadata/md5-cache/media-libs/libeot-0.01 b/metadata/md5-cache/media-libs/libeot-0.01
index 5920ebd74a83..78e42f2c4d1b 100644
--- a/metadata/md5-cache/media-libs/libeot-0.01
+++ b/metadata/md5-cache/media-libs/libeot-0.01
@@ -3,10 +3,10 @@ DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=s
 DESCRIPTION=Library for parsing Embedded OpenType files (Microsoft embedded font 'standard')
 EAPI=6
 HOMEPAGE=https://github.com/umanwizard/libeot
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MPL-2.0
 SLOT=0
 SRC_URI=https://github.com/umanwizard/libeot/archive/v0.01.tar.gz -> libeot-0.01.tgz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=84062430965007b7b171879741243a34
+_md5_=d362cfb77bc621690c14031c0de46372
diff --git a/metadata/md5-cache/media-libs/libmygpo-qt-1.0.9 b/metadata/md5-cache/media-libs/libmygpo-qt-1.0.9
index b75d0afb5819..9f54c1646b07 100644
--- a/metadata/md5-cache/media-libs/libmygpo-qt-1.0.9
+++ b/metadata/md5-cache/media-libs/libmygpo-qt-1.0.9
@@ -4,7 +4,7 @@ DESCRIPTION=Qt/C++ library wrapping the gpodder.net webservice
 EAPI=6
 HOMEPAGE=http://wiki.gpodder.org/wiki/Libmygpo-qt
 IUSE=+qt4 qt5 test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=qt4? ( >=dev-libs/qjson-0.5[qt4(+)] dev-qt/qtcore:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 )
 REQUIRED_USE=|| ( qt4 qt5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/gpodder/libmygpo-qt/archive/1.0.9.tar.gz -> libmygpo-qt-1.0.9.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:cmake-utils src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1874f25b406d219535f72aeefd856817
+_md5_=13cf356684faa5a8aa8bc03db54f4066
diff --git a/metadata/md5-cache/media-libs/rubberband-1.8.1-r1 b/metadata/md5-cache/media-libs/rubberband-1.8.1-r1
index 17262327c47d..a1ea484e0f37 100644
--- a/metadata/md5-cache/media-libs/rubberband-1.8.1-r1
+++ b/metadata/md5-cache/media-libs/rubberband-1.8.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An audio time-stretching and pitch-shifting library and utility prog
 EAPI=5
 HOMEPAGE=http://www.breakfastquay.com/rubberband/
 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=alpha amd64 hppa ~ppc ppc64 ~x86
+KEYWORDS=alpha amd64 hppa ~ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/vamp-plugin-sdk[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(-)?] media-libs/libsamplerate[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(-)?] media-libs/libsndfile media-libs/ladspa-sdk sci-libs/fftw:3.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(-)?]
 SLOT=0
 SRC_URI=http://code.breakfastquay.com/attachments/download/34/rubberband-1.8.1.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=e4660d10904ef5def2637f0f1f3b6006
+_md5_=fed56f46e961182b01dd00f0cc560c8c
diff --git a/metadata/md5-cache/media-libs/wxsvg-1.5.9 b/metadata/md5-cache/media-libs/wxsvg-1.5.9
index a9c18dc59d45..9a3af569df55 100644
--- a/metadata/md5-cache/media-libs/wxsvg-1.5.9
+++ b/metadata/md5-cache/media-libs/wxsvg-1.5.9
@@ -4,11 +4,11 @@ DESCRIPTION=C++ library to create, manipulate and render SVG files
 EAPI=5
 HOMEPAGE=http://wxsvg.sourceforge.net/
 IUSE=static-libs libav
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=wxWinLL-3
 RDEPEND=>=dev-libs/expat-2:= >=dev-libs/glib-2.28:2= dev-libs/libxml2:= media-libs/fontconfig:= media-libs/freetype:2= x11-libs/cairo:= x11-libs/pango:= x11-libs/wxGTK:3.0=[X] libav? ( >=media-video/libav-9:0= ) !libav? ( >=media-video/ffmpeg-2.6:0= )
 SLOT=0/3
 SRC_URI=mirror://sourceforge/wxsvg/wxsvg-1.5.9.tar.bz2
 _eclass_exported_funcs=src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
-_md5_=3ce2c1d0d7388307656fd8a8588a37db
+_md5_=023eed8ebfda5bf4dbcbe8c998ddf20c
diff --git a/metadata/md5-cache/media-radio/fldigi-3.23.12 b/metadata/md5-cache/media-radio/fldigi-3.23.12
index de53c8688b7f..ac3a4239c850 100644
--- a/metadata/md5-cache/media-radio/fldigi-3.23.12
+++ b/metadata/md5-cache/media-radio/fldigi-3.23.12
@@ -4,11 +4,11 @@ DESCRIPTION=Sound card based multimode software modem for Amateur Radio use
 EAPI=5
 HOMEPAGE=http://www.w1hkj.com/Fldigi.html
 IUSE=hamlib nls portaudio pulseaudio sndfile
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl hamlib? ( media-libs/hamlib ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( >=media-libs/libsndfile-1.0.10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fldigi/fldigi-3.23.12.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=3250afdcc63e289103a253daf39ad4b0
+_md5_=9e42bb5cc20a7b4b8452a8c390d77435
diff --git a/metadata/md5-cache/media-radio/flrig-1.3.26 b/metadata/md5-cache/media-radio/flrig-1.3.26
index 156c59c3c8a0..7813a589c995 100644
--- a/metadata/md5-cache/media-radio/flrig-1.3.26
+++ b/metadata/md5-cache/media-radio/flrig-1.3.26
@@ -4,11 +4,11 @@ DESCRIPTION=Transceiver control program for Amateur Radio use
 EAPI=5
 HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
 IUSE=nls
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://sourceforge/fldigi/flrig-1.3.26.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ba22fa7a6347614bf02dd8b2f21722d1
+_md5_=c1ae4475b80958702a35049eb997dbf8
diff --git a/metadata/md5-cache/media-radio/qsstv-9.1.8 b/metadata/md5-cache/media-radio/qsstv-9.1.8
index 420f0c558893..b14f871d9260 100644
--- a/metadata/md5-cache/media-radio/qsstv-9.1.8
+++ b/metadata/md5-cache/media-radio/qsstv-9.1.8
@@ -3,11 +3,11 @@ DEPEND=dev-qt/qtcore:4[qt3support] dev-qt/qtgui:4 media-libs/hamlib media-libs/o
 DESCRIPTION=Amateur radio SSTV software
 EAPI=5
 HOMEPAGE=http://users.telenet.be/on4qz/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:4[qt3support] dev-qt/qtgui:4 media-libs/hamlib media-libs/openjpeg:2 media-libs/alsa-lib media-sound/pulseaudio media-libs/libv4l sci-libs/fftw:3.0= x11-misc/xdg-utils
 SLOT=0
 SRC_URI=http://users.telenet.be/on4qz/qsstv/downloads/qsstv_9.1.8.tar.gz
 _eclass_exported_funcs=src_unpack:qt4-r2 src_prepare:- src_configure:qt4-r2 src_compile:qt4-r2 src_install:qt4-r2
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1dcf9abef762232d23a68a7dcc7a3747
+_md5_=71070ff3937d93b332a6b639f4aad1b2
diff --git a/metadata/md5-cache/media-radio/tlf-1.2.4.1 b/metadata/md5-cache/media-radio/tlf-1.2.4.1
index 30fe9251e459..e0372b8269f0 100644
--- a/metadata/md5-cache/media-radio/tlf-1.2.4.1
+++ b/metadata/md5-cache/media-radio/tlf-1.2.4.1
@@ -3,11 +3,11 @@ DEPEND=sys-libs/ncurses:= dev-libs/glib:2 media-libs/hamlib media-sound/sox dev-
 DESCRIPTION=Console-mode amateur radio contest logger
 EAPI=5
 HOMEPAGE=http://home.iae.nl/users/reinc/TLF-0.2.html
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:= dev-libs/glib:2 media-libs/hamlib media-sound/sox dev-libs/xmlrpc-c[curl]
 SLOT=0
 SRC_URI=http://www.hs-mittweida.de/tb/tlf-1.2.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=41135cb099d2c4c359f884dd7542c502
+_md5_=939e36a85ba67d24d5b857fef3bdf619
diff --git a/metadata/md5-cache/media-radio/xastir-2.0.8 b/metadata/md5-cache/media-radio/xastir-2.0.8
index 3817ed46fe08..1c754c4e770e 100644
--- a/metadata/md5-cache/media-radio/xastir-2.0.8
+++ b/metadata/md5-cache/media-radio/xastir-2.0.8
@@ -4,11 +4,11 @@ DESCRIPTION=X Amateur Station Tracking and Information Reporting
 EAPI=5
 HOMEPAGE=http://xastir.org/
 IUSE=festival gdal geotiff graphicsmagick
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db:4.8 sci-libs/shapelib !graphicsmagick? ( media-gfx/imagemagick[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff:0 ) gdal? ( sci-libs/gdal ) festival? ( app-accessibility/festival )
 SLOT=0
 SRC_URI=mirror://sourceforge/xastir/xastir-2.0.8.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=33113db1632102a72c848268cceabf15
+_md5_=fc294aab98816e443de266792db4cec1
diff --git a/metadata/md5-cache/media-sound/clementine-1.2.3-r2 b/metadata/md5-cache/media-sound/clementine-1.2.3-r2
index 55de698474fb..a549de09c1be 100644
--- a/metadata/md5-cache/media-sound/clementine-1.2.3-r2
+++ b/metadata/md5-cache/media-sound/clementine-1.2.3-r2
@@ -4,7 +4,7 @@ DESCRIPTION=A modern music player and library organizer based on Amarok 1.4 and
 EAPI=5
 HOMEPAGE=http://www.clementine-player.org https://github.com/clementine-player/Clementine
 IUSE=ayatana box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive system-sqlite test ubuntu-one +udisks wiimote linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_es_AR linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_mr linguas_ms linguas_nb linguas_nl linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_te linguas_tr linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=app-crypt/qca:2[qt4(+)] >=dev-qt/qtcore-4.5:4[ssl] >=dev-qt/qtgui-4.5:4 dbus? ( >=dev-qt/qtdbus-4.5:4 ) >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] system-sqlite? ( dev-db/sqlite:3[fts3(+)] ) >=media-libs/taglib-1.8[mp4(+)] >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson media-libs/libechonest:=[qt4(+)] >=media-libs/libmygpo-qt-1.0.7[qt4(+)] >=media-libs/chromaprint-0.6 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 ayatana? ( dev-libs/libindicate-qt ) cdda? ( dev-libs/libcdio ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) dbus? ( udisks? ( sys-fs/udisks:0 ) ) mms? ( media-plugins/gst-plugins-libmms:0.10 ) mtp? ( gnome-base/gvfs[mtp] ) projectm? ( >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-gio:0.10 media-plugins/gst-plugins-soup:0.10 media-plugins/gst-plugins-taglib:0.10
 REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz -> clementine-1.2.3.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	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6621655f9cde8e1208f142e53c010bc7
+_md5_=eb5e38dabf3242fb7bf3580e8cae63fe
diff --git a/metadata/md5-cache/media-sound/flacon-2.0.1-r1 b/metadata/md5-cache/media-sound/flacon-2.0.1-r1
index 0c53583826a5..f7443c2d1ad3 100644
--- a/metadata/md5-cache/media-sound/flacon-2.0.1-r1
+++ b/metadata/md5-cache/media-sound/flacon-2.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Extracts audio tracks from an audio CD image to separate tracks
 EAPI=6
 HOMEPAGE=https://flacon.github.io/
 IUSE=aac flac mac mp3 opus qt5 replaygain test tta vorbis wavpack 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_pl linguas_pl_PL linguas_pt_BR linguas_pt_PT linguas_ro_RO linguas_ru linguas_sr 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[mac?] aac? ( media-libs/faac ) flac? ( media-libs/flac ) mac? ( media-sound/mac ) mp3? ( media-sound/lame ) opus? ( media-sound/opus-tools ) replaygain? ( mp3? ( media-sound/mp3gain ) vorbis? ( media-sound/vorbisgain ) ) tta? ( media-sound/ttaenc ) vorbis? ( media-sound/vorbis-tools ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=https://github.com/flacon/flacon/archive/v2.0.1.tar.gz -> flacon-2.0.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	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=651969a1363597bb93a0573758b46bfe
+_md5_=87cdc2b6c9a29605c7ec794b92225888
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-0.7.7 b/metadata/md5-cache/media-sound/ncmpcpp-0.7.7
index 479cce19f5df..74d062f58845 100644
--- a/metadata/md5-cache/media-sound/ncmpcpp-0.7.7
+++ b/metadata/md5-cache/media-sound/ncmpcpp-0.7.7
@@ -4,10 +4,10 @@ DESCRIPTION=featureful ncurses based MPD client inspired by ncmpc
 EAPI=6
 HOMEPAGE=http://ncmpcpp.rybczak.net/
 IUSE=clock curl outputs taglib unicode visualizer
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[nls,threads] sys-libs/ncurses:=[unicode?] sys-libs/readline:* curl? ( net-misc/curl ) taglib? ( media-libs/taglib ) unicode? ( dev-libs/boost:=[icu] dev-libs/icu:= ) visualizer? ( sci-libs/fftw:3.0= )
 SLOT=0
 SRC_URI=http://ncmpcpp.rybczak.net/stable/ncmpcpp-0.7.7.tar.bz2
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_install:-
-_md5_=7d73c2eefa73d3f555b3f9f3b31aabf6
+_md5_=1e91bb47aea9681d8b4ee790dc56896d
diff --git a/metadata/md5-cache/media-sound/split2flac-122 b/metadata/md5-cache/media-sound/split2flac-122
index 40c2d550fb3c..94a5180bb264 100644
--- a/metadata/md5-cache/media-sound/split2flac-122
+++ b/metadata/md5-cache/media-sound/split2flac-122
@@ -3,11 +3,11 @@ DESCRIPTION=sh script to split an APE/FLAC/WV/WAV audio image with CUE sheet int
 EAPI=5
 HOMEPAGE=https://github.com/ftrvxmtrx/split2flac
 IUSE=enca flake imagemagick mac mp3 mp4 ogg replaygain wavpack
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=app-cdr/cuetools media-sound/shntool[mac?] virtual/libiconv media-libs/flac enca? ( app-i18n/enca ) flake? ( media-sound/flake ) mp3? ( media-sound/lame || ( media-libs/mutagen media-libs/id3lib ) ) mp4? ( media-libs/faac media-libs/libmp4v2:0[utils] ) ogg? ( media-sound/vorbis-tools ) wavpack? ( media-sound/wavpack ) replaygain? ( mp3? ( media-sound/mp3gain ) mp4? ( media-sound/aacgain ) ogg? ( media-sound/vorbisgain ) ) imagemagick? ( media-gfx/imagemagick )
 SLOT=0
 SRC_URI=https://github.com/ftrvxmtrx/split2flac/archive/122.tar.gz -> split2flac-122.tar.gz
 _eclass_exported_funcs=src_configure:- src_compile:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1126522ebc3d445e8bb32ce949d2f325
+_md5_=8456aa7c89b9430db45af8e671e55afc
diff --git a/metadata/md5-cache/media-video/guvcview-2.0.3 b/metadata/md5-cache/media-video/guvcview-2.0.3
index 5f002334057b..600de338d266 100644
--- a/metadata/md5-cache/media-video/guvcview-2.0.3
+++ b/metadata/md5-cache/media-video/guvcview-2.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=GTK+ UVC Viewer
 EAPI=5
 HOMEPAGE=http://guvcview.sourceforge.net/
 IUSE=gsl libav pulseaudio qt5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.10 media-libs/libpng:0= media-libs/libsdl2 media-libs/libv4l >=media-libs/portaudio-19_pre !libav? ( >=media-video/ffmpeg-2.8:0= ) libav? ( media-video/libav:= ) virtual/ffmpeg virtual/libusb:1 virtual/udev pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) gsl? ( >=sci-libs/gsl-1.15 ) qt5? ( dev-qt/qtwidgets:5 ) !qt5? ( >=x11-libs/gtk+-3.6:3 ) !<sys-kernel/linux-headers-3.4-r2
 SLOT=0
 SRC_URI=mirror://sourceforge/guvcview/guvcview-src-2.0.3.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=5f15ba1639c181dd60f32570714a32ee
+_md5_=46c0f68fc0665cafd30483b13ed7adf7
diff --git a/metadata/md5-cache/media-video/smplayer-16.1.0 b/metadata/md5-cache/media-video/smplayer-16.1.0
index e428c90f7ebe..0d6c2b6621b9 100644
--- a/metadata/md5-cache/media-video/smplayer-16.1.0
+++ b/metadata/md5-cache/media-video/smplayer-16.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Great Qt GUI front-end for mplayer/mpv
 EAPI=6
 HOMEPAGE=http://www.smplayer.eu/
 IUSE=autoshutdown bidi debug mpris +qt4 qt5 streaming linguas_ar linguas_ar_SY linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el_GR linguas_en_GB linguas_en_US linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_gl linguas_he_IL linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_ko linguas_ku linguas_lt linguas_mk linguas_ms_MY linguas_nl linguas_nn_NO linguas_pl linguas_pt linguas_pt_BR linguas_ro_RO linguas_ru_RU linguas_sk linguas_sl_SI linguas_sq_AL linguas_sr linguas_sv linguas_th linguas_tr linguas_uk_UA linguas_uz linguas_vi_VN linguas_zh_CN linguas_zh_TW
-KEYWORDS=amd64 ~arm hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux
+KEYWORDS=amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux
 LICENSE=GPL-2+ BSD-2
 RDEPEND=sys-libs/zlib qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsingleapplication[X,qt4] autoshutdown? ( dev-qt/qtdbus:4 ) mpris? ( dev-qt/qtdbus:4 ) streaming? ( dev-qt/qtcore:4[ssl] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] dev-qt/qtwidgets:5 dev-qt/qtxml:5 autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) streaming? ( dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 ) ) || ( media-video/mplayer[bidi?,libass,png,X] ( >=media-video/mpv-0.6.2[libass,X] streaming? ( >=net-misc/youtube-dl-2014.11.26 ) ) )
 REQUIRED_USE=^^ ( qt4 qt5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/smplayer/smplayer-16.1.0.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=7aaef47e037b4ead631e72e5ab71e7fc
+_md5_=fd4898a472be7f76424a1b4082a40abf
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_rbl-1.3.7-r1 b/metadata/md5-cache/net-analyzer/nagios-check_rbl-1.3.7-r1
index b06034272f86..aac730d6cf10 100644
--- a/metadata/md5-cache/net-analyzer/nagios-check_rbl-1.3.7-r1
+++ b/metadata/md5-cache/net-analyzer/nagios-check_rbl-1.3.7-r1
@@ -3,11 +3,11 @@ DEPEND=dev-lang/perl dev-perl/Data-Validate-Domain dev-perl/Data-Validate-IP dev
 DESCRIPTION=Monitor whether or not a host is blacklisted
 EAPI=6
 HOMEPAGE=https://github.com/matteocorti/check_rbl
-KEYWORDS=amd64 ~hppa ~x86
+KEYWORDS=amd64 ~hppa x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/Data-Validate-Domain dev-perl/Data-Validate-IP dev-perl/Monitoring-Plugin dev-perl/Net-DNS dev-perl/Readonly
 SLOT=0
 SRC_URI=https://github.com/matteocorti/check_rbl/releases/download/v1.3.7/check_rbl-1.3.7.tar.gz -> check_rbl-1.3.7-r1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=perl-functions	aac50de73be0a80ebe780e0b20850130
-_md5_=6ffd2febc4dd8950e085a78052d9b3e4
+_md5_=a430c2a8eee390f19d52243fc7aa0a39
diff --git a/metadata/md5-cache/net-ftp/lftp-4.7.4 b/metadata/md5-cache/net-ftp/lftp-4.7.4
index 2cc060a01598..e6f805a84f31 100644
--- a/metadata/md5-cache/net-ftp/lftp-4.7.4
+++ b/metadata/md5-cache/net-ftp/lftp-4.7.4
@@ -4,11 +4,11 @@ DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer
 EAPI=6
 HOMEPAGE=http://lftp.tech/
 IUSE=convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ja linguas_ko linguas_pl linguas_pt_BR linguas_ru linguas_uk linguas_zh_CN linguas_zh_HK linguas_zh_TW
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
 SLOT=0
 SRC_URI=http://lftp.tech/ftp/lftp-4.7.4.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=aa7d92c6572a49653c8de251e13cef05
+_md5_=a5f3ae37fefd06531446389bf3343119
diff --git a/metadata/md5-cache/net-im/gajim-0.16.6 b/metadata/md5-cache/net-im/gajim-0.16.6
index 6e5d7a0fc446..e8b2da86e10b 100644
--- a/metadata/md5-cache/net-im/gajim-0.16.6
+++ b/metadata/md5-cache/net-im/gajim-0.16.6
@@ -4,7 +4,7 @@ DESCRIPTION=Jabber client written in PyGTK
 EAPI=5
 HOMEPAGE=http://www.gajim.org/
 IUSE=crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf python_targets_python2_7
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-nbxmpp-0.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( app-crypt/gnupg dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/dbus-glib libnotify? ( dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeroconf? ( net-dns/avahi[dbus,gtk,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gnome? ( dev-python/libgnome-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/egg-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-python/gnome-keyring-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) idle? ( x11-libs/libXScrnSaver ) jingle? ( net-libs/farstream:0.1[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) kde? ( kde-apps/kwalletmanager ) networkmanager? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/networkmanager ) spell? ( app-text/gtkspell:2 ) srv? ( || ( dev-python/libasyncns-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-dns/bind-tools ) ) xhtml? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 ) libnotify? ( dbus ) gnome? ( gnome-keyring ) zeroconf? ( dbus )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=http://www.gajim.org/downloads/0.16/gajim-0.16.6.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6b620785e600dd206b934a67620bb6c1
+_md5_=e777722152b3a077317d80dbb32d80da
diff --git a/metadata/md5-cache/net-im/openfire-4.1.0 b/metadata/md5-cache/net-im/openfire-4.1.0
index 9defe1d215ff..f81b630f1d90 100644
--- a/metadata/md5-cache/net-im/openfire-4.1.0
+++ b/metadata/md5-cache/net-im/openfire-4.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Openfire (formerly wildfire) real time collaboration (RTC) server
 EAPI=5
 HOMEPAGE=http://www.igniterealtime.org/projects/openfire/
 IUSE=doc elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://www.igniterealtime.org/builds/openfire/openfire_src_4_1_0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:- src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a3b1ad4c8c611534811e79d98fb8a3ab
+_md5_=0d82984d00c0baae04d92b6f8aa73ee0
diff --git a/metadata/md5-cache/net-libs/libssh-0.7.3-r1 b/metadata/md5-cache/net-libs/libssh-0.7.3-r1
index 095969980548..1773d73c922d 100644
--- a/metadata/md5-cache/net-libs/libssh-0.7.3-r1
+++ b/metadata/md5-cache/net-libs/libssh-0.7.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Access a working SSH implementation by means of a library
 EAPI=6
 HOMEPAGE=http://www.libssh.org/
 IUSE=debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-libs test 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 ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=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(-)?] ) !gcrypt? ( !libressl? ( >=dev-libs/openssl-1.0.1h-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(-)?] ) libressl? ( dev-libs/libressl[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(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3: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(-)?] ) gssapi? ( >=virtual/krb5-0-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/4
 SRC_URI=https://red.libssh.org/attachments/download/195/libssh-0.7.3.tar.xz -> libssh-0.7.3.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:cmake-multilib src_compile:cmake-multilib src_test:cmake-multilib src_install:cmake-multilib
 _eclasses_=cmake-multilib	273c15f5a0a06438a38bb5c3e98fa2db	cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3548a59e2748f48b7a973cd1157dc1fa
+_md5_=f983d6cfe3183b7592ab3ce530aa38ca
diff --git a/metadata/md5-cache/net-misc/olsrd-0.9.0.2 b/metadata/md5-cache/net-misc/olsrd-0.9.0.2
index a564e15b2211..efd350d5081c 100644
--- a/metadata/md5-cache/net-misc/olsrd-0.9.0.2
+++ b/metadata/md5-cache/net-misc/olsrd-0.9.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=An implementation of the Optimized Link State Routing protocol
 EAPI=5
 HOMEPAGE=http://www.olsr.org/
 IUSE=gtk
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD LGPL-2.1
 RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=http://www.olsr.org/releases/0.9/olsrd-0.9.0.2.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e8fb23ded6f15e44054d4458a2b074aa
+_md5_=912a76a77e0109335eac8bbb404adee0
diff --git a/metadata/md5-cache/net-misc/radvd-2.14 b/metadata/md5-cache/net-misc/radvd-2.14
index 3ae8f2e403da..93655dd9ac78 100644
--- a/metadata/md5-cache/net-misc/radvd-2.14
+++ b/metadata/md5-cache/net-misc/radvd-2.14
@@ -4,11 +4,11 @@ DESCRIPTION=Linux IPv6 Router Advertisement Daemon
 EAPI=5
 HOMEPAGE=http://v6web.litech.org/radvd/
 IUSE=kernel_FreeBSD selinux test
-KEYWORDS=amd64 arm ~arm64 hppa ~ppc ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 arm ~arm64 hppa ~ppc ~sparc x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.14.tar.gz
 _eclass_exported_funcs=pkg_postinst:readme.gentoo pkg_setup:- src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=873aa8605b16ed476dcab3798da5d3b1
+_md5_=bdf0faeaf37e1dfe947d27ea0a463020
diff --git a/metadata/md5-cache/net-misc/remmina-1.2.0_rc16 b/metadata/md5-cache/net-misc/remmina-1.2.0_rc16
index b65a7a0b3a48..02b2db22880c 100644
--- a/metadata/md5-cache/net-misc/remmina-1.2.0_rc16
+++ b/metadata/md5-cache/net-misc/remmina-1.2.0_rc16
@@ -4,11 +4,11 @@ DESCRIPTION=A GTK+ RDP, VNC, XDMCP and SSH client
 EAPI=6
 HOMEPAGE=http://remmina.org/
 IUSE=ayatana crypt freerdp gnome-keyring nls spice ssh telepathy webkit zeroconf
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 net-libs/libvncserver x11-libs/libxkbfile x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 virtual/freedesktop-icon-theme ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) freerdp? ( >=net-misc/freerdp-2 ) gnome-keyring? ( app-crypt/libsecret ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( net-dns/avahi[gtk3] )
 SLOT=0
 SRC_URI=https://github.com/FreeRDP/Remmina/archive/v1.2.0-rcgit.16.tar.gz -> remmina-1.2.0_rc16.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:cmake-utils src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=df675f42399e664995015f5ed21832ca
+_md5_=3a6fd851adb2ef81cb0599f6c2f2c83c
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2016.12.22 b/metadata/md5-cache/net-misc/youtube-dl-2016.12.22
index 153f05f0c43e..654d689244b0 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2016.12.22
+++ b/metadata/md5-cache/net-misc/youtube-dl-2016.12.22
@@ -4,7 +4,7 @@ DESCRIPTION=Download videos from YouTube.com (and more sites...)
 EAPI=5
 HOMEPAGE=https://rg3.github.com/youtube-dl/
 IUSE=offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=dev-python/setuptools[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=http://youtube-dl.org/downloads/2016.12.22/youtube-dl-2016.12.22.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:- src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=dd1d4407cc8ec5e859fd6651501a06b3
+_md5_=f1bec105bcd007ee9d035166c26dc6e4
diff --git a/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.10 b/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.10
index e5021c987182..dbe288e5bfa1 100644
--- a/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.10
+++ b/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.10
@@ -4,11 +4,11 @@ DESCRIPTION=A GTK+ Gnutella client
 EAPI=6
 HOMEPAGE=http://gtk-gnutella.sourceforge.net/
 IUSE=nls dbus ssl +gtk
-KEYWORDS=amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtk-gnutella/gtk-gnutella-1.1.10.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=b1410ec0dd53326a6db5c0930c755691
+_md5_=5cca0dd0e92e3a25f2b49529b62da798
diff --git a/metadata/md5-cache/sci-biology/seqan-1.4.2-r1 b/metadata/md5-cache/sci-biology/seqan-1.4.2-r1
index 6e1011bdaccb..e23631f5ecb7 100644
--- a/metadata/md5-cache/sci-biology/seqan-1.4.2-r1
+++ b/metadata/md5-cache/sci-biology/seqan-1.4.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=C++ Sequence Analysis Library
 EAPI=6
 HOMEPAGE=http://www.seqan.de/
 IUSE=cpu_flags_x86_sse4_1 test python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD GPL-3
 REQUIRED_USE=python_targets_python2_7 cpu_flags_x86_sse4_1
 SLOT=1.4
 SRC_URI=http://packages.seqan.de/seqan-src/seqan-src-1.4.2.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:python-single-r1 src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4f01466df786f31dd878d1f166854a9f
+_md5_=14b7b2b979dd4f5008d8ba766ce1da8c
diff --git a/metadata/md5-cache/sci-electronics/drawtiming-0.7.1-r1 b/metadata/md5-cache/sci-electronics/drawtiming-0.7.1-r1
index 373993c92fc4..b6e706d84d2c 100644
--- a/metadata/md5-cache/sci-electronics/drawtiming-0.7.1-r1
+++ b/metadata/md5-cache/sci-electronics/drawtiming-0.7.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Command line tool for drawing timing diagrams
 EAPI=5
 HOMEPAGE=http://drawtiming.sourceforge.net/index.html
 IUSE=examples
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-gfx/imagemagick[cxx]
 SLOT=0
 SRC_URI=mirror://sourceforge/drawtiming/drawtiming-0.7.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=9f1e16242057fe88ea6d6dba10426c14
+_md5_=1929116a401bed400f43d98bac19365e
diff --git a/metadata/md5-cache/sci-electronics/linsmith-0.99.30 b/metadata/md5-cache/sci-electronics/linsmith-0.99.30
index ee8ad57a05d4..8997aa5f981a 100644
--- a/metadata/md5-cache/sci-electronics/linsmith-0.99.30
+++ b/metadata/md5-cache/sci-electronics/linsmith-0.99.30
@@ -4,11 +4,11 @@ DESCRIPTION=Smith charting program, mainly designed for educational use
 EAPI=5
 HOMEPAGE=http://www.jcoppens.com/soft/linsmith/index.en.php
 IUSE=doc examples
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui
 SLOT=0
 SRC_URI=mirror://sourceforge/linsmith/linsmith-0.99.30.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=04cc04354549670786f01e6c5594e193
+_md5_=34a94fb74099bc5778848c70eab4a585
diff --git a/metadata/md5-cache/sci-electronics/xnec2c-3.5 b/metadata/md5-cache/sci-electronics/xnec2c-3.5
index 93bf5f5721db..7a8d4fd402dd 100644
--- a/metadata/md5-cache/sci-electronics/xnec2c-3.5
+++ b/metadata/md5-cache/sci-electronics/xnec2c-3.5
@@ -4,11 +4,11 @@ DESCRIPTION=A GTK+ graphical interactive version of nec2c
 EAPI=5
 HOMEPAGE=http://www.qsl.net/5b4az/pages/nec2.html
 IUSE=doc examples
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://www.qsl.net/5b4az/pkg/nec2/xnec2c/xnec2c-3.5.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=0748424afcbbd1e56034d939194a63be
+_md5_=3c8ca3e84e017c327147bb292497e612
diff --git a/metadata/md5-cache/sci-geosciences/qmapshack-1.6.3 b/metadata/md5-cache/sci-geosciences/qmapshack-1.6.3
index df28a36d3b4f..37883a8075a8 100644
--- a/metadata/md5-cache/sci-geosciences/qmapshack-1.6.3
+++ b/metadata/md5-cache/sci-geosciences/qmapshack-1.6.3
@@ -3,11 +3,11 @@ DEPEND=dev-qt/qtwebkit:5 dev-qt/qtscript:5 dev-qt/qtprintsupport:5 dev-qt/qtdbus
 DESCRIPTION=GPS mapping utility
 EAPI=6
 HOMEPAGE=https://bitbucket.org/maproom/qmapshack/wiki/Home
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-qt/qtwebkit:5 dev-qt/qtscript:5 dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 dev-qt/qttest:5 dev-qt/qtnetwork:5[ssl] >=sci-geosciences/routino-3.1.1 sci-libs/gdal sci-libs/proj
 SLOT=0
 SRC_URI=https://bitbucket.org/maproom/qmapshack/downloads/qmapshack-1.6.3.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	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=43af14d9b7a0d7d4f9b00a238a9be9bd
+_md5_=46df9d29c9e2f72fbf67179983044eb9
diff --git a/metadata/md5-cache/sci-geosciences/routino-3.1.1 b/metadata/md5-cache/sci-geosciences/routino-3.1.1
index 6d77dbff27b3..bc61ea7ab629 100644
--- a/metadata/md5-cache/sci-geosciences/routino-3.1.1
+++ b/metadata/md5-cache/sci-geosciences/routino-3.1.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure
 DESCRIPTION=Routing application based on openstreetmap data
 EAPI=6
 HOMEPAGE=http://www.routino.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=AGPL-3+
 SLOT=0
 SRC_URI=http://www.routino.org/download/routino-3.1.1.tgz
 _eclass_exported_funcs=src_configure:- src_compile:-
-_md5_=a3272419d9fb42a723fe533bd3462ff8
+_md5_=d608ff220e8aff45df83c805d9c42b41
diff --git a/metadata/md5-cache/sci-libs/gdal-2.0.2-r3 b/metadata/md5-cache/sci-libs/gdal-2.0.2-r3
index 090a5a64e1ed..65f5076f8e15 100644
--- a/metadata/md5-cache/sci-libs/gdal-2.0.2-r3
+++ b/metadata/md5-cache/sci-libs/gdal-2.0.2-r3
@@ -4,7 +4,7 @@ DESCRIPTION=Translator library for raster geospatial data formats (includes OGR
 EAPI=5
 HOMEPAGE=http://www.gdal.org/
 IUSE=armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python spatialite sqlite threads xls python_targets_python2_7 python_targets_python3_4 elibc_FreeBSD java
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD Info-ZIP MIT
 RDEPEND=dev-libs/expat dev-libs/json-c dev-libs/libpcre dev-libs/libxml2 media-libs/tiff:0= sci-libs/libgeotiff sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3 ) hdf5? ( >=sci-libs/hdf5-1.6.4[szip] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/jasper:= ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) pdf? ( >=app-text/poppler-0.24.3:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sqlite? ( dev-db/sqlite:3 ) spatialite? ( dev-db/spatialite ) xls? ( dev-libs/freexl ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=spatialite? ( sqlite ) python? ( || ( python_targets_python2_7 python_targets_python3_4 ) ) mdb? ( java )
@@ -12,4 +12,4 @@ SLOT=0/2
 SRC_URI=http://download.osgeo.org/gdal/2.0.2/gdal-2.0.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-opt-2 pkg_postinst:- pkg_setup:- src_unpack:perl-module src_prepare:- src_configure:- src_compile:- src_test:perl-module src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=182858a8c8c9be3d8f3a7a9d5bdab45e
+_md5_=9f9a4a783acda36e73a1a8e5c53913e4
diff --git a/metadata/md5-cache/sci-mathematics/gfan-0.5-r1 b/metadata/md5-cache/sci-mathematics/gfan-0.5-r1
index 365446c3e6e5..609bf71eaa7c 100644
--- a/metadata/md5-cache/sci-mathematics/gfan-0.5-r1
+++ b/metadata/md5-cache/sci-mathematics/gfan-0.5-r1
@@ -3,11 +3,11 @@ DEPEND=dev-libs/gmp[cxx] sci-libs/cddlib
 DESCRIPTION=computes Groebner fans and tropical varities
 EAPI=6
 HOMEPAGE=http://www.math.tu-berlin.de/~jensen/software/gfan/gfan.html
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp[cxx] sci-libs/cddlib
 SLOT=0
 SRC_URI=http://www.math.tu-berlin.de/~jensen/software/gfan/gfan0.5.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=a679e8862af27ef782f2e830263b8fa3
+_md5_=9d2cd47a6d85a75b9da0151445cc141b
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.38.1 b/metadata/md5-cache/sci-mathematics/maxima-5.38.1
index 409caf78c4a4..cf0572a9f55c 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.38.1
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.38.1
@@ -4,11 +4,11 @@ DESCRIPTION=Free computer algebra environment based on Macsyma
 EAPI=5
 HOMEPAGE=http://maxima.sourceforge.net/
 IUSE=emacs tk nls unicode X sbcl cmucl gcl ecls clozurecl clisp linguas_de linguas_es linguas_pt linguas_pt_BR
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2 GPL-2+
 RDEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( virtual/emacs virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.38.1.tar.gz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=89abf28795b448b72b19e01c63b5d783
+_md5_=2fcfc378c5407c7513a7c7645d97219d
diff --git a/metadata/md5-cache/sci-mathematics/normaliz-3.1.3 b/metadata/md5-cache/sci-mathematics/normaliz-3.1.3
index 558eb22cee66..c5eb98acdba2 100644
--- a/metadata/md5-cache/sci-mathematics/normaliz-3.1.3
+++ b/metadata/md5-cache/sci-mathematics/normaliz-3.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Tool for computations in affine monoids and more
 EAPI=6
 HOMEPAGE=www.mathematik.uni-osnabrueck.de/normaliz/
 IUSE=doc extras openmp
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/gmp[cxx]
 SLOT=0
 SRC_URI=https://github.com/Normaliz/Normaliz/archive/v3.1.3.tar.gz -> normaliz-3.1.3.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=17893fc912604525ca2aa2df610b2335
+_md5_=adb3bed01faa24fd51ecfe8dc6ce7ccb
diff --git a/metadata/md5-cache/sys-apps/biosdevname-0.7.2 b/metadata/md5-cache/sys-apps/biosdevname-0.7.2
index 3c285f273ae1..81cd4691a3e0 100644
--- a/metadata/md5-cache/sys-apps/biosdevname-0.7.2
+++ b/metadata/md5-cache/sys-apps/biosdevname-0.7.2
@@ -3,11 +3,11 @@ DEPEND=virtual/udev sys-apps/pciutils virtual/pkgconfig
 DESCRIPTION=Sets BIOS-given device names instead of kernel eth* names
 EAPI=5
 HOMEPAGE=http://linux.dell.com/biosdevname/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=virtual/udev
 SLOT=0
 SRC_URI=http://linux.dell.com/biosdevname/biosdevname-0.7.2/biosdevname-0.7.2.tar.gz
 _eclass_exported_funcs=src_prepare:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	73058269b3e70e34e084fa3981282338
-_md5_=ddb173d542611c8a48aafaa5f1a44b65
+_md5_=d1b38a33032cb94141591f52a32d5cb1
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.7 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.7
index a8257d2bebe8..6245d7f3e365 100644
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.7
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.7
@@ -4,7 +4,7 @@ DESCRIPTION=NSS module for name lookups using LDAP
 EAPI=5
 HOMEPAGE=http://arthurdejong.org/nss-pam-ldapd/
 IUSE=debug kerberos +pam sasl test +utils python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sasl? ( dev-libs/cyrus-sasl[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(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pam[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(-)?] utils? ( 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(-)] ) !sys-auth/nss_ldap !sys-auth/pam_ldap
 REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.7.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	s6	1466d3a4bcf73111d8952cd1da2dbe4d	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=f1354a7a77dc0ce1eb61011efb8ec365
+_md5_=b0d07f4f8843d7cf1f954018a136fb2b
diff --git a/metadata/md5-cache/sys-block/fio-2.15 b/metadata/md5-cache/sys-block/fio-2.15
index 65f4474cd49d..a73c8d1be571 100644
--- a/metadata/md5-cache/sys-block/fio-2.15
+++ b/metadata/md5-cache/sys-block/fio-2.15
@@ -4,11 +4,11 @@ DESCRIPTION=Jens Axboe's Flexible IO tester
 EAPI=5
 HOMEPAGE=http://brick.kernel.dk/snaps/
 IUSE=aio glusterfs gnuplot gtk numa rbd rdma static zlib python_targets_python2_7
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=!static? ( aio? ( dev-libs/libaio ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) zlib? ( sys-libs/zlib ) ) gtk? ( x11-libs/gtk+:2 ) gnuplot? ( sci-visualization/gnuplot 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(-)] )
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/fio-2.15.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=077dea73770af5346f2123d4766cdadc
+_md5_=74d0e43c85353dacd9912ecdfe2035f1
diff --git a/metadata/md5-cache/sys-fs/mdadm-3.4 b/metadata/md5-cache/sys-fs/mdadm-3.4
index 2ef842a40026..839b82f97155 100644
--- a/metadata/md5-cache/sys-fs/mdadm-3.4
+++ b/metadata/md5-cache/sys-fs/mdadm-3.4
@@ -4,7 +4,7 @@ DESCRIPTION=A useful tool for running RAID systems - it can be used as a replace
 EAPI=5
 HOMEPAGE=http://neil.brown.name/blog/mdadm
 IUSE=static
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.16
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://kernel/linux/utils/raid/mdadm/mdadm-3.4.tar.xz mirror://debian/pool/main/m/mdadm/mdadm_3.3.4-1.1.debian.tar.xz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_compile:- src_test:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	73058269b3e70e34e084fa3981282338
-_md5_=52eda180f2277bc8ad0e23cbd0032a99
+_md5_=d814243f41f4f423ddea0d2d7a508092
diff --git a/metadata/md5-cache/sys-kernel/dracut-044-r1 b/metadata/md5-cache/sys-kernel/dracut-044-r1
index 35a1679a9866..89e9be46121a 100644
--- a/metadata/md5-cache/sys-kernel/dracut-044-r1
+++ b/metadata/md5-cache/sys-kernel/dracut-044-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Generic initramfs generation tool
 EAPI=5
 HOMEPAGE=https://dracut.wiki.kernel.org
 IUSE=debug selinux systemd
-KEYWORDS=alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/udev systemd? ( >=sys-apps/systemd-199 ) app-arch/cpio >=app-shells/bash-4.0 >sys-apps/kmod-5[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils ) >=sys-apps/util-linux-2.21 debug? ( dev-util/strace ) selinux? ( sys-libs/libselinux sys-libs/libsepol sec-policy/selinux-dracut )
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-044.tar.xz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:linux-info src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9dabea10810af2c44c026d780a668ab3
+_md5_=1350dd327d7cd83073635f4aa45970eb
diff --git a/metadata/md5-cache/sys-kernel/genkernel-next-65 b/metadata/md5-cache/sys-kernel/genkernel-next-65
index 8507c46a642f..4bbdbe114954 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-next-65
+++ b/metadata/md5-cache/sys-kernel/genkernel-next-65
@@ -4,7 +4,7 @@ DESCRIPTION=Gentoo automatic kernel building scripts, reloaded
 EAPI=6
 HOMEPAGE=http://www.gentoo.org
 IUSE=cryptsetup dmraid gpg iscsi mdadm plymouth selinux
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/asciidoc sys-fs/e2fsprogs !sys-fs/eudev[-kmod,modutils] selinux? ( sys-libs/libselinux ) !sys-kernel/genkernel cryptsetup? ( sys-fs/cryptsetup ) dmraid? ( >=sys-fs/dmraid-1.0.0_rc16 ) gpg? ( app-crypt/gnupg ) iscsi? ( sys-block/open-iscsi ) mdadm? ( sys-fs/mdadm ) plymouth? ( sys-boot/plymouth ) app-portage/portage-utils app-arch/cpio >=app-misc/pax-utils-0.6 !<sys-apps/openrc-0.9.9 sys-apps/util-linux sys-block/thin-provisioning-tools sys-fs/lvm2
 RESTRICT=mirror
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/Sabayon/genkernel-next/archive/v65.tar.gz -> genkernel-next-65.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=48bf58a1b734a6aa44b9eed949319a1c
+_md5_=39397b5c4cdc26aef28ade556b050074
diff --git a/metadata/md5-cache/sys-process/nmon-16f b/metadata/md5-cache/sys-process/nmon-16f
index fe35a020fa5f..e1785ceb6fd5 100644
--- a/metadata/md5-cache/sys-process/nmon-16f
+++ b/metadata/md5-cache/sys-process/nmon-16f
@@ -3,11 +3,11 @@ DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
 DESCRIPTION=Nigel's performance MONitor for CPU, memory, network, disks, etc...
 EAPI=6
 HOMEPAGE=http://nmon.sourceforge.net/
-KEYWORDS=amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/nmon/lmon16f.c
 _eclass_exported_funcs=src_unpack:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=990a021227589c6246b16e7d701be9ef
+_md5_=44b2f1f24d9224e10f1b8d6e22351e55
diff --git a/metadata/md5-cache/sys-process/systemd-cron-1.5.4 b/metadata/md5-cache/sys-process/systemd-cron-1.5.4
index 425085a8ba21..15d9afa60894 100644
--- a/metadata/md5-cache/sys-process/systemd-cron-1.5.4
+++ b/metadata/md5-cache/sys-process/systemd-cron-1.5.4
@@ -4,7 +4,7 @@ DESCRIPTION=systemd units to create timers for cron directories and crontab
 EAPI=5
 HOMEPAGE=https://github.com/systemd-cron/systemd-cron/
 IUSE=cron-boot etc-crontab-systemd minutely setgid yearly python_targets_pypy3 python_targets_python3_4 python_single_target_pypy3 python_single_target_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=sys-apps/systemd-217 sys-apps/debianutils !etc-crontab-systemd? ( !sys-process/dcron ) python_single_target_pypy3? ( virtual/pypy3:0= ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_pypy3(+)?,python_single_target_python3_4(+)?] sys-process/cronbase
 REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_4 ) python_single_target_pypy3? ( python_targets_pypy3 ) python_single_target_python3_4? ( python_targets_python3_4 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/systemd-cron/systemd-cron/archive/v1.5.4.tar.gz -> systemd-cron-1.5.4.tar.gz
 _eclass_exported_funcs=pkg_setup:python-single-r1 src_prepare:- src_configure:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=07061efc97a3da5f28472da2a8a39ae8
+_md5_=976443aa3332f5e2bf0c924d5fee635c
diff --git a/metadata/md5-cache/www-apps/icingaweb2-module-pnp4nagios-1.0.1 b/metadata/md5-cache/www-apps/icingaweb2-module-pnp4nagios-1.0.1
index f6de390b7ed6..f35cbb706b3c 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-module-pnp4nagios-1.0.1
+++ b/metadata/md5-cache/www-apps/icingaweb2-module-pnp4nagios-1.0.1
@@ -3,10 +3,10 @@ DEPEND=>=net-analyzer/icinga2-2.1.1 >=www-apps/icingaweb2-2.0.0
 DESCRIPTION=Icinga Web 2 plugin for pnp4nagios
 EAPI=6
 HOMEPAGE=http://www.icinga.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/icinga2-2.1.1 >=www-apps/icingaweb2-2.0.0
 SLOT=0
 SRC_URI=https://codeload.github.com/Icinga/icingaweb2-module-pnp/tar.gz/v1.0.1 -> icingaweb2-module-pnp4nagios-1.0.1.tar.gz
 _eclass_exported_funcs=src_install:-
-_md5_=7eb2924575eca06a7735197bf54b27d9
+_md5_=21f42497f901087935e76514b4fcbb1d
diff --git a/metadata/md5-cache/x11-apps/xman-1.1.4 b/metadata/md5-cache/x11-apps/xman-1.1.4
index 49d6e9938553..c704aaeee010 100644
--- a/metadata/md5-cache/x11-apps/xman-1.1.4
+++ b/metadata/md5-cache/x11-apps/xman-1.1.4
@@ -3,11 +3,11 @@ DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-proto/xproto !<sys-dev
 DESCRIPTION=Manual page display program for the X Window System
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-proto/xproto
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xman-1.1.4.tar.bz2
 _eclass_exported_funcs=pkg_postrm:xorg-2 pkg_postinst:xorg-2 src_unpack:xorg-2 src_prepare:xorg-2 src_configure:xorg-2 src_compile:xorg-2 src_test:autotools-utils src_install:xorg-2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	1639ccc38d3b68fcb9211b7d8d96c02a
-_md5_=4d19046d868a27b9160692d23f835c7c
+_md5_=cd425582214133061e9ef3724cbf3372
diff --git a/metadata/md5-cache/x11-libs/libfm-1.2.4 b/metadata/md5-cache/x11-libs/libfm-1.2.4
index 6be4f6959468..69fa76c0013b 100644
--- a/metadata/md5-cache/x11-libs/libfm-1.2.4
+++ b/metadata/md5-cache/x11-libs/libfm-1.2.4
@@ -4,7 +4,7 @@ DESCRIPTION=A library for file management
 EAPI=5
 HOMEPAGE=http://pcmanfm.sourceforge.net/
 IUSE=+automount debug doc examples exif gtk udisks vala
-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.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-cache-0.3.2:= ~x11-libs/libfm-extra-1.2.4 udisks? ( dev-libs/dbus-glib ) !lxde-base/lxshortcut x11-misc/shared-mime-info automount? ( udisks? ( gnome-base/gvfs[udev,udisks] ) !udisks? ( gnome-base/gvfs[udev] ) ) exif? ( media-libs/libexif )
 REQUIRED_USE=udisks? ( automount ) doc? ( gtk )
@@ -12,4 +12,4 @@ SLOT=0/4.4.0
 SRC_URI=https://github.com/lxde/libfm/archive/1.2.4.tar.gz -> libfm-1.2.4.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vala	ca3f1c504058f5de407febddfae73167
-_md5_=ea753b032beaac3559c8c47eec709639
+_md5_=5a97d3e0d689113c843c824c65b144a2
diff --git a/metadata/md5-cache/x11-libs/libfm-extra-1.2.4 b/metadata/md5-cache/x11-libs/libfm-extra-1.2.4
index f5e9a75686c4..3219a6d42bff 100644
--- a/metadata/md5-cache/x11-libs/libfm-extra-1.2.4
+++ b/metadata/md5-cache/x11-libs/libfm-extra-1.2.4
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/glib-2.18:2 app-arch/xz-utils >=dev-util/intltool-0.40 virtual
 DESCRIPTION=A library for file management
 EAPI=5
 HOMEPAGE=http://pcmanfm.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.18:2
 SLOT=0/4.4.0
 SRC_URI=https://github.com/lxde/libfm/archive/1.2.4.tar.gz -> libfm-1.2.4.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=6f43e58302dcc555c290d6dc447287a5
+_md5_=f047d633c075dce800a111500cf25ea7
diff --git a/metadata/md5-cache/x11-libs/motif-2.3.6 b/metadata/md5-cache/x11-libs/motif-2.3.6
index ff56d8f8780d..de0bcb089040 100644
--- a/metadata/md5-cache/x11-libs/motif-2.3.6
+++ b/metadata/md5-cache/x11-libs/motif-2.3.6
@@ -4,11 +4,11 @@ DESCRIPTION=The Motif user interface component toolkit
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/motif/ http://motif.ics.com/
 IUSE=examples jpeg +motif22-compatibility png static-libs unicode xft 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 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+ MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-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/libXp-1.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] 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(-)?] ) unicode? ( >=virtual/libiconv-0-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(-)?] ) xft? ( >=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(-)?] >=x11-libs/libXft-2.3.1-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
 SRC_URI=mirror://sourceforge/project/motif/Motif%202.3.6%20Source%20Code/motif-2.3.6.tar.gz http://dev.gentoo.org/~ulm/distfiles/motif-2.3.5-patches-1.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=3d08a794c26cd3ef2edff311fcad5a34
+_md5_=8119c54950025be5da64a0f1f619e4cf
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.14_p20161013 b/metadata/md5-cache/x11-misc/x11vnc-0.9.14_p20161013
index 8249971b3526..02de3896a591 100644
--- a/metadata/md5-cache/x11-misc/x11vnc-0.9.14_p20161013
+++ b/metadata/md5-cache/x11-misc/x11vnc-0.9.14_p20161013
@@ -4,11 +4,11 @@ DESCRIPTION=A VNC server for real X displays
 EAPI=6
 HOMEPAGE=https://libvnc.github.io/
 IUSE=crypt fbcon libressl ssl xinerama zeroconf
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libvncserver-0.9.8[ssl?] x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xinerama? ( x11-libs/libXinerama ) zeroconf? ( >=net-dns/avahi-0.6.4 )
 SLOT=0
 SRC_URI=https://github.com/LibVNC/x11vnc/archive/e191071c1f375d04ba8f955ea0a30292a485999e.tar.gz -> x11vnc-0.9.14_p20161013.tar.gz
 _eclass_exported_funcs=src_unpack:vcs-snapshot src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd
-_md5_=3ff94ba66957ceaa137cf294d12bff4b
+_md5_=b8bb2631f819228a12df58f06b47118e
diff --git a/metadata/md5-cache/x11-themes/smplayer-themes-15.12.0 b/metadata/md5-cache/x11-themes/smplayer-themes-15.12.0
index e84661622c7d..7d7daf7cbf6b 100644
--- a/metadata/md5-cache/x11-themes/smplayer-themes-15.12.0
+++ b/metadata/md5-cache/x11-themes/smplayer-themes-15.12.0
@@ -3,11 +3,11 @@ DEPEND=dev-qt/qtcore:4
 DESCRIPTION=Icon themes for smplayer
 EAPI=6
 HOMEPAGE=http://www.smplayer.eu/
-KEYWORDS=amd64 hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 hppa ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=CC-BY-2.5 CC-BY-SA-2.5 CC-BY-SA-3.0 GPL-2 LGPL-3
 RDEPEND=media-video/smplayer
 SLOT=0
 SRC_URI=mirror://sourceforge/smplayer/smplayer-themes-15.12.0.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=261a04b9bf021756dfcfd283b320a2c2
+_md5_=16300c78b5b3e0438f68bf8783a990f1
author	Repository QA checks <repo-qa-checks@gentoo.org>	2016-12-29 11:03:07 +0000
committer	Repository QA checks <repo-qa-checks@gentoo.org>	2016-12-29 11:03:07 +0000
commit	5fa27cc25eef439cb20ab2acf44d1dec83794eca (patch)
tree	8619d00089101a8e794d206415a1e44f268ec706 /metadata/md5-cache
parent	Merge updates from master (diff)
download	gentoo-5fa27cc25eef439cb20ab2acf44d1dec83794eca.tar.gz gentoo-5fa27cc25eef439cb20ab2acf44d1dec83794eca.tar.bz2 gentoo-5fa27cc25eef439cb20ab2acf44d1dec83794eca.zip