2016-06-25 20:22:40 UTC

author: Repository QA checks <repo-qa-checks@gentoo.org> 2016-06-25 20:22:42 +0000
committer: Repository QA checks <repo-qa-checks@gentoo.org> 2016-06-25 20:22:42 +0000
commit: 95c92104ff9df58c58497fb371f8c53610a8be1a (patch)
tree: 1d1089d2314e1ff997501457646be79b4cdc464b /metadata
parent: Merge updates from master (diff)
download: gentoo-95c92104ff9df58c58497fb371f8c53610a8be1a.tar.gz
gentoo-95c92104ff9df58c58497fb371f8c53610a8be1a.tar.bz2
gentoo-95c92104ff9df58c58497fb371f8c53610a8be1a.zip
286 files changed, 571 insertions, 571 deletions
diff --git a/metadata/md5-cache/app-admin/ansible-1.9.6 b/metadata/md5-cache/app-admin/ansible-1.9.6
index e1940b31f6c1..0ab8f5a433a9 100644
--- a/metadata/md5-cache/app-admin/ansible-1.9.6
+++ b/metadata/md5-cache/app-admin/ansible-1.9.6
@@ -4,7 +4,7 @@ DESCRIPTION=Simple model-driven configuration management and command execution f
 EAPI=5
 HOMEPAGE=http://ansible.com/
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~x64-macos
+KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/keyczar[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh 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 )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-1.9.6.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:-
 _eclasses_=distutils-r1	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=eb1df296cd5449eaee004e3a2a52b3b0
+_md5_=29f11f7b9f8bdb04b38544b27e0b2b07
diff --git a/metadata/md5-cache/app-admin/emacs-updater-1.15 b/metadata/md5-cache/app-admin/emacs-updater-1.15
index 24def84de4ce..f5f296d011b6 100644
--- a/metadata/md5-cache/app-admin/emacs-updater-1.15
+++ b/metadata/md5-cache/app-admin/emacs-updater-1.15
@@ -3,10 +3,10 @@ DEPEND=|| ( sys-apps/util-linux app-misc/getopt )
 DESCRIPTION=Rebuild Emacs packages
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-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
+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
 LICENSE=GPL-2+
 RDEPEND=|| ( sys-apps/util-linux app-misc/getopt ) >=app-portage/portage-utils-0.3 virtual/emacs
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-updater-1.15.tar.xz
 _eclass_exported_funcs=src_prepare:- src_install:-
-_md5_=6cac35c3b74e336008e540aff5237e96
+_md5_=d3a65d51f9b689f86760e2503050791a
diff --git a/metadata/md5-cache/app-admin/keepassx-2.0.2 b/metadata/md5-cache/app-admin/keepassx-2.0.2
index 7dad6c22381a..49e5462fa25d 100644
--- a/metadata/md5-cache/app-admin/keepassx-2.0.2
+++ b/metadata/md5-cache/app-admin/keepassx-2.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Qt password manager compatible with its Win32 and Pocket PC versions
 EAPI=6
 HOMEPAGE=http://www.keepassx.org/
 IUSE=test
-KEYWORDS=amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 GPL-3 ) BSD GPL-2 LGPL-2.1 LGPL-3+ CC0-1.0 public-domain || ( LGPL-2.1 GPL-3 )
 RDEPEND=dev-libs/libgcrypt:0= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qttest:4 sys-libs/zlib x11-libs/libX11 x11-libs/libXtst
 SLOT=0
 SRC_URI=https://www.keepassx.org/releases/2.0.2/keepassx-2.0.2.tar.gz
 _eclass_exported_funcs=src_unpack:vcs-snapshot src_prepare:cmake-utils src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c411365743e6bc00adc55dae02fc4e80
+_md5_=d71b2307cddf2fb026c48d8c76e80a01
diff --git a/metadata/md5-cache/app-admin/monit-5.17.1 b/metadata/md5-cache/app-admin/monit-5.17.1
index a39c6f002309..3b1f86640519 100644
--- a/metadata/md5-cache/app-admin/monit-5.17.1
+++ b/metadata/md5-cache/app-admin/monit-5.17.1
@@ -4,11 +4,11 @@ DESCRIPTION=a utility for monitoring and managing daemons or similar programs ru
 EAPI=6
 HOMEPAGE=http://mmonit.com/monit/
 IUSE=libressl pam ssl
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=AGPL-3
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://mmonit.com/monit/dist/monit-5.17.1.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=c9a0e5e9ed496bb48873d6671bbe5e6d
+_md5_=f62a73ac3757f74c13e4adc853f5b148
diff --git a/metadata/md5-cache/app-admin/puppetdb-4.0.2 b/metadata/md5-cache/app-admin/puppetdb-4.0.2
index 723e53ed0699..5de011b29360 100644
--- a/metadata/md5-cache/app-admin/puppetdb-4.0.2
+++ b/metadata/md5-cache/app-admin/puppetdb-4.0.2
@@ -3,11 +3,11 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=PuppetDB collects data generated by Puppet.
 EAPI=5
 HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.7.0
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-4.0.2.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_compile:- src_install:-
 _eclasses_=multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=3a06c58fd68f75f7f6678be9353eb454
+_md5_=3a111b8b90c5cf0ebb714b5ce5bc870e
diff --git a/metadata/md5-cache/app-admin/python-updater-0.14 b/metadata/md5-cache/app-admin/python-updater-0.14
index 230312e23ae0..759b1776dfb0 100644
--- a/metadata/md5-cache/app-admin/python-updater-0.14
+++ b/metadata/md5-cache/app-admin/python-updater-0.14
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile
 DESCRIPTION=Script used to reinstall Python packages after changing active Python versions
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/Python/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions || ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 sys-apps/pkgcore )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/python-updater-0.14.tar.bz2
 _eclass_exported_funcs=src_compile:-
-_md5_=bcc24920f5b6e334563db0fc06a79e5b
+_md5_=24aaf50e35ac33335f147c7e16f7bf82
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.7.3 b/metadata/md5-cache/app-admin/syslog-ng-3.7.3
index 1c7d06bbb916..22008498e34d 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.7.3
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.7.3
@@ -4,7 +4,7 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=5
 HOMEPAGE=http://www.balabit.com/network-security/syslog-ng
 IUSE=amqp caps dbi geoip ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.8.3 ) geoip? ( >=dev-libs/geoip-1.5.0 ) json? ( >=dev-libs/json-c-0.9 ) python? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) redis? ( dev-libs/hiredis ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/eventlog-0.2.12 >=dev-libs/glib-2.10.1:2
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.7.3/syslog-ng-3.7.3.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cc8a98b59e63af14baaf0e5bd7627791
+_md5_=6a6ac8e080c2b419424163dffc26a2b4
diff --git a/metadata/md5-cache/app-admin/testdisk-7.0-r3 b/metadata/md5-cache/app-admin/testdisk-7.0-r3
index 3cd6f0759185..13d4ac1d2425 100644
--- a/metadata/md5-cache/app-admin/testdisk-7.0-r3
+++ b/metadata/md5-cache/app-admin/testdisk-7.0-r3
@@ -4,7 +4,7 @@ DESCRIPTION=Checks and undeletes partitions + PhotoRec, signature based recovery
 EAPI=5
 HOMEPAGE=http://www.cgsecurity.org/wiki/TestDisk
 IUSE=ewf jpeg ntfs reiserfs static qt4
-KEYWORDS=amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2
 RDEPEND=!static? ( static? ( sys-apps/util-linux[static-libs] >=sys-libs/ncurses-5.2[static-libs] jpeg? ( virtual/jpeg:0[static-libs] ) ntfs? ( sys-fs/ntfs3g[static-libs] ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] ) >=sys-fs/e2fsprogs-1.35[static-libs] sys-libs/zlib[static-libs] !arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) ) ) !static? ( sys-apps/util-linux >=sys-libs/ncurses-5.2 jpeg? ( virtual/jpeg:0 ) ntfs? ( sys-fs/ntfs3g ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) >=sys-fs/e2fsprogs-1.35 sys-libs/zlib !arm? ( ewf? ( app-forensics/libewf:= ) ) qt4? ( dev-qt/qtgui:4 ) ) )
 REQUIRED_USE=static? ( !qt4 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://www.cgsecurity.org/testdisk-7.0.tar.bz2
 _eclass_exported_funcs=src_prepare:autotools-utils src_configure:- src_compile:autotools-utils src_test:autotools-utils src_install:autotools-utils
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=2c8d5f385daa7340f334127c939b83ed
+_md5_=d318535f282193e491abb1f5bff3a554
diff --git a/metadata/md5-cache/app-admin/tripwire-2.4.3.1 b/metadata/md5-cache/app-admin/tripwire-2.4.3.1
index 8da3c66d3bc5..eeddf1a7fa23 100644
--- a/metadata/md5-cache/app-admin/tripwire-2.4.3.1
+++ b/metadata/md5-cache/app-admin/tripwire-2.4.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=Open Source File Integrity Checker and IDS
 EAPI=5
 HOMEPAGE=http://www.tripwire.org/
 IUSE=libressl ssl static +tools
-KEYWORDS=amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=tools? ( app-admin/mktwpol )
 RDEPEND=virtual/cron virtual/mta ssl? ( dev-libs/openssl )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/Tripwire/tripwire-open-source/archive/2.4.3.1.tar.gz -> tripwire-2.4.3.1.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=d0f99f51948d153306f0e12a4237aa49
+_md5_=53d8ec36d229bbd7a4d5ef757bc0b7c3
diff --git a/metadata/md5-cache/app-admin/ulogd-2.0.5_p20160205 b/metadata/md5-cache/app-admin/ulogd-2.0.5_p20160205
index e5648b8af9dd..eef12b1db6ab 100644
--- a/metadata/md5-cache/app-admin/ulogd-2.0.5_p20160205
+++ b/metadata/md5-cache/app-admin/ulogd-2.0.5_p20160205
@@ -4,11 +4,11 @@ DESCRIPTION=A userspace logging daemon for netfilter/iptables related logging
 EAPI=5
 HOMEPAGE=https://netfilter.org/projects/ulogd/index.html
 IUSE=dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog
-KEYWORDS=amd64 ~ia64 ~ppc ~x86
+KEYWORDS=amd64 ~ia64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=|| ( net-firewall/iptables net-firewall/nftables ) >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson ) nfacct? ( >=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_acct-1.0.1 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) mysql? ( virtual/mysql ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=https://git.netfilter.org/ulogd2/snapshot/a82d9cfe03679b82ab4d9586c93ad377e9e27149.tar.gz -> ulogd-2.0.5_p20160205.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_unpack:vcs-snapshot src_prepare:- src_configure:- src_compile:- src_test:autotools-utils src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	d062ae4ba2fc40a19c11de2ad89b6616	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=820017260db6da93c1f02f91a295e520
+_md5_=ec891f4d56591bf0d4db54005aeb20dc
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.99 b/metadata/md5-cache/app-antivirus/clamav-0.99
index 94b1b174f684..dc1d81f5ec1f 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.99
+++ b/metadata/md5-cache/app-antivirus/clamav-0.99
@@ -4,11 +4,11 @@ DESCRIPTION=Clam Anti-Virus Scanner
 EAPI=5
 HOMEPAGE=http://www.clamav.net/
 IUSE=bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool >dev-libs/libpcre-6 !!<app-antivirus/clamav-0.99 selinux? ( sec-policy/selinux-clamav )
 SLOT=0
 SRC_URI=mirror://sourceforge/clamav/clamav-0.99.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=5c0b0d582e23ba59a51aaa869873aa79
+_md5_=68ab265c941f19bd02cd56aa8baf9e7a
diff --git a/metadata/md5-cache/app-arch/lrzip-0.621 b/metadata/md5-cache/app-arch/lrzip-0.621
index f1743d7b9fc1..34f23be90d0a 100644
--- a/metadata/md5-cache/app-arch/lrzip-0.621
+++ b/metadata/md5-cache/app-arch/lrzip-0.621
@@ -3,11 +3,11 @@ DEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib x86? ( dev-lang/nasm ) virtual/
 DESCRIPTION=Long Range ZIP or Lzma RZIP optimized for compressing large files
 EAPI=5
 HOMEPAGE=http://ck.kolivas.org/apps/lrzip/README.md
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib
 SLOT=0
 SRC_URI=http://ck.kolivas.org/apps/lrzip/lrzip-0.621.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=41551f5b902b56fe310a9afa7f35244f
+_md5_=ffb5f5c3dd789f45e8c524a4cc3fff7d
diff --git a/metadata/md5-cache/app-arch/lziprecover-1.17 b/metadata/md5-cache/app-arch/lziprecover-1.17
index ec8bbae61322..1a2ec08cff72 100644
--- a/metadata/md5-cache/app-arch/lziprecover-1.17
+++ b/metadata/md5-cache/app-arch/lziprecover-1.17
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure
 DESCRIPTION=Lziprecover is a data recovery tool and decompressor for files in the lzip compressed data format
 EAPI=5
 HOMEPAGE=http://www.nongnu.org/lzip/lziprecover.html
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases-noredirect/lzip/lziprecover/lziprecover-1.17.tar.gz
 _eclass_exported_funcs=src_configure:-
 _eclasses_=multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=cab22f01dcd8e904716dde4f34ffe627
+_md5_=a95a170a8c60cf09da33ca3d128a1a9c
diff --git a/metadata/md5-cache/app-backup/dar-2.4.20 b/metadata/md5-cache/app-backup/dar-2.4.20
index 635067e51016..9927b52f254e 100644
--- a/metadata/md5-cache/app-backup/dar-2.4.20
+++ b/metadata/md5-cache/app-backup/dar-2.4.20
@@ -4,7 +4,7 @@ DESCRIPTION=A full featured backup tool, aimed for disks (floppy,CDR(W),DVDR(W),
 EAPI=6
 HOMEPAGE=http://dar.linux.free.fr/
 IUSE=acl dar32 dar64 doc gcrypt lzo nls static static-libs
-KEYWORDS=amd64 ~ppc ~sparc ~x86 ~amd64-linux
+KEYWORDS=amd64 ~ppc ~sparc x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= ) acl? ( !static? ( sys-apps/attr:= ) ) gcrypt? ( dev-libs/libgcrypt:0= ) lzo? ( !static? ( dev-libs/lzo:= ) ) nls? ( virtual/libintl )
 REQUIRED_USE=?? ( dar32 dar64 )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/dar/dar-2.4.20.tar.gz
 _eclass_exported_funcs=src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=428538f8fdc69cc5a23e3bec961f38e3
+_md5_=96505e24f61d2a4a8ace4af6c17f49bf
diff --git a/metadata/md5-cache/app-benchmarks/bonnie++-1.97-r1 b/metadata/md5-cache/app-benchmarks/bonnie++-1.97-r1
index ba0d3aaab76d..ee2f8ed1df4b 100644
--- a/metadata/md5-cache/app-benchmarks/bonnie++-1.97-r1
+++ b/metadata/md5-cache/app-benchmarks/bonnie++-1.97-r1
@@ -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.tgz
 _eclass_exported_funcs=src_configure:- src_install:-
-_md5_=663e323531a74d97e172819c5a6a6af0
+_md5_=dd6ceaccbb98d7986aeb32f3e4434441
diff --git a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r6 b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r6
index 2bf4ca42930d..c0f972a279fb 100644
--- a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r6
+++ b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r6
@@ -4,11 +4,11 @@ DESCRIPTION=Load test and measure performance on HTTP/FTP services and databases
 EAPI=5
 HOMEPAGE=http://jmeter.apache.org/
 IUSE=beanshell elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=virtual/jre:1.7 beanshell? ( dev-java/bsh:0 ) dev-java/bsf:2.3 dev-java/junit:0 dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/jmeter/source/jakarta-jmeter-2.0.1_src.tgz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2cdffd2a69d04f4f47a02d7e4b77d311
+_md5_=138b964c0f6a7ba95068a3900b096a9a
diff --git a/metadata/md5-cache/app-cdr/cdlabelgen-4.1.0 b/metadata/md5-cache/app-cdr/cdlabelgen-4.1.0
index c8266b5a5818..0ca9d196b379 100644
--- a/metadata/md5-cache/app-cdr/cdlabelgen-4.1.0
+++ b/metadata/md5-cache/app-cdr/cdlabelgen-4.1.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=CD cover, tray card and envelope generator
 EAPI=2
 HOMEPAGE=http://www.aczoom.com/tools/cdinsert
-KEYWORDS=amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=aczoom
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=http://www.aczoom.com/pub/tools/cdlabelgen-4.1.0.tgz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=069c330f7ab557ce649ed5b0866ee8d9
+_md5_=30514887f8870a5cf1835954803c81b5
diff --git a/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha06 b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha06
index 1af3171c9837..54c3bd93cacc 100644
--- a/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha06
+++ b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha06
@@ -4,11 +4,11 @@ DESCRIPTION=A set of tools for CD/DVD reading and recording, including cdrecord
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/cdrtools/
 IUSE=acl caps nls unicode +filecaps
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1 CDDL-Schily
 RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit
 SLOT=0
 SRC_URI=mirror://sourceforge/cdrtools/alpha/cdrtools-3.02a06.tar.bz2
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnuconfig	3920de1188fc7bfee873515453ed1d10	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=fdcf5a2bc00db72231d66aec2ed5c0a7
+_md5_=aff2d055543c710d3fc843c75b3c581d
diff --git a/metadata/md5-cache/app-cdr/gtkcdlabel-1.14-r1 b/metadata/md5-cache/app-cdr/gtkcdlabel-1.14-r1
index 88ee9f99e206..4a19c537498c 100644
--- a/metadata/md5-cache/app-cdr/gtkcdlabel-1.14-r1
+++ b/metadata/md5-cache/app-cdr/gtkcdlabel-1.14-r1
@@ -4,7 +4,7 @@ DESCRIPTION=a GUI frontend to cdlabelgen which is a program that can generate a
 EAPI=5
 HOMEPAGE=http://gtkcdlabel.sourceforge.net
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=app-cdr/cdlabelgen-4 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-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=mirror://sourceforge/gtkcdlabel/gtkcdlabel-1.14.tar.bz2
 _eclass_exported_funcs=pkg_setup:python-single-r1 src_prepare:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=f1544debd64f87be40e0216a422f6184
+_md5_=7a6a8ec3ce7a24b3f76f3c661ee030df
diff --git a/metadata/md5-cache/app-crypt/stoken-0.90 b/metadata/md5-cache/app-crypt/stoken-0.90
index dfd3fd00e27e..02b83f4fa1fe 100644
--- a/metadata/md5-cache/app-crypt/stoken-0.90
+++ b/metadata/md5-cache/app-crypt/stoken-0.90
@@ -4,11 +4,11 @@ DESCRIPTION=Software Token for Linux/UNIX
 EAPI=6
 HOMEPAGE=https://github.com/cernekee/stoken
 IUSE=gtk
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=|| ( dev-libs/nettle dev-libs/libtomcrypt ) gtk? ( >=x11-libs/gtk+-3.12:3 )
 SLOT=0
 SRC_URI=https://github.com/cernekee/stoken/archive/v0.90.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=43629c3feb6aca20da507b438cefb1e5
+_md5_=514b23fcc8fd67569f47b484d574884c
diff --git a/metadata/md5-cache/app-crypt/xca-1.3.2 b/metadata/md5-cache/app-crypt/xca-1.3.2
index 2cd4369913fc..617bff3fcef3 100644
--- a/metadata/md5-cache/app-crypt/xca-1.3.2
+++ b/metadata/md5-cache/app-crypt/xca-1.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=A GUI to OpenSSL, RSA public keys, certificates, signing requests an
 EAPI=5
 HOMEPAGE=http://xca.sourceforge.net
 IUSE=bindist
-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=BSD
 RDEPEND=>=dev-libs/openssl-0.9.8:*[bindist=] dev-qt/qtgui:4
 SLOT=0
 SRC_URI=mirror://sourceforge/xca/xca-1.3.2.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=a1149f4f1e543103f3ba0d12f1afdbd3
+_md5_=952bbfc3b65cabf7add378b31ecfe348
diff --git a/metadata/md5-cache/app-emacs/ess-15.09.2 b/metadata/md5-cache/app-emacs/ess-15.09.2
index aca673599a6f..4c488985f1b0 100644
--- a/metadata/md5-cache/app-emacs/ess-15.09.2
+++ b/metadata/md5-cache/app-emacs/ess-15.09.2
@@ -3,11 +3,11 @@ DEPEND=app-text/texi2html virtual/latex-base >=virtual/emacs-23
 DESCRIPTION=Emacs Speaks Statistics
 EAPI=6
 HOMEPAGE=http://ess.r-project.org/
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2+ GPL-3+ Texinfo-manual
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://ess.r-project.org/downloads/ess/ess-15.09-2.tgz
 _eclass_exported_funcs=pkg_postrm:elisp pkg_postinst:elisp pkg_setup:elisp src_unpack:elisp src_prepare:elisp src_configure:elisp src_compile:- src_install:-
 _eclasses_=elisp	7e36316fe822639d5a29fa10d5529eb9	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7
-_md5_=4cdad2496d3b2b256a486e9ab33bc298
+_md5_=06d2fc876ab70a8bfcfee973222b9df7
diff --git a/metadata/md5-cache/app-emulation/free42-1.5.7 b/metadata/md5-cache/app-emulation/free42-1.5.7
index 33e4d6066752..b0e6c75a11df 100644
--- a/metadata/md5-cache/app-emulation/free42-1.5.7
+++ b/metadata/md5-cache/app-emulation/free42-1.5.7
@@ -4,11 +4,11 @@ DESCRIPTION=An HP-42S Calculator Simulator
 EAPI=5
 HOMEPAGE=http://thomasokken.com/free42/
 IUSE=alsa
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib ) x11-libs/libX11 x11-libs/libXmu
 SLOT=0
 SRC_URI=mirror://gentoo/free42-1.5.7.tgz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=a17e37ebb356a0ad0e597d29c358c6af
+_md5_=825e9f01a55cdacd69a24a90b77814b2
diff --git a/metadata/md5-cache/app-emulation/wine-1.8.2 b/metadata/md5-cache/app-emulation/wine-1.8.2
index dfd5b7d52b42..7f04eb4743ee 100644
--- a/metadata/md5-cache/app-emulation/wine-1.8.2
+++ b/metadata/md5-cache/app-emulation/wine-1.8.2
@@ -4,7 +4,7 @@ DESCRIPTION=Free implementation of Windows(tm) on Unix
 EAPI=6
 HOMEPAGE=http://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW 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 test
-KEYWORDS=-* amd64 ~x86 ~x86-fbsd
+KEYWORDS=-* amd64 x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=truetype? ( >=media-libs/freetype-2.0.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(-)?] ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2: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(-)?] ) udisks? ( sys-apps/dbus[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(-)?] ) fontconfig? ( media-libs/fontconfig:=[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(-)?] ) gphoto2? ( media-libs/libgphoto2:=[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(-)?] ) openal? ( media-libs/openal:=[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(-)?] ) gstreamer? ( media-libs/gstreamer:1.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(-)?] media-plugins/gst-plugins-meta:1.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(-)?] ) X? ( x11-libs/libXcursor[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[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/libXrandr[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/libXi[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/libXxf86vm[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(-)?] ) xinerama? ( x11-libs/libXinerama[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(-)?] ) alsa? ( media-libs/alsa-lib[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(-)?] ) cups? ( net-print/cups:=[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(-)?] ) opencl? ( virtual/opencl[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(-)?] ) opengl? ( virtual/glu[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/opengl[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(-)?] ) gsm? ( media-sound/gsm:=[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=[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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) mp3? ( >=media-sound/mpg123-1.5.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(-)?] ) netapi? ( net-fs/samba[netapi(+),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(-)?] ) nls? ( sys-devel/gettext[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(-)?] ) odbc? ( dev-db/unixODBC:=[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(-)?] ) osmesa? ( media-libs/mesa[osmesa,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(-)?] ) pcap? ( net-libs/libpcap[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(-)?] ) pulseaudio? ( media-sound/pulseaudio[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(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[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(-)?] ) scanner? ( media-gfx/sane-backends:=[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(-)?] ) ssl? ( net-libs/gnutls:=[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: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(-)?] ) v4l? ( media-libs/libv4l[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(-)?] ) vaapi? ( x11-libs/libva[X,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(-)?] ) xcomposite? ( x11-libs/libXcomposite[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-baselibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-db-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-medialibs-20140508-r6 !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-opengl-20140508-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-sdl-20140508-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-soundlibs-20140508 !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-xlibs-20140508 ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) s3tc? ( >=media-libs/libtxc_dxtn-1.0.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(-)?] ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) pipelight? ( staging ) s3tc? ( staging ) vaapi? ( staging ) osmesa? ( opengl )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=https://dl.winehq.org/wine/source/1.8/wine-1.8.2.tar.bz2 gecko? ( abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/2.40/wine_gecko-2.40-x86.msi ) abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/2.40/wine_gecko-2.40-x86_64.msi ) ) mono? ( https://dl.winehq.org/wine/wine-mono/4.5.6/wine-mono-4.5.6.msi ) https://dev.gentoo.org/~np-hardass/distfiles/wine/wine-1.8-gstreamer-1.0.patch.bz2 https://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2015.03.07.tar.bz2 staging? ( https://github.com/wine-compholio/wine-staging/archive/v1.8.2-unofficial.tar.gz -> wine-staging-1.8.2.tar.gz )
 _eclass_exported_funcs=pkg_pretend:- pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:- src_unpack:- src_prepare:- src_configure:- src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	l10n	e26ea0642846685782f1813642e7ff0f	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0aab9606fe488d80719f0321f09d2b51
+_md5_=adbfe31068c696249adef5c82f836c8e
diff --git a/metadata/md5-cache/app-eselect/eselect-python-20140125-r1 b/metadata/md5-cache/app-eselect/eselect-python-20140125-r1
index 8c7b385da6c3..f29c516cf1de 100644
--- a/metadata/md5-cache/app-eselect/eselect-python-20140125-r1
+++ b/metadata/md5-cache/app-eselect/eselect-python-20140125-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Eselect module for management of multiple Python versions
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/Python/
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-python-20140125.tar.bz2 https://dev.gentoo.org/~floppym/dist/eselect-python-20140125.tar.bz2
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=80ee669fcea30e48b4a6aec764fb3bcd
+_md5_=797550cda03664e6c801632e32ae0cb2
diff --git a/metadata/md5-cache/app-i18n/scim-hangul-0.4.0 b/metadata/md5-cache/app-i18n/scim-hangul-0.4.0
index ef3df47916c7..effc22877a02 100644
--- a/metadata/md5-cache/app-i18n/scim-hangul-0.4.0
+++ b/metadata/md5-cache/app-i18n/scim-hangul-0.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Hangul IMEngine for SCIM ported from imhangul
 EAPI=5
 HOMEPAGE=http://www.scim-im.org/
 IUSE=nls
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 ) >=app-i18n/libhangul-0.0.4 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-hangul-0.4.0.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:autotools-utils src_configure:- src_compile:autotools-utils src_test:autotools-utils src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=97313abb48855bb0ef43ad79624ae2cf
+_md5_=5daa95b07bb743ab69945fa6e347bbd7
diff --git a/metadata/md5-cache/app-i18n/tomoe-0.6.0-r2 b/metadata/md5-cache/app-i18n/tomoe-0.6.0-r2
index eb82de34e44d..e66dfab7dc03 100644
--- a/metadata/md5-cache/app-i18n/tomoe-0.6.0-r2
+++ b/metadata/md5-cache/app-i18n/tomoe-0.6.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Japanese handwriting recognition engine
 EAPI=5
 HOMEPAGE=http://tomoe.sourceforge.jp/
 IUSE=doc hyperestraier mysql ruby python static-libs subversion python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.4 ruby? ( dev-ruby/ruby-glib2 ) hyperestraier? ( app-text/hyperestraier ) subversion? ( >=dev-libs/apr-1 dev-vcs/subversion ) mysql? ( dev-db/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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-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=mirror://sourceforge/tomoe/tomoe-0.6.0.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=aff94cd212ffd0e48b7cedde8804529b
+_md5_=fe205c3e84788b79aa3e5e7e18a7bf0b
diff --git a/metadata/md5-cache/app-misc/media-player-info-22 b/metadata/md5-cache/app-misc/media-player-info-22
index 0a2c4f53cd52..533b0121d028 100644
--- a/metadata/md5-cache/app-misc/media-player-info-22
+++ b/metadata/md5-cache/app-misc/media-player-info-22
@@ -3,7 +3,7 @@ DEPEND=>=virtual/udev-208 || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lan
 DESCRIPTION=A repository of data files describing media player capabilities
 EAPI=5
 HOMEPAGE=https://cgit.freedesktop.org/media-player-info/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
 LICENSE=BSD
 RDEPEND=>=virtual/udev-208
 RESTRICT=binchecks strip
@@ -11,4 +11,4 @@ SLOT=0
 SRC_URI=https://www.freedesktop.org/software/media-player-info/media-player-info-22.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:python-any-r1
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=389a2fb301027c9b38c510573f07035f
+_md5_=9cd3a90b0d738cf1b915b4fd3abbf1d6
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.1.6 b/metadata/md5-cache/app-misc/pax-utils-1.1.6
index 1bf10415a2a6..fa2eb6074d06 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.1.6
+++ b/metadata/md5-cache/app-misc/pax-utils-1.1.6
@@ -4,11 +4,11 @@ DESCRIPTION=ELF related utils for ELF 32/64 binaries that can check files for se
 EAPI=4
 HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
 IUSE=caps debug python seccomp
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( dev-python/pyelftools ) seccomp? ( sys-libs/libseccomp )
 SLOT=0
 SRC_URI=mirror://gentoo/pax-utils-1.1.6.tar.xz http://dev.gentoo.org/~solar/pax/pax-utils-1.1.6.tar.xz http://dev.gentoo.org/~vapier/dist/pax-utils-1.1.6.tar.xz
 _eclass_exported_funcs=src_unpack:unpacker src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=09d11b40205b4d59bf029efe5f4389ed
+_md5_=7553aa22dc12aada3c2cf692fec88771
diff --git a/metadata/md5-cache/app-misc/rox-filer-2.11 b/metadata/md5-cache/app-misc/rox-filer-2.11
index 29b51ec970ef..3d254fa6f284 100644
--- a/metadata/md5-cache/app-misc/rox-filer-2.11
+++ b/metadata/md5-cache/app-misc/rox-filer-2.11
@@ -4,11 +4,11 @@ DESCRIPTION=ROX-Filer a drag and drop spatial file manager
 EAPI=5
 HOMEPAGE=http://rox.sourceforge.net/desktop
 IUSE=test
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-lang/perl dev-libs/libxml2:2 gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-misc/shared-mime-info
 SLOT=0
 SRC_URI=mirror://sourceforge/rox/rox-filer-2.11.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=f53912c06d9111f7b149254cbd00864e
+_md5_=ec96554ac360073add74b2b02e0d3ed7
diff --git a/metadata/md5-cache/app-misc/vifm-0.8.1a b/metadata/md5-cache/app-misc/vifm-0.8.1a
index 32cfdf01e047..3fc04adb70c5 100644
--- a/metadata/md5-cache/app-misc/vifm-0.8.1a
+++ b/metadata/md5-cache/app-misc/vifm-0.8.1a
@@ -4,11 +4,11 @@ DESCRIPTION=Console file manager with vi(m)-like keybindings
 EAPI=5
 HOMEPAGE=http://vifm.info/
 IUSE=X developer +extended-keys gtk +magic vim vim-syntax
-KEYWORDS=amd64 ~ppc ~s390 ~x86
+KEYWORDS=amd64 ~ppc ~s390 x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.9-r3:0 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 ) vim? ( || ( app-editors/vim app-editors/gvim ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/vifm/vifm-0.8.1a.tar.bz2
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf
-_md5_=5271c0d364424c7597d39e020630fcb9
+_md5_=6f3b69b3454af6dfe540c9add92f15f4
diff --git a/metadata/md5-cache/app-office/scribus-1.4.6 b/metadata/md5-cache/app-office/scribus-1.4.6
index 599945b71941..5d3537e0a65f 100644
--- a/metadata/md5-cache/app-office/scribus-1.4.6
+++ b/metadata/md5-cache/app-office/scribus-1.4.6
@@ -4,7 +4,7 @@ DESCRIPTION=Desktop publishing (DTP) and layout program
 EAPI=5
 HOMEPAGE=http://www.scribus.net/
 IUSE=cairo debug examples hunspell +minimal +pdf scripts templates tk linguas_af linguas_ar linguas_bg linguas_br linguas_ca linguas_cs_CZ linguas_cy linguas_da_DK linguas_de_1901 linguas_de_CH linguas_de linguas_el linguas_en_AU linguas_en_GB linguas_en_US linguas_eo linguas_es_ES linguas_et linguas_eu linguas_fi linguas_fr linguas_gl linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_lt_LT linguas_nb_NO linguas_nl linguas_pl_PL linguas_pt_BR linguas_pt linguas_ru linguas_sa linguas_sk_SK linguas_sl linguas_sq linguas_sr linguas_sv linguas_th_TH linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW python_targets_python2_7
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[tk?] >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-libs/boost dev-libs/hyphen dev-libs/libxml2 dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= cairo? ( x11-libs/cairo[X,svg] ) !cairo? ( media-libs/libart_lgpl ) hunspell? ( app-text/hunspell ) pdf? ( app-text/podofo ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) app-text/ghostscript-gpl
 REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/scribus/1.4.6/scribus-1.4.6.tar.xz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:python-single-r1 src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=98afd3d3701f6fda4271970ee8ffbb82
+_md5_=698a55ada70be52f23a1d65c44bb9b89
diff --git a/metadata/md5-cache/app-pda/gtkpod-2.1.5 b/metadata/md5-cache/app-pda/gtkpod-2.1.5
index 57f425fd0db6..4afd8e9b41f5 100644
--- a/metadata/md5-cache/app-pda/gtkpod-2.1.5
+++ b/metadata/md5-cache/app-pda/gtkpod-2.1.5
@@ -4,7 +4,7 @@ DESCRIPTION=A graphical user interface to the Apple productline
 EAPI=5
 HOMEPAGE=http://www.gtkpod.org/
 IUSE=aac clutter curl cdr flac gstreamer mp3 vorbis
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=dev-libs/gdl-3.6:3 >=dev-libs/glib-2.31:2 >=dev-libs/libxml2-2.7.7:2 >=dev-util/anjuta-3.6 >=media-libs/libgpod-0.8.2:= >=media-libs/libid3tag-0.15 >=x11-libs/gtk+-3.0.8:3 aac? ( media-libs/faad2 ) clutter? ( >=media-libs/clutter-gtk-1.2:1.0 ) curl? ( >=net-misc/curl-7.10 ) flac? ( media-libs/flac ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 cdr? ( >=app-cdr/brasero-3 >=media-libs/libdiscid-0.2.2 media-libs/musicbrainz:5 ) ) mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis media-sound/vorbis-tools ) gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
 REQUIRED_USE=cdr? ( gstreamer )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/gtkpod/gtkpod-2.1.5.tar.gz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_unpack:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5f2e5c632fd39407c8db1c0c2ad227bb
+_md5_=8424663e2944d40220b97ba6cf8cf74e
diff --git a/metadata/md5-cache/app-portage/eix-0.31.7-r1 b/metadata/md5-cache/app-portage/eix-0.31.7-r1
index 26b3932fad64..ec70341a8eac 100644
--- a/metadata/md5-cache/app-portage/eix-0.31.7-r1
+++ b/metadata/md5-cache/app-portage/eix-0.31.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlay
 EAPI=6
 HOMEPAGE=https://github.com/vaeth/eix/
 IUSE=debug +dep doc nls optimization +required-use security strong-optimization strong-security sqlite swap-remote tools linguas_de linguas_ru
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-shells/push
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.31.7/eix-0.31.7.tar.xz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	l10n	e26ea0642846685782f1813642e7ff0f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=49eec92e3eec107119554d5fcdd1851c
+_md5_=5cdc404c00123dff9aadb0e735bb78e9
diff --git a/metadata/md5-cache/app-portage/euscan-0.1.1-r1 b/metadata/md5-cache/app-portage/euscan-0.1.1-r1
index 3067037bccaa..221243cf7a4f 100644
--- a/metadata/md5-cache/app-portage/euscan-0.1.1-r1
+++ b/metadata/md5-cache/app-portage/euscan-0.1.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Ebuild upstream scan utility
 EAPI=5
 HOMEPAGE=http://euscan.iksaif.net
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-portage/gentoolkit-0.2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/beautifulsoup:python-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=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://dev.gentoo.org/~hwoarang/distfiles/euscan-0.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	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=82668f40a546977e77e98c9b0cc6abcd
+_md5_=1f868071f117c0f5c660938ec6720103
diff --git a/metadata/md5-cache/app-shells/fish-2.2.0 b/metadata/md5-cache/app-shells/fish-2.2.0
index cd58de39e1ca..73ce39f9a860 100644
--- a/metadata/md5-cache/app-shells/fish-2.2.0
+++ b/metadata/md5-cache/app-shells/fish-2.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=fish is the Friendly Interactive SHell
 EAPI=5
 HOMEPAGE=http://fishshell.com/
 IUSE=X
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses sys-devel/bc sys-devel/gettext X? ( x11-misc/xsel )
 SLOT=0
 SRC_URI=http://fishshell.com/files/2.2.0/fish-2.2.0.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_unpack:base src_prepare:base src_configure:- src_compile:base src_test:- src_install:base
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=9ab12fdbbdf56b87a5a8a6b6c8e1d414
+_md5_=cfda3605c16a01d7d7b84f42c433c780
diff --git a/metadata/md5-cache/app-shells/ksh-93.20140625 b/metadata/md5-cache/app-shells/ksh-93.20140625
index 77a535a85683..e40ecb4dd7a3 100644
--- a/metadata/md5-cache/app-shells/ksh-93.20140625
+++ b/metadata/md5-cache/app-shells/ksh-93.20140625
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=The Original Korn Shell, 1993 revision (ksh93)
 EAPI=5
 HOMEPAGE=http://www.kornshell.com/
-KEYWORDS=alpha amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=CPL-1.0 EPL-1.0
 RDEPEND=!app-shells/pdksh
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/distfiles/INIT.2014-06-25.tgz https://dev.gentoo.org/~floppym/distfiles/ast-base.2014-06-25.tgz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=7cb851537365f1654bfa2422c731a5b4
+_md5_=953c5ef0665bb8fc1fee49877e2ce02e
diff --git a/metadata/md5-cache/app-text/apvlv-0.1.5-r1 b/metadata/md5-cache/app-text/apvlv-0.1.5-r1
index b1c4e35a9ff7..db5a2549754a 100644
--- a/metadata/md5-cache/app-text/apvlv-0.1.5-r1
+++ b/metadata/md5-cache/app-text/apvlv-0.1.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Alf's PDF Viewer Like Vim
 EAPI=5
 HOMEPAGE=https://naihe2010.github.com/apvlv/
 IUSE=debug djvu
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/poppler-0.18:=[cairo,xpdf-headers(+)] dev-libs/glib:2 x11-libs/gtk+:3 djvu? ( app-text/djvu:= )
 SLOT=0
 SRC_URI=https://github.com/naihe2010/apvlv/archive/v0.1.5.tar.gz -> apvlv-0.1.5.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=dcaec2bd66f44e371def65d3d30202d6
+_md5_=ecf27283bf2035a9a6317af7d214930b
diff --git a/metadata/md5-cache/app-text/asciidoc-8.6.9-r2 b/metadata/md5-cache/app-text/asciidoc-8.6.9-r2
index d9898182810b..fa30c9421f9b 100644
--- a/metadata/md5-cache/app-text/asciidoc-8.6.9-r2
+++ b/metadata/md5-cache/app-text/asciidoc-8.6.9-r2
@@ -4,7 +4,7 @@ DESCRIPTION=AsciiDoc is a plain text human readable/writable document format
 EAPI=5
 HOMEPAGE=http://asciidoc.org/
 IUSE=examples graphviz highlight test python_targets_pypy python_targets_python2_7 python_single_target_pypy python_single_target_python2_7
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt graphviz? ( media-gfx/graphviz ) app-text/docbook-xml-dtd:4.5 highlight? ( || ( dev-util/source-highlight dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] app-text/highlight ) ) python_single_target_pypy? ( virtual/pypy:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?]
 REQUIRED_USE=^^ ( python_single_target_pypy python_single_target_python2_7 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/project/asciidoc/asciidoc/8.6.9/asciidoc-8.6.9.tar.gz
 _eclass_exported_funcs=pkg_postinst:readme.gentoo pkg_setup:python-single-r1 src_prepare:- src_configure:- src_test:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=59100d044b52ae64d8f256b2bd1186c3
+_md5_=09d4afe05ae5914f8b5dcb1fd486cfe2
diff --git a/metadata/md5-cache/app-text/jabref-bin-3.2 b/metadata/md5-cache/app-text/jabref-bin-3.2
index c85e3f2cb1f5..fa20fd1559f6 100644
--- a/metadata/md5-cache/app-text/jabref-bin-3.2
+++ b/metadata/md5-cache/app-text/jabref-bin-3.2
@@ -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 >=virtual/jdk-1.8 ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-3.2.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	792f83d5ec9536cb5ccef375469d8bde	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a166d03ee1e0cd8a9342a64b281cf61e
+_md5_=db2a72f12df9641ce6821a5f175e0a03
diff --git a/metadata/md5-cache/app-text/libebook-0.1.2-r1 b/metadata/md5-cache/app-text/libebook-0.1.2-r1
index ad149e74ce82..15fe9033c117 100644
--- a/metadata/md5-cache/app-text/libebook-0.1.2-r1
+++ b/metadata/md5-cache/app-text/libebook-0.1.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Library parsing various ebook formats
 EAPI=6
 HOMEPAGE=http://www.sourceforge.net/projects/libebook/
 IUSE=doc test
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/libebook/libe-book-0.1.2.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=b684943a85a2f49e633a7da61467d8ab
+_md5_=21839a4232eff1c15dd1bcec8edb505d
diff --git a/metadata/md5-cache/app-text/po4a-0.45-r3 b/metadata/md5-cache/app-text/po4a-0.45-r3
index f7f3fde9e638..6b0e694709f8 100644
--- a/metadata/md5-cache/app-text/po4a-0.45-r3
+++ b/metadata/md5-cache/app-text/po4a-0.45-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Tools for helping translation of documentation
 EAPI=5
 HOMEPAGE=http://po4a.alioth.debian.org
 IUSE=test linguas_af linguas_ca linguas_cs linguas_da linguas_de linguas_eo linguas_es linguas_et linguas_eu linguas_fr linguas_hr linguas_id linguas_it linguas_ja linguas_kn linguas_ko linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_pt linguas_ru linguas_sl linguas_sv linguas_uk linguas_vi linguas_zh_CN linguas_zh_HK
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-perl/SGMLSpm >=sys-devel/gettext-0.13 app-text/openjade dev-libs/libxslt dev-perl/Locale-gettext dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-lang/perl:=[-build(-)] dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/po4a/po4a_0.45.orig.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	792f83d5ec9536cb5ccef375469d8bde	l10n	e26ea0642846685782f1813642e7ff0f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-app	11f61997f1d4923276dd72a750617c7d	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=7d34a71cc3baaae21059493f9bfe937e
+_md5_=9c083789991c02a915b6a6440b218e18
diff --git a/metadata/md5-cache/app-text/sdcv-0.5.0_beta2 b/metadata/md5-cache/app-text/sdcv-0.5.0_beta2
index 425538f110df..222db9e1dffb 100644
--- a/metadata/md5-cache/app-text/sdcv-0.5.0_beta2
+++ b/metadata/md5-cache/app-text/sdcv-0.5.0_beta2
@@ -4,11 +4,11 @@ DESCRIPTION=Console version of Stardict program
 EAPI=5
 HOMEPAGE=http://sdcv.sourceforge.net
 IUSE=nls
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib sys-libs/readline:= >=dev-libs/glib-2.6.1
 SLOT=0
 SRC_URI=mirror://sourceforge/sdcv/sdcv-0.5.0-beta2-Source.tar.bz2
 _eclass_exported_funcs=src_prepare:cmake-utils src_configure:- src_compile:- src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=16ed95561b9ed11bc4ea1d3aa98bd79e
+_md5_=ae9e1f784fc77d5e73a20879e21cb56e
diff --git a/metadata/md5-cache/app-text/txt2tags-2.6-r1 b/metadata/md5-cache/app-text/txt2tags-2.6-r1
index 81861219215d..6768ec06beaf 100644
--- a/metadata/md5-cache/app-text/txt2tags-2.6-r1
+++ b/metadata/md5-cache/app-text/txt2tags-2.6-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A tool for generating marked up documents (HTML, SGML, ...) from a p
 EAPI=5
 HOMEPAGE=http://txt2tags.org/
 IUSE=emacs tk vim-syntax python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[tk?] >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] tk? ( dev-lang/tk ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) emacs? ( virtual/emacs )
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://txt2tags.googlecode.com/files/txt2tags-2.6.tgz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:python-single-r1 src_compile:- src_install:-
 _eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=9878cf605685a927409fe7e7c4680d7c
+_md5_=78e5e7a18551765222823781313fe73f
diff --git a/metadata/md5-cache/app-text/xchm-1.23-r1 b/metadata/md5-cache/app-text/xchm-1.23-r1
index 1ef8b0fff2d8..3e12579ab96f 100644
--- a/metadata/md5-cache/app-text/xchm-1.23-r1
+++ b/metadata/md5-cache/app-text/xchm-1.23-r1
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/chmlib-0.36 x11-libs/wxGTK:3.0[X]
 DESCRIPTION=Utility for viewing Compiled HTML Help (CHM) files
 EAPI=5
 HOMEPAGE=http://xchm.sourceforge.net/
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/chmlib-0.36 x11-libs/wxGTK:3.0[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/xchm/xchm-1.23.tar.gz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
-_md5_=c7a26230d082dd0044e3078ca255451a
+_md5_=99b743784e71b3e43300ad83e24a7ed0
diff --git a/metadata/md5-cache/dev-cpp/asio-1.4.8-r1 b/metadata/md5-cache/dev-cpp/asio-1.4.8-r1
index d469de689cd0..23764f5904b6 100644
--- a/metadata/md5-cache/dev-cpp/asio-1.4.8-r1
+++ b/metadata/md5-cache/dev-cpp/asio-1.4.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Asynchronous Network Library
 EAPI=4
 HOMEPAGE=http://asio.sourceforge.net/
 IUSE=doc examples ssl test
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=Boost-1.0
 RDEPEND=ssl? ( dev-libs/openssl ) >=dev-libs/boost-1.35.0
 SLOT=0
 SRC_URI=mirror://sourceforge/asio/asio-1.4.8.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=d2ae1571df7cd451e933567657c5d384
+_md5_=493b436839a9baa0a334fe3c21778556
diff --git a/metadata/md5-cache/dev-cpp/tree-2.81 b/metadata/md5-cache/dev-cpp/tree-2.81
index fe3ee3810ba4..97ea21d550b8 100644
--- a/metadata/md5-cache/dev-cpp/tree-2.81
+++ b/metadata/md5-cache/dev-cpp/tree-2.81
@@ -3,10 +3,10 @@ DESCRIPTION=An STL-like tree class
 EAPI=4
 HOMEPAGE=http://www.aei.mpg.de/~peekas/tree/
 IUSE=doc
-KEYWORDS=amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( GPL-2 GPL-3 )
 SLOT=0
 SRC_URI=http://www.aei.mpg.de/~peekas/tree/tree-2.81.tar.gz
 _eclass_exported_funcs=src_prepare:- src_test:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=981c24e358a130ab7b0120682f9a293f
+_md5_=665eaee325b56fbc1cf707830f6fe2d8
diff --git a/metadata/md5-cache/dev-db/pgagent-3.4.0-r1 b/metadata/md5-cache/dev-db/pgagent-3.4.0-r1
index cc6169f85486..325cd46306ba 100644
--- a/metadata/md5-cache/dev-db/pgagent-3.4.0-r1
+++ b/metadata/md5-cache/dev-db/pgagent-3.4.0-r1
@@ -3,11 +3,11 @@ DEPEND=>=dev-db/postgresql-9.0.0:* x11-libs/wxGTK:3.0 >=dev-util/cmake-2.6 sys-d
 DESCRIPTION=pgAgent is a job scheduler for PostgreSQL
 EAPI=5
 HOMEPAGE=http://www.pgadmin.org/download/pgagent.php
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=dev-db/postgresql-9.0.0:* x11-libs/wxGTK:3.0
 SLOT=0
 SRC_URI=mirror://postgresql/pgadmin3/release/pgagent/pgAgent-3.4.0-Source.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
-_md5_=8a3f4760085ee43755d25c8337e8ec61
+_md5_=da88a1384e3cfdf9975c26c0ef10d248
diff --git a/metadata/md5-cache/dev-games/cegui-0.8.7 b/metadata/md5-cache/dev-games/cegui-0.8.7
index 604a943c1b9c..e7336cd04881 100644
--- a/metadata/md5-cache/dev-games/cegui-0.8.7
+++ b/metadata/md5-cache/dev-games/cegui-0.8.7
@@ -4,7 +4,7 @@ DESCRIPTION=Crazy Eddie's GUI System
 EAPI=5
 HOMEPAGE=http://www.cegui.org.uk/
 IUSE=bidi debug devil doc freeimage expat irrlicht lua ogre opengl pcre python static-libs tinyxml truetype xerces-c +xml zip python_targets_python2_7
-KEYWORDS=amd64 -ppc ~x86
+KEYWORDS=amd64 -ppc x86
 LICENSE=MIT
 RDEPEND=virtual/libiconv bidi? ( dev-libs/fribidi ) devil? ( media-libs/devil ) expat? ( dev-libs/expat ) freeimage? ( media-libs/freeimage ) irrlicht? ( dev-games/irrlicht ) lua? ( dev-lang/lua:0 dev-lua/toluapp ) ogre? ( >=dev-games/ogre-1.7 ) opengl? ( virtual/opengl virtual/glu media-libs/glew ) pcre? ( dev-libs/libpcre ) 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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-libs/boost:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) tinyxml? ( dev-libs/tinyxml ) truetype? ( media-libs/freetype:2 ) xerces-c? ( dev-libs/xerces-c ) xml? ( dev-libs/libxml2 ) zip? ( sys-libs/zlib[minizip] )
 REQUIRED_USE=|| ( expat tinyxml xerces-c xml ) python_targets_python2_7
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/crayzedsgui/cegui-0.8.7.tar.bz2
 _eclass_exported_funcs=pkg_setup:python-single-r1 src_prepare:cmake-utils src_configure:- src_compile:- src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d58d3777a984de1714eb0b5d99f2f1e0
+_md5_=8ca61cebe666b2b67daf4047fe5a62a1
diff --git a/metadata/md5-cache/dev-games/newton-3.13 b/metadata/md5-cache/dev-games/newton-3.13
index 32f906073299..505a618a7f99 100644
--- a/metadata/md5-cache/dev-games/newton-3.13
+++ b/metadata/md5-cache/dev-games/newton-3.13
@@ -3,10 +3,10 @@ DEPEND=app-arch/unzip sys-devel/make >=dev-util/cmake-2.8.12
 DESCRIPTION=an integrated solution for real time simulation of physics environments
 EAPI=5
 HOMEPAGE=http://newtondynamics.com/forum/newton.php
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=https://github.com/MADEAPPS/newton-dynamics/archive/newton-3.13.zip
 _eclass_exported_funcs=src_unpack:unpacker src_prepare:- src_configure:- src_compile:- src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=34b5e38edc964f21381d805f7d0a5ec3
+_md5_=57d838adf3b58bac1161d671ce1cf40e
diff --git a/metadata/md5-cache/dev-lang/blassic-0.10.3 b/metadata/md5-cache/dev-lang/blassic-0.10.3
index 2c714fed217a..a7c9cb9add79 100644
--- a/metadata/md5-cache/dev-lang/blassic-0.10.3
+++ b/metadata/md5-cache/dev-lang/blassic-0.10.3
@@ -4,11 +4,11 @@ DESCRIPTION=classic Basic interpreter
 EAPI=5
 HOMEPAGE=http://blassic.net
 IUSE=X
-KEYWORDS=amd64 ~hppa ~ppc ~x86 ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~hppa ~ppc x86 ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=sys-libs/ncurses:0 X? ( x11-libs/libICE x11-libs/libX11 x11-libs/libSM )
 SLOT=0
 SRC_URI=http://blassic.net/bin/blassic-0.10.3.tgz
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=b3a7b75d04f1d85af3a71da9469bf9e8
+_md5_=a615051a4041248e600a86d06690569b
diff --git a/metadata/md5-cache/dev-lang/clojure-1.8.0 b/metadata/md5-cache/dev-lang/clojure-1.8.0
index 455f99d889a5..72a82801873c 100644
--- a/metadata/md5-cache/dev-lang/clojure-1.8.0
+++ b/metadata/md5-cache/dev-lang/clojure-1.8.0
@@ -4,7 +4,7 @@ DESCRIPTION=A dynamic programming language that targets the Java Virtual Machine
 EAPI=5
 HOMEPAGE=http://clojure.org/
 IUSE=elibc_FreeBSD source test elibc_FreeBSD
-KEYWORDS=amd64 ~x86 ~x86-linux
+KEYWORDS=amd64 x86 ~x86-linux
 LICENSE=EPL-1.0 Apache-2.0 BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=1.8
 SRC_URI=https://github.com/clojure/clojure/tarball/clojure-1.8.0 -> clojure-1.8.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:java-ant-2 src_compile:java-pkg-2 src_test:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0b28ef9f5d4485eb86b2eae159f7cb2a
+_md5_=ba469e915df2b598c2f5279d6b223b42
diff --git a/metadata/md5-cache/dev-lang/erlang-18.3 b/metadata/md5-cache/dev-lang/erlang-18.3
index 59e346b01ff7..99011b4a26ff 100644
--- a/metadata/md5-cache/dev-lang/erlang-18.3
+++ b/metadata/md5-cache/dev-lang/erlang-18.3
@@ -4,11 +4,11 @@ DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
 EAPI=5
 HOMEPAGE=http://www.erlang.org/
 IUSE=compat-ethread doc emacs halfword hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets elibc_FreeBSD java
-KEYWORDS=alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://www.erlang.org/download/otp_src_18.3.tar.gz http://erlang.org/download/otp_doc_man_18.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_18.3.tar.gz )
 _eclass_exported_funcs=pkg_preinst:java-pkg-opt-2 pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
-_md5_=36fdf10ce40ae5450bc0a81c5f7f9353
+_md5_=4f3a3704aef99432be49d2b6bbe3bedd
diff --git a/metadata/md5-cache/dev-lang/nasm-2.12.01 b/metadata/md5-cache/dev-lang/nasm-2.12.01
index 568a827b3608..86ce42e5fdd3 100644
--- a/metadata/md5-cache/dev-lang/nasm-2.12.01
+++ b/metadata/md5-cache/dev-lang/nasm-2.12.01
@@ -4,10 +4,10 @@ DESCRIPTION=groovy little assembler
 EAPI=5
 HOMEPAGE=http://www.nasm.us/
 IUSE=doc
-KEYWORDS=amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://www.nasm.us/pub/nasm/releasebuilds/2.12.01/nasm-2.12.01.tar.xz
 _eclass_exported_funcs=src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=3e867d04ace2ee612637a711438b1e1f
+_md5_=8d3ce85f95d161f292efb2e9082260f8
diff --git a/metadata/md5-cache/dev-libs/UTF8Strings-1.14.2 b/metadata/md5-cache/dev-libs/UTF8Strings-1.14.2
index ac77ee5b786f..c5999469a060 100644
--- a/metadata/md5-cache/dev-libs/UTF8Strings-1.14.2
+++ b/metadata/md5-cache/dev-libs/UTF8Strings-1.14.2
@@ -3,10 +3,10 @@ DEPEND=sys-devel/make >=dev-util/cmake-2.8.12
 DESCRIPTION=C++ library providing ability to work natively with UTF8 string
 EAPI=5
 HOMEPAGE=http://grigory.info/UTF8Strings.About.html
-KEYWORDS=amd64 ~mips ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~mips x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://grigory.info/distfiles/UTF8Strings-1.14.2.tar.bz2
 _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	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=785c33b946869a6c1d9c33d17c4fac56
+_md5_=5857038b1eb7d9f365ca154408eec103
diff --git a/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r3 b/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r3
index 10918b91034e..c931ebaac07c 100644
--- a/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r3
+++ b/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r3
@@ -4,7 +4,7 @@ DESCRIPTION=general-purpose cryptography library
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/beecrypt/
 IUSE=+threads java cxx python static-libs doc elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2 LGPL-2
 RDEPEND=!<app-arch/rpm-4.2.1 cxx? ( >=dev-libs/icu-2.8:= ) 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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=cxx? ( threads ) python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-opt-2 pkg_setup:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9451b84c471c64c47861312911012ab4
+_md5_=527f23eb00a5bf2760ccafb3a8fe6a6e
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.166 b/metadata/md5-cache/dev-libs/elfutils-0.166
index 9868af1f400a..1bad722b8487 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.166
+++ b/metadata/md5-cache/dev-libs/elfutils-0.166
@@ -4,11 +4,11 @@ DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for l
 EAPI=5
 HOMEPAGE=https://fedorahosted.org/elfutils/
 IUSE=bzip2 lzma nls static-libs test +threads +utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2-with-exceptions
 RDEPEND=>=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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) !dev-libs/libelf abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/e/l/elfutils/0.166/elfutils-0.166.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=c05c8f3d832598cc778ad6be70e87fff
+_md5_=75101633cae484664f86b4666b992f0a
diff --git a/metadata/md5-cache/dev-libs/libffi-3.2.1 b/metadata/md5-cache/dev-libs/libffi-3.2.1
index 9c75a426fa26..436f6129e59d 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.2.1
+++ b/metadata/md5-cache/dev-libs/libffi-3.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=a portable, high level programming interface to various calling conv
 EAPI=5
 HOMEPAGE=https://sourceware.org/libffi/
 IUSE=debug pax_kernel 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 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=8bef91f435f69be36826ab275dca9ded
+_md5_=bb716ce9543287f2a97ea5e1c92e6947
diff --git a/metadata/md5-cache/dev-libs/librevenge-0.0.4 b/metadata/md5-cache/dev-libs/librevenge-0.0.4
index d34dc2a7e5fb..87bb689925e5 100644
--- a/metadata/md5-cache/dev-libs/librevenge-0.0.4
+++ b/metadata/md5-cache/dev-libs/librevenge-0.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=A helper library for REVerse ENGineered formats filters
 EAPI=5
 HOMEPAGE=http://sf.net/p/libwpd/librevenge
 IUSE=doc 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 ~hppa ~mips ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc64 x86 ~x86-fbsd
 LICENSE=|| ( MPL-2.0 LGPL-2.1 )
 RDEPEND=dev-libs/boost:= sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=http://sf.net/projects/libwpd/files/librevenge/librevenge-0.0.4/librevenge-0.0.4.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=5592b0b042e5e22e11c38c24f098942c
+_md5_=6e61cecc94e4940bda804db037313a60
diff --git a/metadata/md5-cache/dev-libs/nss-3.23 b/metadata/md5-cache/dev-libs/nss-3.23
index 1aad3c5a14f9..b4188e5de39a 100644
--- a/metadata/md5-cache/dev-libs/nss-3.23
+++ b/metadata/md5-cache/dev-libs/nss-3.23
@@ -4,7 +4,7 @@ DESCRIPTION=Mozilla's Network Security Services library that implements PKI supp
 EAPI=6
 HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
 IUSE=+cacert +nss-pem utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.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(-)?] >=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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_23_RTM/src/nss-3.23.tar.gz cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch ) nss-pem? ( https://dev.gentoo.org/~anarchy/dist/nss-pem-20140125.tar.bz2 )
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_unpack:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=a3c9203096a6ed8d4b12fa991f82547c
+_md5_=6ad7f73d3c0cdcf1475e74e76fd8a746
diff --git a/metadata/md5-cache/dev-libs/qtkeychain-0.6.2 b/metadata/md5-cache/dev-libs/qtkeychain-0.6.2
index be13f6d2d2f0..1e79a325278e 100644
--- a/metadata/md5-cache/dev-libs/qtkeychain-0.6.2
+++ b/metadata/md5-cache/dev-libs/qtkeychain-0.6.2
@@ -4,7 +4,7 @@ DESCRIPTION=Qt API for storing passwords securely
 EAPI=6
 HOMEPAGE=https://github.com/frankosterfeld/qtkeychain
 IUSE=+qt4 qt5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 )
 REQUIRED_USE=|| ( qt4 qt5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/frankosterfeld/qtkeychain/archive/v0.6.2.tar.gz -> qtkeychain-0.6.2.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:cmake-utils src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fee5329072b97ca2e629e6b831273e36
+_md5_=091b85ea1def96d7ba1b8fe17d77c0c4
diff --git a/metadata/md5-cache/dev-libs/ustr-1.0.4-r8 b/metadata/md5-cache/dev-libs/ustr-1.0.4-r8
index 838a4a260246..74d92db422a5 100644
--- a/metadata/md5-cache/dev-libs/ustr-1.0.4-r8
+++ b/metadata/md5-cache/dev-libs/ustr-1.0.4-r8
@@ -3,10 +3,10 @@ DESCRIPTION=Low-overhead managed string library for C
 EAPI=5
 HOMEPAGE=http://www.and.org/ustr
 IUSE=static-libs ustr-import abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=|| ( BSD-2 MIT LGPL-2 )
 SLOT=0
 SRC_URI=ftp://ftp.and.org/pub/james/ustr/1.0.4/ustr-1.0.4.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	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=c7c393c96174572dcc57b036f6b0ae99
+_md5_=b635c6123af31576be9699d4b274550d
diff --git a/metadata/md5-cache/dev-lisp/asdf-3.1.5 b/metadata/md5-cache/dev-lisp/asdf-3.1.5
index c0c306809d81..82b043771c87 100644
--- a/metadata/md5-cache/dev-lisp/asdf-3.1.5
+++ b/metadata/md5-cache/dev-lisp/asdf-3.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=ASDF is Another System Definition Facility for Common Lisp
 EAPI=5
 HOMEPAGE=http://common-lisp.net/project/asdf/
 IUSE=doc
-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
 PDEPEND=~dev-lisp/uiop-3.1.5
 SLOT=0/3.1.5
 SRC_URI=http://common-lisp.net/project/asdf/archives/asdf-3.1.5.tar.gz
 _eclass_exported_funcs=src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=72858790fbad7f2af7b78fb9743170de
+_md5_=8ebd1b2a7dd6aa5e1e53f1b5f05a6c6e
diff --git a/metadata/md5-cache/dev-lisp/uiop-3.1.5 b/metadata/md5-cache/dev-lisp/uiop-3.1.5
index 2d1af47f9511..e8e0f7fca067 100644
--- a/metadata/md5-cache/dev-lisp/uiop-3.1.5
+++ b/metadata/md5-cache/dev-lisp/uiop-3.1.5
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DESCRIPTION=UIOP is a portability layer spun off ASDF3
 EAPI=5
 HOMEPAGE=http://common-lisp.net/project/asdf/
-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.5
 SLOT=0
 SRC_URI=http://common-lisp.net/project/asdf/archives/asdf-3.1.5.tar.gz
 _eclass_exported_funcs=src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=8151219997a99b1035e1f3894624c152
+_md5_=bbe6944c0cf972b2fc68ab75e3365809
diff --git a/metadata/md5-cache/dev-perl/Compress-Bzip2-2.220.0 b/metadata/md5-cache/dev-perl/Compress-Bzip2-2.220.0
index 506a858ca545..7a9f1e28ce61 100644
--- a/metadata/md5-cache/dev-perl/Compress-Bzip2-2.220.0
+++ b/metadata/md5-cache/dev-perl/Compress-Bzip2-2.220.0
@@ -4,11 +4,11 @@ DESCRIPTION=Interface to Bzip2 compression library
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Compress-Bzip2/
 IUSE=test
-KEYWORDS=amd64 ~ia64 ~mips ~sparc ~x86 ~ppc-aix
+KEYWORDS=amd64 ~ia64 ~mips ~sparc x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-arch/bzip2 virtual/perl-Carp virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.22.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=a1dcbffe02e04df13a6f5123c44b0b7b
+_md5_=f36b8d3d511cec73e217976003341482
diff --git a/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1 b/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1
index 8f170fc3af80..f587dce0ccd7 100644
--- a/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1
+++ b/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Facility for creating read-only scalars, arrays, and hashes
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Const-Fast/
 IUSE=test
-KEYWORDS=amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils virtual/perl-Storable >=dev-perl/Sub-Exporter-Progressive-0.1.7 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Const-Fast-0.014.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=2aa96b49f9db179b5b113f4e6dd134f7
+_md5_=b02202c1585a65fb22b0312e49d145b9
diff --git a/metadata/md5-cache/dev-perl/Mail-Box-2.118.0 b/metadata/md5-cache/dev-perl/Mail-Box-2.118.0
index 6f089791baeb..5167d72ea629 100644
--- a/metadata/md5-cache/dev-perl/Mail-Box-2.118.0
+++ b/metadata/md5-cache/dev-perl/Mail-Box-2.118.0
@@ -4,11 +4,11 @@ DESCRIPTION=Mail folder manager and MUA backend
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Mail-Box/
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/TimeDate >=dev-perl/Devel-GlobalDestruction-0.90.0 dev-perl/Digest-HMAC >=virtual/perl-Encode-2.260.0 >=dev-perl/File-Remove-0.200.0 >=virtual/perl-File-Spec-0.700.0 dev-perl/IO-stringy virtual/perl-MIME-Base64 >=dev-perl/MIME-Types-1.4.0 >=dev-perl/Object-Realize-Later-0.190.0 >=virtual/perl-Scalar-List-Utils-1.130.0 >=dev-perl/URI-1.230.0 >=dev-perl/User-Identity-0.940.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-2.118.tar.gz
 _eclass_exported_funcs=src_unpack:perl-module src_prepare:perl-module src_configure:- src_compile:perl-module src_test:perl-module src_install:perl-module
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=f1b95aaa3489963ac2c4c874b741d553
+_md5_=e9448213bd8fb7771df3636e006f3020
diff --git a/metadata/md5-cache/dev-perl/Math-Random-0.720.0 b/metadata/md5-cache/dev-perl/Math-Random-0.720.0
index c167adb1a586..34122307f597 100644
--- a/metadata/md5-cache/dev-perl/Math-Random-0.720.0
+++ b/metadata/md5-cache/dev-perl/Math-Random-0.720.0
@@ -3,11 +3,11 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Random Number Generators
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Math-Random/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=( || ( Artistic GPL-2 ) ) public-domain
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GROMMEL/Math-Random-0.72.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=c9a0cd09f4cbe9ea5663534657df5761
+_md5_=6bcdf312cb630236896233c17bab45c6
diff --git a/metadata/md5-cache/dev-perl/Module-Install-AuthorTests-0.2.0 b/metadata/md5-cache/dev-perl/Module-Install-AuthorTests-0.2.0
index d89c86178766..3b8e9191518a 100644
--- a/metadata/md5-cache/dev-perl/Module-Install-AuthorTests-0.2.0
+++ b/metadata/md5-cache/dev-perl/Module-Install-AuthorTests-0.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Designate tests only run by module authors
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Module-Install-AuthorTests/
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Module-Install dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Module-Install-AuthorTests-0.002.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=e3c2fe0b55a80f447ee58f58c7ffc017
+_md5_=ce0a7570e1c4ae9599a6a21187c910f9
diff --git a/metadata/md5-cache/dev-perl/Module-Starter-1.710.0 b/metadata/md5-cache/dev-perl/Module-Starter-1.710.0
index 8469f1b7c39c..cb0a521c4342 100644
--- a/metadata/md5-cache/dev-perl/Module-Starter-1.710.0
+++ b/metadata/md5-cache/dev-perl/Module-Starter-1.710.0
@@ -4,11 +4,11 @@ DESCRIPTION=A simple starter kit for any module
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Module-Starter/
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-ExtUtils-Command virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Module-Install-AuthorTests dev-perl/Path-Class >=virtual/perl-Pod-Parser-1.210.0 virtual/perl-parent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XS/XSAWYERX/Module-Starter-1.60.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=3ca94637789870bdc3fc3bc178ac7f04
+_md5_=775e1d820e0a42a4bf6876100f96ce2d
diff --git a/metadata/md5-cache/dev-perl/Net-DBus-1.1.0 b/metadata/md5-cache/dev-perl/Net-DBus-1.1.0
index e490eb40eb7a..6af67a5e83e4 100644
--- a/metadata/md5-cache/dev-perl/Net-DBus-1.1.0
+++ b/metadata/md5-cache/dev-perl/Net-DBus-1.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Perl extension for the DBus message system
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Net-DBus/
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sys-apps/dbus virtual/perl-Time-HiRes dev-perl/XML-Twig dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Net-DBus-1.1.0.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	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=7de7b817ca6b68aa41a73b32ecb1c41b
+_md5_=00760852b4e7438fd524e88151d616d2
diff --git a/metadata/md5-cache/dev-perl/Net-Patricia-1.220.0 b/metadata/md5-cache/dev-perl/Net-Patricia-1.220.0
index babc83bf33b1..a14311701438 100644
--- a/metadata/md5-cache/dev-perl/Net-Patricia-1.220.0
+++ b/metadata/md5-cache/dev-perl/Net-Patricia-1.220.0
@@ -4,11 +4,11 @@ DESCRIPTION=Patricia Trie perl module for fast IP address lookups
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Net-Patricia/
 IUSE=ipv6
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=dev-perl/Net-CIDR-Lite ipv6? ( dev-perl/Socket6 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRUBER/Net-Patricia-1.22.tar.gz
 _eclass_exported_funcs=src_unpack:perl-module src_prepare:perl-module src_configure:perl-module src_compile:- src_test:perl-module src_install:perl-module
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=8c0babf12cd434ab0ea1c4b8c7a98c09
+_md5_=dbc959569e62d45ede9bff3efe293267
diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.720.0-r1 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.720.0-r1
index 814961dbbf57..1bb6c40cd701 100644
--- a/metadata/md5-cache/dev-perl/Net-SSLeay-1.720.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.720.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Perl extension for using OpenSSL
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Net-SSLeay/
 IUSE=libressl test minimal examples
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=openssl
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) virtual/perl-MIME-Base64 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/Net-SSLeay-1.72.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:perl-module src_compile:perl-module src_test:perl-module src_install:-
 _eclasses_=multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=e75402a8d6652be4f2f1d26861ceaec9
+_md5_=17b2eb0af499e6b14a1851d4c0acdc6e
diff --git a/metadata/md5-cache/dev-perl/NetAddr-IP-4.78.0 b/metadata/md5-cache/dev-perl/NetAddr-IP-4.78.0
index d660e674cf88..cb5661bc9af6 100644
--- a/metadata/md5-cache/dev-perl/NetAddr-IP-4.78.0
+++ b/metadata/md5-cache/dev-perl/NetAddr-IP-4.78.0
@@ -4,11 +4,11 @@ DESCRIPTION=Manipulation and operations on IP addresses
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/NetAddr-IP/
 IUSE=ipv6
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=ipv6? ( dev-perl/Socket6 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKER/NetAddr-IP-4.078.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=cf735b5b9e7c322ffda14fe7564d82cb
+_md5_=2443aa45f2de397b3de81ee298411c54
diff --git a/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0 b/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
index 1aa04b2a83c2..a00aa6a925c2 100644
--- a/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
+++ b/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
@@ -4,11 +4,11 @@ DESCRIPTION=Delayed creation of objects
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Object-Realize-Later/
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Object-Realize-Later-0.19.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=9dce48d8f232750f6bd01299819e76a2
+_md5_=e907d6d31a098e1537db818d9ee435f7
diff --git a/metadata/md5-cache/dev-perl/OpenGL-0.670.400 b/metadata/md5-cache/dev-perl/OpenGL-0.670.400
index 78bc03e056df..a2e6bf2260b5 100644
--- a/metadata/md5-cache/dev-perl/OpenGL-0.670.400
+++ b/metadata/md5-cache/dev-perl/OpenGL-0.670.400
@@ -4,11 +4,11 @@ DESCRIPTION=Perl interface providing graphics display using OpenGL
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/OpenGL/
 IUSE=examples
-KEYWORDS=amd64 arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=media-libs/freeglut:0= x11-libs/libICE:0= x11-libs/libXext:0= x11-libs/libXi:0= x11-libs/libXmu:0= dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHM/OpenGL-0.6704.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:perl-module src_compile:- src_test:perl-module src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=956b84b8683bc8e2ecf63674db9bdb57
+_md5_=c11552d6f963900aca10e5131452bb97
diff --git a/metadata/md5-cache/dev-perl/POE-1.367 b/metadata/md5-cache/dev-perl/POE-1.367
index 36d3a6f205f1..b99aeb088e31 100644
--- a/metadata/md5-cache/dev-perl/POE-1.367
+++ b/metadata/md5-cache/dev-perl/POE-1.367
@@ -4,11 +4,11 @@ DESCRIPTION=A framework for creating multitasking programs in Perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/POE/
 IUSE=ipv6 libwww ncurses tk test
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/YAML dev-perl/Filter dev-perl/IO-Pipely dev-perl/FreezeThaw >=dev-perl/Event-1.09 >=virtual/perl-File-Spec-0.87 >=virtual/perl-IO-1.23.01 >=virtual/perl-IO-Compress-1.33 >=virtual/perl-Storable-2.12 >=dev-perl/IO-Tty-1.08 >=dev-perl/TermReadKey-2.21 >=virtual/perl-Time-HiRes-1.59 ipv6? ( >=dev-perl/Socket6-0.14 ) tk? ( >=dev-perl/Tk-800.027 ) libwww? ( >=dev-perl/libwww-perl-5.79 >=dev-perl/URI-1.30 ) ncurses? ( >=dev-perl/Curses-1.08 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-1.367.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=269208e4edab6b7937c266264c651104
+_md5_=69266c8d92d36f8a5fda4ebd0101ad4b
diff --git a/metadata/md5-cache/dev-perl/PadWalker-2.200.0 b/metadata/md5-cache/dev-perl/PadWalker-2.200.0
index 98b2d03ea3a4..ebba4ee56f0e 100644
--- a/metadata/md5-cache/dev-perl/PadWalker-2.200.0
+++ b/metadata/md5-cache/dev-perl/PadWalker-2.200.0
@@ -3,11 +3,11 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=play with other peoples' lexical variables
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/PadWalker/
-KEYWORDS=alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROBIN/PadWalker-2.2.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	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=308e0ee3eeeda8a2b66c6f296f6d4c37
+_md5_=1c82efa55f425375a72bd31849a42543
diff --git a/metadata/md5-cache/dev-perl/Pango-1.227.0 b/metadata/md5-cache/dev-perl/Pango-1.227.0
index 54ece62efe0f..96c607b354a5 100644
--- a/metadata/md5-cache/dev-perl/Pango-1.227.0
+++ b/metadata/md5-cache/dev-perl/Pango-1.227.0
@@ -4,11 +4,11 @@ DESCRIPTION=Layout and render international text
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Pango/
 IUSE=examples test minimal
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-perl/glib-perl-1.220.0 >=dev-perl/Cairo-1.0.0 >=x11-libs/pango-1.0.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Pango-1.227.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:perl-module src_compile:perl-module src_test:- src_install:-
 _eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=77790e06c2406c2d7fc07557b23b5e19
+_md5_=f172a19bc9ead1f58c949a0096cdd110
diff --git a/metadata/md5-cache/dev-perl/Params-Validate-1.220.0 b/metadata/md5-cache/dev-perl/Params-Validate-1.220.0
index 6e2fdd5c03d5..d135108e9dca 100644
--- a/metadata/md5-cache/dev-perl/Params-Validate-1.220.0
+++ b/metadata/md5-cache/dev-perl/Params-Validate-1.220.0
@@ -4,11 +4,11 @@ DESCRIPTION=Flexible system for validation of method/function call parameters
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Params-Validate/
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-JSON-PP-2.273.0 dev-perl/Module-Implementation >=virtual/perl-Scalar-List-Utils-1.110.0 virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.22.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	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=bfd913e6dd2e89298aa7fbf408c38b81
+_md5_=1edaed23b6b8f0e0ddb15d38722b70a7
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-1.123 b/metadata/md5-cache/dev-perl/Perl-Critic-1.123
index ae9533b8792c..c3b3d6d701ff 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-1.123
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-1.123
@@ -4,11 +4,11 @@ DESCRIPTION=Critique Perl source code for best-practices
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Perl-Critic/
 IUSE=test
-KEYWORDS=alpha amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Module-Pluggable-3.1 >=dev-perl/Config-Tiny-2 >=dev-perl/Email-Address-1.88.9 dev-perl/List-MoreUtils dev-perl/IO-String dev-perl/Perl-Tidy >=dev-perl/PPI-1.220 dev-perl/PPIx-Utilities >=dev-perl/PPIx-Regexp-0.27.0 dev-perl/Pod-Spell >=dev-perl/Set-Scalar-1.20 dev-perl/File-HomeDir dev-perl/File-Which dev-perl/B-Keywords >=dev-perl/Readonly-2 dev-perl/Exception-Class dev-perl/String-Format >=virtual/perl-version-0.77 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-1.123.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=1375a5095a7352b6a470e1bf86e66c21
+_md5_=375fb693924e55c518d6401ad9f694d6
diff --git a/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0 b/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0
index 7b45256bf544..aaff0f1e76f4 100644
--- a/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0
+++ b/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0
@@ -4,11 +4,11 @@ DESCRIPTION=Querying your filehandle's capabilities
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/PerlIO-Layers/
 IUSE=test
-KEYWORDS=amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-List-Utils virtual/perl-XSLoader dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/PerlIO-Layers-0.011.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=83133653b7d3e6068d14e779c9e5b667
+_md5_=c04f16f5c2006334d9b178472feb1d5a
diff --git a/metadata/md5-cache/dev-perl/PerlIO-gzip-0.190.0 b/metadata/md5-cache/dev-perl/PerlIO-gzip-0.190.0
index ff97146a26ea..1998f2857141 100644
--- a/metadata/md5-cache/dev-perl/PerlIO-gzip-0.190.0
+++ b/metadata/md5-cache/dev-perl/PerlIO-gzip-0.190.0
@@ -3,11 +3,11 @@ DEPEND=sys-libs/zlib dev-lang/perl:=
 DESCRIPTION=PerlIO layer to gzip/gunzip
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/PerlIO-gzip/
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sys-libs/zlib virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NW/NWCLARK/PerlIO-gzip-0.19.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	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=14abbe4ee7855078236a0459627346b7
+_md5_=74da9c9c45b74aad30482aaa327c2792
diff --git a/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2 b/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2
index 838ae660c78b..6e1757cbd489 100644
--- a/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2
+++ b/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Plucene - the Perl lucene port
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Plucene/
 IUSE=test
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Bit-Vector-Minimal-1.0.0 virtual/perl-Carp >=dev-perl/Class-Accessor-0.180.0 >=dev-perl/Class-Virtual-0.30.0 virtual/perl-Encode virtual/perl-File-Spec virtual/perl-IO dev-perl/Lingua-Stem >=virtual/perl-Scalar-List-Utils-1.130.0 >=virtual/perl-Memoize-1.10.0 >=dev-perl/Tie-Array-Sorted-1.100.0 virtual/perl-Time-Piece dev-perl/Encode-compat dev-perl/File-Slurp dev-perl/IO-stringy dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Plucene-1.25.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:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=73c03efc64b2027b46997cebf9e011c3
+_md5_=7c948ad15e329de6c0565abec782a726
diff --git a/metadata/md5-cache/dev-perl/Proc-ProcessTable-0.530.0 b/metadata/md5-cache/dev-perl/Proc-ProcessTable-0.530.0
index 5b95fb3af992..1539ba1c907f 100644
--- a/metadata/md5-cache/dev-perl/Proc-ProcessTable-0.530.0
+++ b/metadata/md5-cache/dev-perl/Proc-ProcessTable-0.530.0
@@ -4,11 +4,11 @@ DESCRIPTION=Unix process table information
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Proc-ProcessTable/
 IUSE=examples
-KEYWORDS=alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Storable dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.53.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:perl-module src_compile:perl-module src_test:perl-module src_install:-
 _eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=72d87fd253e8b34a4e001bdd7ed4815b
+_md5_=8cf8c19758ff15ca955803399f685e76
diff --git a/metadata/md5-cache/dev-perl/RPC-XML-0.790.0 b/metadata/md5-cache/dev-perl/RPC-XML-0.790.0
index 562b409d60eb..d92763ce2c44 100644
--- a/metadata/md5-cache/dev-perl/RPC-XML-0.790.0
+++ b/metadata/md5-cache/dev-perl/RPC-XML-0.790.0
@@ -4,11 +4,11 @@ DESCRIPTION=An implementation of XML-RPC
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/RPC-XML/
 IUSE=test
-KEYWORDS=amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
 LICENSE=|| ( Artistic-2 LGPL-2.1 )
 RDEPEND=>=virtual/perl-File-Spec-0.800.0 >=dev-perl/libwww-perl-5.834.0 >=virtual/perl-Module-Load-0.240.0 >=virtual/perl-Scalar-List-Utils-1.200.0 >=dev-perl/XML-LibXML-1.850.0 >=dev-perl/XML-Parser-2.310.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.79.tar.gz
 _eclass_exported_funcs=pkg_postinst:- 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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=7ffaee1825ef38887d2ebae079549673
+_md5_=615a74a4cfb7eca60ea874d7ff3e2e29
diff --git a/metadata/md5-cache/dev-perl/SQL-Abstract-1.810.0 b/metadata/md5-cache/dev-perl/SQL-Abstract-1.810.0
index c49545060086..4f2f4f3b46c7 100644
--- a/metadata/md5-cache/dev-perl/SQL-Abstract-1.810.0
+++ b/metadata/md5-cache/dev-perl/SQL-Abstract-1.810.0
@@ -4,11 +4,11 @@ DESCRIPTION=Generate SQL from Perl data structures
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/SQL-Abstract/
 IUSE=test
-KEYWORDS=amd64 ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 >=dev-perl/Hash-Merge-0.120.0 virtual/perl-Scalar-List-Utils >=dev-perl/MRO-Compat-0.120.0 >=dev-perl/Moo-1.4.2 >=virtual/perl-Text-Balanced-2.0.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RI/RIBASUSHI/SQL-Abstract-1.81.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=de2474d4ea3a56ec84a2a9a2429adfda
+_md5_=02024d54d428fe696e5842831b644652
diff --git a/metadata/md5-cache/dev-perl/SVG-2.640.0 b/metadata/md5-cache/dev-perl/SVG-2.640.0
index f4d2c889fa66..9c3e8f08bdb4 100644
--- a/metadata/md5-cache/dev-perl/SVG-2.640.0
+++ b/metadata/md5-cache/dev-perl/SVG-2.640.0
@@ -4,11 +4,11 @@ DESCRIPTION=Perl extension for generating Scalable Vector Graphics (SVG) documen
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/SVG/
 IUSE=test
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-parent virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SZ/SZABGAB/SVG-2.64.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=378e794c282296964ee09e85ab2d8943
+_md5_=c4ce9dc3e252865d838019ee1571302e
diff --git a/metadata/md5-cache/dev-perl/Scope-Guard-0.210.0 b/metadata/md5-cache/dev-perl/Scope-Guard-0.210.0
index f20702c9c4b2..1f1684351596 100644
--- a/metadata/md5-cache/dev-perl/Scope-Guard-0.210.0
+++ b/metadata/md5-cache/dev-perl/Scope-Guard-0.210.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lexically scoped resource management
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Scope-Guard/
 IUSE=test
-KEYWORDS=amd64 ~ppc ~x86 ~ppc-aix ~x86-solaris
+KEYWORDS=amd64 ~ppc x86 ~ppc-aix ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.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	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=348ba5755318a2ca3bc86bbad783a4a9
+_md5_=c894080978fefaa1ca7f199cc8c1475e
diff --git a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.23.0 b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.23.0
index 8c446dac0d6e..25bfa09b571b 100644
--- a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.23.0
+++ b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.23.0
@@ -4,11 +4,11 @@ DESCRIPTION=Perl XS frontend to the Xapian C++ search library
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Search-Xapian/
 IUSE=examples
-KEYWORDS=alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-libs/xapian:0/1.2.22 !dev-libs/xapian-bindings[perl] dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.23.0.tar.gz http://oligarchy.co.uk/xapian/1.2.23/Search-Xapian-1.2.23.0.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:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f09cd9fac28b40c3a5c7d20bdb8c701a
+_md5_=a6829a5cc78dfb1d8faaff7ed35736cc
diff --git a/metadata/md5-cache/dev-perl/Set-Object-1.350.0 b/metadata/md5-cache/dev-perl/Set-Object-1.350.0
index 40ee9a02a051..b08d5c96dc17 100644
--- a/metadata/md5-cache/dev-perl/Set-Object-1.350.0
+++ b/metadata/md5-cache/dev-perl/Set-Object-1.350.0
@@ -4,11 +4,11 @@ DESCRIPTION=set of objects and strings
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Set-Object/
 IUSE=test
-KEYWORDS=amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~ppc x86
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Set-Object-1.35.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=89f95bad7a47a1e0257fc503f84507b8
+_md5_=2665785a799b37183ede2b91b18eb284
diff --git a/metadata/md5-cache/dev-perl/Shell-0.730.0 b/metadata/md5-cache/dev-perl/Shell-0.730.0
index bd58a880f79b..af49b0a4d730 100644
--- a/metadata/md5-cache/dev-perl/Shell-0.730.0
+++ b/metadata/md5-cache/dev-perl/Shell-0.730.0
@@ -4,11 +4,11 @@ DESCRIPTION=Run shell commands transparently within perl
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Shell/
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FE/FERREIRA/Shell-0.73.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	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=8cde4332161572adc411bf06db3d3daf
+_md5_=7e4e532b03292be67735bdf8ab7902bd
diff --git a/metadata/md5-cache/dev-perl/Socket6-0.270.0 b/metadata/md5-cache/dev-perl/Socket6-0.270.0
index de01e11b4a7b..83e1725299de 100644
--- a/metadata/md5-cache/dev-perl/Socket6-0.270.0
+++ b/metadata/md5-cache/dev-perl/Socket6-0.270.0
@@ -3,11 +3,11 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=IPv6 related part of the C socket.h defines and structure manipulators
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Socket6/
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/U/UM/UMEMOTO/Socket6-0.27.tar.gz
 _eclass_exported_funcs=src_unpack:- src_prepare:perl-module src_configure:perl-module src_compile:perl-module src_test:perl-module src_install:perl-module
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=85e98cfc96734831ec49b066f041581f
+_md5_=b728df85f0e7f1c3c6fc08fc8d254829
diff --git a/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.61.200 b/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.61.200
index 0a9596760739..3fdc7ba67885 100644
--- a/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.61.200
+++ b/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.61.200
@@ -4,11 +4,11 @@ DESCRIPTION=Module of basic descriptive statistical functions
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Statistics-Descriptive/
 IUSE=test examples
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0612.tar.gz
 _eclass_exported_funcs=src_prepare:perl-module src_configure:perl-module src_compile:perl-module src_test:- src_install:-
 _eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=d693e91490c7ee75f33dd968f667783b
+_md5_=22c4330d82bb552535e79b0624fc4d37
diff --git a/metadata/md5-cache/dev-perl/String-CRC32-1.500.0 b/metadata/md5-cache/dev-perl/String-CRC32-1.500.0
index 118dfebeb934..f43c5c8ec13a 100644
--- a/metadata/md5-cache/dev-perl/String-CRC32-1.500.0
+++ b/metadata/md5-cache/dev-perl/String-CRC32-1.500.0
@@ -3,11 +3,11 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Perl interface for cyclic redundancy check generation
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/String-CRC32/
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=public-domain
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SO/SOENKE/String-CRC32-1.5.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=dd4dfe897c8283ae4156e284cb13f16b
+_md5_=cb60dde49e94702b161dd906734af771
diff --git a/metadata/md5-cache/dev-perl/Sub-Identify-0.120.0 b/metadata/md5-cache/dev-perl/Sub-Identify-0.120.0
index 829d88208e7a..a2e4750d3d14 100644
--- a/metadata/md5-cache/dev-perl/Sub-Identify-0.120.0
+++ b/metadata/md5-cache/dev-perl/Sub-Identify-0.120.0
@@ -4,11 +4,11 @@ DESCRIPTION=Retrieve names of code references
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Sub-Identify/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RG/RGARCIA/Sub-Identify-0.12.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	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=f189b89137a83fb08efbae1a87f14fbf
+_md5_=82c3c779441d5185b7f6d2db14a5bfe5
diff --git a/metadata/md5-cache/dev-perl/Sys-MemInfo-0.980.0 b/metadata/md5-cache/dev-perl/Sys-MemInfo-0.980.0
index eb2e2fe2ea1e..81dfde0a1619 100644
--- a/metadata/md5-cache/dev-perl/Sys-MemInfo-0.980.0
+++ b/metadata/md5-cache/dev-perl/Sys-MemInfo-0.980.0
@@ -3,11 +3,11 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Memory informations
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Sys-MemInfo/
-KEYWORDS=alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1 || ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SC/SCRESTO/Sys-MemInfo-0.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=7e279d6e6d911d28903efab2b85cbacf
+_md5_=5f90ed952d30d7e0a55847c3dd8666d5
diff --git a/metadata/md5-cache/dev-perl/Term-ReadLine-Gnu-1.310.0 b/metadata/md5-cache/dev-perl/Term-ReadLine-Gnu-1.310.0
index 96dfa7846bb5..25341b1d9e3c 100644
--- a/metadata/md5-cache/dev-perl/Term-ReadLine-Gnu-1.310.0
+++ b/metadata/md5-cache/dev-perl/Term-ReadLine-Gnu-1.310.0
@@ -4,11 +4,11 @@ DESCRIPTION=GNU Readline XS library wrapper
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Term-ReadLine-Gnu/
 IUSE=examples
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=sys-libs/readline-6.2:0= dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.31.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	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=113faa820a7e2afc4ebe8feaabfd2628
+_md5_=8171d1f1ea28bd6f577f74955851dc97
diff --git a/metadata/md5-cache/dev-perl/TermReadKey-2.330.0 b/metadata/md5-cache/dev-perl/TermReadKey-2.330.0
index 6faaa5c8bbfd..b9eb54139ab7 100644
--- a/metadata/md5-cache/dev-perl/TermReadKey-2.330.0
+++ b/metadata/md5-cache/dev-perl/TermReadKey-2.330.0
@@ -3,11 +3,11 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
 DESCRIPTION=Change terminal modes, and perform non-blocking reads
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/TermReadKey/
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JS/JSTOWE/TermReadKey-2.33.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=87e1b987fa1f5c4205373d4605132ba9
+_md5_=732dd38396995248f6bcf28db8270051
diff --git a/metadata/md5-cache/dev-perl/Test-Base-0.880.0 b/metadata/md5-cache/dev-perl/Test-Base-0.880.0
index 2ebaf08e71fa..b1deda8eda3f 100644
--- a/metadata/md5-cache/dev-perl/Test-Base-0.880.0
+++ b/metadata/md5-cache/dev-perl/Test-Base-0.880.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Data Driven Testing Framework
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Test-Base/
 IUSE=test
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Filter >=dev-perl/Spiffy-0.400.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Test-Base-0.88.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=d80358a065200bef3daae565a0ba37e9
+_md5_=054b3bcc9fc349a65f2339f8dc54d01a
diff --git a/metadata/md5-cache/dev-perl/Test-Command-0.110.0 b/metadata/md5-cache/dev-perl/Test-Command-0.110.0
index 724d7787576b..f64468f0fa06 100644
--- a/metadata/md5-cache/dev-perl/Test-Command-0.110.0
+++ b/metadata/md5-cache/dev-perl/Test-Command-0.110.0
@@ -3,11 +3,11 @@ DEPEND=>=virtual/perl-Test-Simple-0.620.0 dev-perl/Module-Build dev-lang/perl:=
 DESCRIPTION=Test routines for external commands
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test-Command/
-KEYWORDS=alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Test-Simple-0.620.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBOO/Test-Command-0.11.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	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=79d0570af7e37261870f5e1d4e56253d
+_md5_=beedaad8b36322838d13d353299c02f4
diff --git a/metadata/md5-cache/dev-perl/Test-Differences-0.640.0 b/metadata/md5-cache/dev-perl/Test-Differences-0.640.0
index a5608dedae41..359c2e4e97c6 100644
--- a/metadata/md5-cache/dev-perl/Test-Differences-0.640.0
+++ b/metadata/md5-cache/dev-perl/Test-Differences-0.640.0
@@ -4,11 +4,11 @@ DESCRIPTION=Test strings and data structures and show differences if not ok
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test-Differences/
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Text-Diff-1.430.0 >=virtual/perl-Data-Dumper-2.126.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.64.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	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=c4838d66b00cbe4d0034d5b4eaf07705
+_md5_=5a6f3dcd684cf55fa31d19d7fc292292
diff --git a/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0 b/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0
index 0098bb2ae67f..03756b91be22 100644
--- a/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0
+++ b/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0
@@ -4,11 +4,11 @@ DESCRIPTION=Author test that validates a package MANIFEST
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Test-DistManifest/
 IUSE=test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-ExtUtils-Manifest virtual/perl-File-Spec >=dev-perl/Module-Manifest-0.70.0 virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-DistManifest-1.014.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=158634f37f67f41c765c40aeff17c47c
+_md5_=8ddd6e538fa1241ec7dab4d7f473197a
diff --git a/metadata/md5-cache/dev-perl/Test-LongString-0.170.0 b/metadata/md5-cache/dev-perl/Test-LongString-0.170.0
index c0843f1f4f74..99a6d8dbc6c8 100644
--- a/metadata/md5-cache/dev-perl/Test-LongString-0.170.0
+++ b/metadata/md5-cache/dev-perl/Test-LongString-0.170.0
@@ -4,11 +4,11 @@ DESCRIPTION=A library to test long strings
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Test-LongString/
 IUSE=test
-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=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RG/RGARCIA/Test-LongString-0.17.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=bc79148423daef55b1f59955ff2ca086
+_md5_=ebb62863cee5464d0f493823f0705822
diff --git a/metadata/md5-cache/dev-perl/Test-Memory-Cycle-1.60.0 b/metadata/md5-cache/dev-perl/Test-Memory-Cycle-1.60.0
index 792de8ea6aca..7626041aa51e 100644
--- a/metadata/md5-cache/dev-perl/Test-Memory-Cycle-1.60.0
+++ b/metadata/md5-cache/dev-perl/Test-Memory-Cycle-1.60.0
@@ -3,11 +3,11 @@ DEPEND=>=dev-perl/Devel-Cycle-1.70.0 virtual/perl-Getopt-Long dev-perl/PadWalker
 DESCRIPTION=Check for memory leaks and circular memory references
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test-Memory-Cycle/
-KEYWORDS=alpha amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Devel-Cycle-1.70.0 virtual/perl-Getopt-Long dev-perl/PadWalker >=virtual/perl-Test-Simple-0.620.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Test-Memory-Cycle-1.06.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	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=3ee01eaa8e5f116a19a18254766ba11b
+_md5_=2f664b9ac958f7feb4e6039014c4fae2
diff --git a/metadata/md5-cache/dev-perl/Test-MockObject-1.201.505.270 b/metadata/md5-cache/dev-perl/Test-MockObject-1.201.505.270
index de4a8f798e57..8e1af06b8a7b 100644
--- a/metadata/md5-cache/dev-perl/Test-MockObject-1.201.505.270
+++ b/metadata/md5-cache/dev-perl/Test-MockObject-1.201.505.270
@@ -4,11 +4,11 @@ DESCRIPTION=Perl extension for emulating troublesome interfaces
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Test-MockObject/
 IUSE=test
-KEYWORDS=amd64 ~arm ~ppc ~x86 ~ppc-aix
+KEYWORDS=amd64 ~arm ~ppc x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils >=dev-perl/UNIVERSAL-isa-1.201.106.140 >=dev-perl/UNIVERSAL-can-1.201.106.170 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.20150527.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=e041e4c0cbca17cbfbf008b4cd9394e6
+_md5_=72fcb7d0c3328816a27c22f48f37991c
diff --git a/metadata/md5-cache/dev-perl/Test-Number-Delta-1.60.0 b/metadata/md5-cache/dev-perl/Test-Number-Delta-1.60.0
index ba45d82025a7..9d96033f8420 100644
--- a/metadata/md5-cache/dev-perl/Test-Number-Delta-1.60.0
+++ b/metadata/md5-cache/dev-perl/Test-Number-Delta-1.60.0
@@ -4,11 +4,11 @@ DESCRIPTION=Compare the difference between numbers against a given tolerance
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test-Number-Delta/
 IUSE=test minimal
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Test-Simple dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Number-Delta-1.06.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	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=a6797200a661efcbe6f18c8983c6bf8e
+_md5_=9a052c6ea21baed955535c6ad3e7dfc4
diff --git a/metadata/md5-cache/dev-perl/Test-Requires-0.100.0 b/metadata/md5-cache/dev-perl/Test-Requires-0.100.0
index c3adf4c8b76f..68dfb26b7107 100644
--- a/metadata/md5-cache/dev-perl/Test-Requires-0.100.0
+++ b/metadata/md5-cache/dev-perl/Test-Requires-0.100.0
@@ -3,11 +3,11 @@ DEPEND=>=virtual/perl-Test-Simple-0.470.0 >=virtual/perl-ExtUtils-MakeMaker-6.64
 DESCRIPTION=Checks to see if the module can be loaded
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test-Requires/
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Test-Simple-0.470.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-Requires-0.10.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	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=2c58c3bd26e7b6ffedd48b36a8e33d42
+_md5_=a878e9d8cd4d3c5708229558a82a2a78
diff --git a/metadata/md5-cache/dev-perl/Test-Script-1.100.0 b/metadata/md5-cache/dev-perl/Test-Script-1.100.0
index c0e1b8cc0e8f..f4d20f820f7d 100644
--- a/metadata/md5-cache/dev-perl/Test-Script-1.100.0
+++ b/metadata/md5-cache/dev-perl/Test-Script-1.100.0
@@ -3,11 +3,11 @@ DEPEND=>=virtual/perl-File-Spec-0.800.0 >=dev-perl/Probe-Perl-0.10.0 >=dev-perl/
 DESCRIPTION=Cross-platform basic tests for scripts
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test-Script/
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Spec-0.800.0 >=dev-perl/Probe-Perl-0.10.0 >=dev-perl/IPC-Run3-0.34.0 >=virtual/perl-Test-Simple-0.960.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Test-Script-1.10.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	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=caf8961f87251e38fd65e95dbefd57b8
+_md5_=fecc22cbac0f5bcb79ed8f96c57fddcc
diff --git a/metadata/md5-cache/dev-perl/Test-SharedFork-0.350.0 b/metadata/md5-cache/dev-perl/Test-SharedFork-0.350.0
index 4a681f79f2a2..5855d49f9d66 100644
--- a/metadata/md5-cache/dev-perl/Test-SharedFork-0.350.0
+++ b/metadata/md5-cache/dev-perl/Test-SharedFork-0.350.0
@@ -4,11 +4,11 @@ DESCRIPTION=fork test
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test-SharedFork/
 IUSE=test
-KEYWORDS=alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Temp >=virtual/perl-Test-Simple-0.880.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Test-SharedFork-0.35.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	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=9b4340d15e5374ea7f9b376bc5317f70
+_md5_=cc034bf5f403a353ac285dab7d1d9c6f
diff --git a/metadata/md5-cache/dev-perl/Test-Spec-0.510.0 b/metadata/md5-cache/dev-perl/Test-Spec-0.510.0
index f5c7b6cdb8b2..be4c042b0194 100644
--- a/metadata/md5-cache/dev-perl/Test-Spec-0.510.0
+++ b/metadata/md5-cache/dev-perl/Test-Spec-0.510.0
@@ -3,11 +3,11 @@ DEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils >=
 DESCRIPTION=Write tests in a declarative specification style
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Test-Spec/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils >=dev-perl/Package-Stash-0.230.0 virtual/perl-Test-Harness >=dev-perl/Test-Deep-0.103.0 >=virtual/perl-Test-Simple-0.880.0 dev-perl/Test-Trap dev-perl/Tie-IxHash dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDYJONES/Test-Spec-0.51.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=38833fbf62745e49eee8325b8d06e059
+_md5_=848deb6fe4f3f28816547ddc6e60dfe0
diff --git a/metadata/md5-cache/dev-perl/Test-Warn-0.300.0-r1 b/metadata/md5-cache/dev-perl/Test-Warn-0.300.0-r1
index a4c32df8a5b4..8da0afaa74b4 100644
--- a/metadata/md5-cache/dev-perl/Test-Warn-0.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-Warn-0.300.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Perl extension to test methods for warnings
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Test-Warn/
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Carp-1.220.0 >=dev-perl/Sub-Uplevel-0.12 >=virtual/perl-Test-Simple-0.880.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Test-Warn-0.30.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	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=3953d659b5cb9b7db297e27a8ec86979
+_md5_=7e3cc67fdd82e1544596575420ea15eb
diff --git a/metadata/md5-cache/dev-perl/Text-Diff-1.440.0 b/metadata/md5-cache/dev-perl/Text-Diff-1.440.0
index d79409f24cde..8d4ba5b49054 100644
--- a/metadata/md5-cache/dev-perl/Text-Diff-1.440.0
+++ b/metadata/md5-cache/dev-perl/Text-Diff-1.440.0
@@ -3,11 +3,11 @@ DEPEND=>=dev-perl/Algorithm-Diff-1.190.0 virtual/perl-Exporter virtual/perl-ExtU
 DESCRIPTION=Perform diffs on files and record sets
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Text-Diff/
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Algorithm-Diff-1.190.0 virtual/perl-Exporter dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Text-Diff-1.44.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	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=b54aa4268003880901bd0bba53f9d1d4
+_md5_=b5f27504c9cf5de6136dbe08fe870dca
diff --git a/metadata/md5-cache/dev-php/pecl-imagick-3.4.1 b/metadata/md5-cache/dev-php/pecl-imagick-3.4.1
index d1bc5b990b5d..5302226afb1e 100644
--- a/metadata/md5-cache/dev-php/pecl-imagick-3.4.1
+++ b/metadata/md5-cache/dev-php/pecl-imagick-3.4.1
@@ -4,7 +4,7 @@ DESCRIPTION=PHP wrapper for the ImageMagick library
 EAPI=5
 HOMEPAGE=http://pecl.php.net/imagick
 IUSE=examples test php_targets_php5-5 php_targets_php5-6 php_targets_php7-0
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PHP-3.01
 RDEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 )
 REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-6 php_targets_php7-0 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://pecl.php.net/get/imagick-3.4.1.tgz
 _eclass_exported_funcs=src_unpack:php-ext-source-r2 src_prepare:php-ext-source-r2 src_configure:php-ext-source-r2 src_compile:php-ext-pecl-r2 src_test:php-ext-pecl-r2 src_install:php-ext-pecl-r2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	php-ext-pecl-r2	738a8315cc641f854af2e615c618e70b	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=f718931ab7ba12a90e8c0d1e11ba1cfa
+_md5_=ec4d00e9d3303b2f6ece37f02c0cf6a7
diff --git a/metadata/md5-cache/dev-python/cffi-1.5.2 b/metadata/md5-cache/dev-python/cffi-1.5.2
index 2e0f1d43a69e..20cbb7622139 100644
--- a/metadata/md5-cache/dev-python/cffi-1.5.2
+++ b/metadata/md5-cache/dev-python/cffi-1.5.2
@@ -4,7 +4,7 @@ DESCRIPTION=Foreign Function Interface for Python calling C code
 EAPI=6
 HOMEPAGE=http://cffi.readthedocs.org/ https://pypi.python.org/pypi/cffi
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=virtual/libffi dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-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_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0/1.5.2
 SRC_URI=mirror://pypi/c/cffi/cffi-1.5.2.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	3a17743abcc9335483329f33c87b472d	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=55e1cbdc7687eaa492a52456e28348d4
+_md5_=a4f31ab0d156037cdfe1408fb543ac30
diff --git a/metadata/md5-cache/dev-python/glance_store-0.9.2 b/metadata/md5-cache/dev-python/glance_store-0.9.2
index 0a4c8021441f..377793c4da05 100644
--- a/metadata/md5-cache/dev-python/glance_store-0.9.2
+++ b/metadata/md5-cache/dev-python/glance_store-0.9.2
@@ -4,7 +4,7 @@ DESCRIPTION=A connection pool for python-ldap
 EAPI=5
 HOMEPAGE=https://launchpad.net/oslo
 IUSE=+cinder +swift python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-utils-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.17.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] cinder? ( >=dev-python/python-cinderclient-1.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) swift? ( >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-cinderclient-1.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/g/glance_store/glance_store-0.9.2.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	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=92de04bb26dbe051d40f68a0de2b528a
+_md5_=c8705a17ce722f3fd1d6dec19f85ecde
diff --git a/metadata/md5-cache/dev-python/lxml-3.5.0 b/metadata/md5-cache/dev-python/lxml-3.5.0
index ce88e4550b99..28f49b59c4f6 100644
--- a/metadata/md5-cache/dev-python/lxml-3.5.0
+++ b/metadata/md5-cache/dev-python/lxml-3.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
 EAPI=5
 HOMEPAGE=http://lxml.de/ https://pypi.python.org/pypi/lxml/
 IUSE=doc examples +threads test python_targets_python2_7 python_targets_python3_3 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 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 ~x64-solaris ~x86-solaris
 LICENSE=BSD ElementTree GPL-2 PSF-2
 RDEPEND=>=dev-libs/libxml2-2.9.2 >=dev-libs/libxslt-1.1.28 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/l/lxml/lxml-3.5.0.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	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=8c9b625ec83c78db34ce4ea350f47cbc
+_md5_=6234a7a561b12b1a4ae1891b2567128f
diff --git a/metadata/md5-cache/dev-python/pretty-yaml-15.6.3 b/metadata/md5-cache/dev-python/pretty-yaml-15.6.3
index 2c5b9878c340..13400f610eab 100644
--- a/metadata/md5-cache/dev-python/pretty-yaml-15.6.3
+++ b/metadata/md5-cache/dev-python/pretty-yaml-15.6.3
@@ -4,7 +4,7 @@ DESCRIPTION=PyYAML-based module to produce pretty and readable YAML-serialized d
 EAPI=5
 HOMEPAGE=https://github.com/mk-fg/pretty-yaml
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 arm ~x86
+KEYWORDS=amd64 arm x86
 LICENSE=WTFPL-2
 RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-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_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/p/pyaml/pyaml-15.6.3.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	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=280b5c30e43a3bcf9f2a3b70de4c871b
+_md5_=36613283e72a46bb4e4f05af674b1d25
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.73 b/metadata/md5-cache/dev-python/pycups-1.9.73
index fbed922bee29..1d78c1ba6bb2 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.73
+++ b/metadata/md5-cache/dev-python/pycups-1.9.73
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings for the CUPS API
 EAPI=5
 HOMEPAGE=http://cyberelk.net/tim/data/pycups/
 IUSE=doc examples python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86
 LICENSE=GPL-2
 RDEPEND=net-print/cups python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/p/pycups/pycups-1.9.73.tar.bz2
 _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	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=c7ff5b0494e00287fb0c8b612e39458c
+_md5_=0b4345e805cd2e6e1fe56a3581f1f77f
diff --git a/metadata/md5-cache/dev-python/pygal-2.1.1 b/metadata/md5-cache/dev-python/pygal-2.1.1
index fd2f1fc47d67..7007bd20e1da 100644
--- a/metadata/md5-cache/dev-python/pygal-2.1.1
+++ b/metadata/md5-cache/dev-python/pygal-2.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=A python SVG charts generator
 EAPI=5
 HOMEPAGE=http://pygal.org/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-3+
 RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] media-gfx/cairosvg[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-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_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/p/pygal/pygal-2.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	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=4f4edb08c9cf7d98cb58c476ab455275
+_md5_=c276b038abf59f86dfec03bccc324f36
diff --git a/metadata/md5-cache/dev-python/pytest-2.8.7 b/metadata/md5-cache/dev-python/pytest-2.8.7
index 5761bfff8948..f80223358802 100644
--- a/metadata/md5-cache/dev-python/pytest-2.8.7
+++ b/metadata/md5-cache/dev-python/pytest-2.8.7
@@ -4,7 +4,7 @@ DESCRIPTION=Simple powerful testing with Python
 EAPI=5
 HOMEPAGE=http://pytest.org/ https://pypi.python.org/pypi/pytest
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/py-1.4.29[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,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_3(-),-python_single_target_python3_4(-),-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_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,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_3(-),-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_3 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-2.8.7.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	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=3ca825a9cc8abb1e75a2126fef109946
+_md5_=56918991e749564df21fae8f578a54db
diff --git a/metadata/md5-cache/dev-python/python-glanceclient-1.1.1 b/metadata/md5-cache/dev-python/python-glanceclient-1.1.1
index adc65fc27c8e..ca8ce6734940 100644
--- a/metadata/md5-cache/dev-python/python-glanceclient-1.1.1
+++ b/metadata/md5-cache/dev-python/python-glanceclient-1.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=A client for the OpenStack Glance API
 EAPI=5
 HOMEPAGE=https://github.com/openstack/python-glanceclient
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-1.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/warlock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/warlock-2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/oslo-utils-2.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/p/python-glanceclient/python-glanceclient-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	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=b46628abc804bc7543ab7e40316817c0
+_md5_=41f0ea0dd038198c10975394d5f76a00
diff --git a/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.6 b/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.6
index 19c37fc35c36..9c52c511a790 100644
--- a/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.6
+++ b/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.6
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings for the MusicBrainz NGS and the Cover Art Archive we
 EAPI=5
 HOMEPAGE=https://github.com/alastair/python-musicbrainzngs
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2 ISC
 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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/alastair/python-musicbrainzngs/archive/v0.6.tar.gz -> python-musicbrainzngs0.6.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	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=ab39930fc27a3de7d4721a85762a0339
+_md5_=3439e185b7aa622778924e7da8047503
diff --git a/metadata/md5-cache/dev-python/tinycss-0.3 b/metadata/md5-cache/dev-python/tinycss-0.3
index 4cdae30ec863..c43cfccbbd13 100644
--- a/metadata/md5-cache/dev-python/tinycss-0.3
+++ b/metadata/md5-cache/dev-python/tinycss-0.3
@@ -4,7 +4,7 @@ DESCRIPTION=A complete yet simple CSS parser for Python
 EAPI=5
 HOMEPAGE=https://github.com/SimonSapin/tinycss/ http://packages.python.org/tinycss/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-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_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/t/tinycss/tinycss-0.3.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	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=9ccf6ba8f95021c97c02dbd17174294e
+_md5_=467e5412602b8c7ee4332d35ebf45390
diff --git a/metadata/md5-cache/dev-python/wheel-0.29.0 b/metadata/md5-cache/dev-python/wheel-0.29.0
index b0a02c8691bf..2b0fba09e9f8 100644
--- a/metadata/md5-cache/dev-python/wheel-0.29.0
+++ b/metadata/md5-cache/dev-python/wheel-0.29.0
@@ -4,7 +4,7 @@ DESCRIPTION=A built-package format for Python
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/wheel
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/jsonschema[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,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_3(-),-python_single_target_python3_4(-),-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_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,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_3(-),-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_3 python_targets_python3_4 python_targets_python3_5 )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=mirror://pypi/w/wheel/wheel-0.29.0.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	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=08ad835e40bc2a205c6d007b757b718a
+_md5_=d502bbfefb6e2cd9ef8513972c40fcbe
diff --git a/metadata/md5-cache/dev-python/xcffib-0.4.0 b/metadata/md5-cache/dev-python/xcffib-0.4.0
index 66a09cfc598f..bb5c1010ced7 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.4.0
+++ b/metadata/md5-cache/dev-python/xcffib-0.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=A drop in replacement for xpyb, an XCB python binding
 EAPI=5
 HOMEPAGE=https://github.com/tych0/xcffib
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_3? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-2.6.0 ) dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] x11-libs/libxcb python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.4.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	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=4bc2abeddbe847a1cac19f3800685193
+_md5_=2e0602d073739a0fe39a7262ef46147c
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1 b/metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1
index b1c5eef1bd7b..f7e4c8cff684 100644
--- a/metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1
+++ b/metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1
@@ -4,7 +4,7 @@ DESCRIPTION=EventMachine is a fast, simple event-processing library for Ruby pro
 EAPI=5
 HOMEPAGE=http://rubyeventmachine.com
 IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 Ruby )
 RDEPEND=dev-libs/openssl:0 ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://rubygems/eventmachine-1.0.9.1.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=83f5790ef5a7b1af7c135f097cf30ffb
+_md5_=0ad8b05f2bd312043944e133b275fe15
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.7.1 b/metadata/md5-cache/dev-ruby/httpclient-2.7.1
index abaa0b4d00fe..57102c45f0d2 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.7.1
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.7.1
@@ -4,7 +4,7 @@ DESCRIPTION='httpclient' gives something like the functionality of libwww-perl (
 EAPI=5
 HOMEPAGE=https://github.com/nahi/httpclient
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Ruby
 RDEPEND=!dev-ruby/http-access2 ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/nahi/httpclient/archive/v2.7.1.tar.gz -> httpclient-2.7.1.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	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ca441d9d0501a3b6233e3870dae68b54
+_md5_=1cac9f0be7bef7242ed5039a3750d1cb
diff --git a/metadata/md5-cache/dev-ruby/metaclass-0.0.4 b/metadata/md5-cache/dev-ruby/metaclass-0.0.4
index 7d35dd8fa5a9..098a24beab28 100644
--- a/metadata/md5-cache/dev-ruby/metaclass-0.0.4
+++ b/metadata/md5-cache/dev-ruby/metaclass-0.0.4
@@ -4,7 +4,7 @@ DESCRIPTION=Adds a __metaclass__ method to all Ruby objects
 EAPI=5
 HOMEPAGE=https://github.com/floehopper/metaclass
 IUSE=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? ( 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/floehopper/metaclass/archive/v0.0.4.tar.gz -> metaclass-0.0.4.tar.gz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9a7ef91af0225b326231b87dad5c60cc
+_md5_=3a247440a56c8d394bfda4fc346ace90
diff --git a/metadata/md5-cache/dev-ruby/netrc-0.11.0 b/metadata/md5-cache/dev-ruby/netrc-0.11.0
index 0c484d2838b9..a1e126594f20 100644
--- a/metadata/md5-cache/dev-ruby/netrc-0.11.0
+++ b/metadata/md5-cache/dev-ruby/netrc-0.11.0
@@ -4,7 +4,7 @@ DESCRIPTION=This library reads and writes .netrc files
 EAPI=5
 HOMEPAGE=https://github.com/geemus/netrc
 IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=amd64 ~x86 ~arm
+KEYWORDS=amd64 ~arm 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/netrc-0.11.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	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2280f22b51cefa2ffddaa7dd49214b1e
+_md5_=65c6a1f504fca98c1acd6d70f0e59308
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-3.2.3 b/metadata/md5-cache/dev-ruby/puppetdb-termini-3.2.3
index 093689384d9d..140d2c6a2fe3 100644
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-3.2.3
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-3.2.3
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Library needed to connect puppet to puppetdb
 EAPI=5
 HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/wheezy/PC1/p/puppetdb/puppetdb-termini_3.2.3-1puppetlabs1_all.deb
 _eclass_exported_funcs=src_unpack:unpacker src_install:-
 _eclasses_=unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=d9507c27c96dfbcb6fb31499be8a8c0a
+_md5_=aac44f34c2e7ad00dcf292487ca75ab4
diff --git a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0 b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
index 410f94094174..9910eb6b1f3b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
+++ b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=ruby shadow bindings
 EAPI=5
 HOMEPAGE=https://github.com/apalmblad/ruby-shadow http://ttsky.net
 IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
-KEYWORDS=amd64 ~hppa ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~sparc x86
 LICENSE=Ruby
 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/ruby-shadow-2.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	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=93ae54d2093b3ed2c28dbec66e44aec7
+_md5_=f809a6ed023553ba759104882dac9050
diff --git a/metadata/md5-cache/dev-ruby/serialport-1.3.1 b/metadata/md5-cache/dev-ruby/serialport-1.3.1
index 24cad93e38ef..c189dc8112c2 100644
--- a/metadata/md5-cache/dev-ruby/serialport-1.3.1
+++ b/metadata/md5-cache/dev-ruby/serialport-1.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=a library for serial port (rs232) access in ruby
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/ruby-serialport/
 IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 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/serialport-1.3.1.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=108f7e9b25fb7aff7bee5c63ebfe9427
+_md5_=88d1d4830f7dd6ceacf24d348778043d
diff --git a/metadata/md5-cache/dev-ruby/text-1.3.1 b/metadata/md5-cache/dev-ruby/text-1.3.1
index ca5d47807cb4..fa971b396cee 100644
--- a/metadata/md5-cache/dev-ruby/text-1.3.1
+++ b/metadata/md5-cache/dev-ruby/text-1.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of text algorithms
 EAPI=5
 HOMEPAGE=https://github.com/threedaymonk/text
 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/text-1.3.1.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6a3ef965c7d292145951015e73365542
+_md5_=0c331de680a4f5e8f8aff34dc0a0726c
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-0.3.44 b/metadata/md5-cache/dev-ruby/tzinfo-0.3.44
index 522f4b907406..492d1a8a16b2 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-0.3.44
+++ b/metadata/md5-cache/dev-ruby/tzinfo-0.3.44
@@ -4,7 +4,7 @@ DESCRIPTION=Daylight-savings aware timezone library
 EAPI=5
 HOMEPAGE=http://tzinfo.github.io/
 IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://rubygems/tzinfo-0.3.44.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d9890ec2fa3258028d171b3112c63a83
+_md5_=3b33178b26a394b205953ca57237c882
diff --git a/metadata/md5-cache/dev-scheme/guile-1.8.8-r2 b/metadata/md5-cache/dev-scheme/guile-1.8.8-r2
index 392ee561359e..1f06ccb957ff 100644
--- a/metadata/md5-cache/dev-scheme/guile-1.8.8-r2
+++ b/metadata/md5-cache/dev-scheme/guile-1.8.8-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Scheme interpreter
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/guile/
 IUSE=debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.1:0= dev-libs/libltdl:0= sys-devel/gettext sys-libs/ncurses:0= emacs? ( virtual/emacs ) readline? ( sys-libs/readline:0= )
 RESTRICT=!regex? ( test )
@@ -12,4 +12,4 @@ SLOT=12
 SRC_URI=mirror://gnu/guile/guile-1.8.8.tar.gz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=5bb7b3e58b0f7f6f8a6ffd3d1dbf1373
+_md5_=841da6878ec039653d804e0774016059
diff --git a/metadata/md5-cache/dev-scheme/racket-6.0.1 b/metadata/md5-cache/dev-scheme/racket-6.0.1
index 89d0beaea5d1..f2b759a0f80f 100644
--- a/metadata/md5-cache/dev-scheme/racket-6.0.1
+++ b/metadata/md5-cache/dev-scheme/racket-6.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=General purpose, multi-paradigm programming language in the Lisp-Sch
 EAPI=5
 HOMEPAGE=http://racket-lang.org/
 IUSE=doc +futures +jit minimal +places +threads +X
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-db/sqlite:3 x11-libs/cairo[X?] virtual/libffi
 REQUIRED_USE=futures? ( jit )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=minimal? ( http://download.racket-lang.org/installers/6.0.1/racket-minimal-6.0.1-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/6.0.1/racket-6.0.1-src-builtpkgs.tgz )
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=74f2232fd3776caeb11112faca919d3f
+_md5_=46491925c85cad999564919f028ed0ea
diff --git a/metadata/md5-cache/dev-util/android-tools-5.1.1_p13 b/metadata/md5-cache/dev-util/android-tools-5.1.1_p13
index a5c1c2da0b19..37cf98e92fd9 100644
--- a/metadata/md5-cache/dev-util/android-tools-5.1.1_p13
+++ b/metadata/md5-cache/dev-util/android-tools-5.1.1_p13
@@ -4,11 +4,11 @@ DESCRIPTION=Android platform tools (adb, fastboot, and mkbootimg)
 EAPI=5
 HOMEPAGE=https://android.googlesource.com/platform/system/core.git/
 IUSE=libressl
-KEYWORDS=amd64 ~x86 ~arm-linux ~x86-linux
+KEYWORDS=amd64 x86 ~arm-linux ~x86-linux
 LICENSE=Apache-2.0 BSD-2
 RDEPEND=sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-libs/libpcre
 SLOT=0
 SRC_URI=https://projects.archlinux.org/svntogit/community.git/snapshot/community-caa300cf262afcf5bdb4dcc923dee54e3715fd5c.tar.gz -> android-tools-5.1.1_r13-arch.tar.gz https://github.com/android/platform_system_core/archive/android-5.1.1_r13.tar.gz -> android-tools-5.1.1_r13-core.tar.gz mirror://gentoo/android-tools-5.1.1_r13-extras.tar.gz mirror://gentoo/android-tools-5.1.1_r13-libselinux.tar.gz mirror://gentoo/android-tools-5.1.1_r13-f2fs-tools.tar.gz
 _eclass_exported_funcs=src_unpack:- src_prepare:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=df2d8ff1c85109aa2dd7450bb672a2bf
+_md5_=aabd00e527a9b1d83fc2b763ffb91a91
diff --git a/metadata/md5-cache/dev-util/cmocka-1.0.1 b/metadata/md5-cache/dev-util/cmocka-1.0.1
index b95666ad9fdb..334eefd916e9 100644
--- a/metadata/md5-cache/dev-util/cmocka-1.0.1
+++ b/metadata/md5-cache/dev-util/cmocka-1.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=A unit testing framework for C
 EAPI=5
 HOMEPAGE=http://cmocka.org/
 IUSE=doc 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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://cmocka.org/files/1.0/cmocka-1.0.1.tar.xz
 _eclass_exported_funcs=src_prepare:cmake-utils src_configure:cmake-multilib src_compile:cmake-multilib src_test:cmake-multilib src_install:cmake-multilib
 _eclasses_=cmake-multilib	273c15f5a0a06438a38bb5c3e98fa2db	cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=401bc15466d3a44b5a7ffb24dc60d313
+_md5_=9057571b05e0d9c7f37714c7fb63dce7
diff --git a/metadata/md5-cache/dev-util/geany-1.25 b/metadata/md5-cache/dev-util/geany-1.25
index b253abbf74c0..de327270eb0a 100644
--- a/metadata/md5-cache/dev-util/geany-1.25
+++ b/metadata/md5-cache/dev-util/geany-1.25
@@ -4,11 +4,11 @@ DESCRIPTION=GTK+ based fast and lightweight IDE
 EAPI=5
 HOMEPAGE=http://www.geany.org
 IUSE=gtk3 +vte
-KEYWORDS=alpha amd64 arm ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ HPND
 RDEPEND=>=dev-libs/glib-2.28:2 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) vte? ( x11-libs/vte:0 )
 SLOT=0
 SRC_URI=http://download.geany.org/geany-1.25.tar.bz2
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8650625bb301c54aa564b2b95c02241a
+_md5_=0b7b886782e8e923ddf14517bab33487
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.25 b/metadata/md5-cache/dev-util/geany-plugins-1.25
index 0f03165f047a..98565395686b 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.25
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.25
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of different plugins for Geany
 EAPI=5
 HOMEPAGE=http://plugins.geany.org/geany-plugins
 IUSE=+autoclose +automark +commander ctags debugger +defineformat devhelp enchant git gpg gtkspell lua markdown multiterm nls +overview python scope soup webkit python_targets_python2_7
-KEYWORDS=alpha amd64 arm ia64 ~ppc ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm ia64 ~ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-util/geany-1.25 autoclose? ( x11-libs/gtk+:2 ) commander? ( x11-libs/gtk+:2 ) defineformat? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 dev-util/geany[-gtk3] ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) git? ( <dev-libs/libgit2-0.23.0 ) gtkspell? ( app-text/gtkspell:2 ) lua? ( =dev-lang/lua-5.1*:= ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.32 dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) scope? ( sys-devel/gdb )
 REQUIRED_USE=python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://plugins.geany.org/geany-plugins/geany-plugins-1.25.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_configure:- src_compile:autotools-utils src_test:autotools-utils src_install:autotools-utils
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	vala	7541b78609c301de4ea866a8cc1b53a6	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e5dcf5327c18cec3811f7a406ebc6bec
+_md5_=876b54886cc27fc368a89fd840e7aa6b
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2016.1.3 b/metadata/md5-cache/dev-util/pycharm-community-2016.1.3
index 755300072e76..72a5278586aa 100644
--- a/metadata/md5-cache/dev-util/pycharm-community-2016.1.3
+++ b/metadata/md5-cache/dev-util/pycharm-community-2016.1.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
 EAPI=5
 HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=amd64
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
 RDEPEND=>=virtual/jre-1.8
 RESTRICT=mirror strip
@@ -10,4 +10,4 @@ SLOT=0
 SRC_URI=http://download.jetbrains.com/python/pycharm-community-2016.1.3.tar.gz
 _eclass_exported_funcs=pkg_postinst:readme.gentoo src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=da9cef8487143c2a33cbba37e347dde8
+_md5_=e5cf5998635a1d2062f078c203641ad0
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2016.1.3 b/metadata/md5-cache/dev-util/pycharm-professional-2016.1.3
index 8505a05e8233..d232bfbc4549 100644
--- a/metadata/md5-cache/dev-util/pycharm-professional-2016.1.3
+++ b/metadata/md5-cache/dev-util/pycharm-professional-2016.1.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
 EAPI=5
 HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
 RDEPEND=>=virtual/jre-1.8 dev-python/pip
 RESTRICT=mirror strip
@@ -10,4 +10,4 @@ SLOT=0
 SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2016.1.3.tar.gz
 _eclass_exported_funcs=pkg_postinst:readme.gentoo src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=9abbe393277e007ccf10835754b4d88e
+_md5_=49085b2cb115c809be81491008095a04
diff --git a/metadata/md5-cache/dev-util/xxdiff-4.0_beta1_p20110426-r1 b/metadata/md5-cache/dev-util/xxdiff-4.0_beta1_p20110426-r1
index 398bb46054fc..71f8f813d024 100644
--- a/metadata/md5-cache/dev-util/xxdiff-4.0_beta1_p20110426-r1
+++ b/metadata/md5-cache/dev-util/xxdiff-4.0_beta1_p20110426-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A graphical file and directories comparator and merge tool
 EAPI=5
 HOMEPAGE=http://furius.ca/xxdiff/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:4 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://gentoo/xxdiff-4.0_beta1_p20110426.tar.bz2
 _eclass_exported_funcs=src_unpack:qt4-r2 src_prepare:- src_configure:- src_compile:- src_test:distutils-r1 src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	distutils-r1	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=0c25ed70ced2ae1db94cf5854c9e6bd2
+_md5_=584388b1915b442188fe0e74e09e330e
diff --git a/metadata/md5-cache/dev-vcs/fossil-1.34 b/metadata/md5-cache/dev-vcs/fossil-1.34
index f7d30d5166bd..c51925946b42 100644
--- a/metadata/md5-cache/dev-vcs/fossil-1.34
+++ b/metadata/md5-cache/dev-vcs/fossil-1.34
@@ -4,11 +4,11 @@ DESCRIPTION=Simple, high-reliability, source control management, and more
 EAPI=6
 HOMEPAGE=http://www.fossil-scm.org/
 IUSE=debug fusefs json legacy-mv-rm miniz sqlite +ssl static tcl th1-docs th1-hooks
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= )
 SLOT=0
 SRC_URI=http://www.fossil-scm.org/download/fossil-src-1.34.tar.gz
 _eclass_exported_funcs=src_configure:- src_install:-
 _eclasses_=multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=3147c132c9be0118e7a2db379b123ab3
+_md5_=ee171acf7180b790791d452ff30340ee
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.8.5 b/metadata/md5-cache/dev-vcs/hg-git-0.8.5
index 948b77bd22d7..30109ca1d3e1 100644
--- a/metadata/md5-cache/dev-vcs/hg-git-0.8.5
+++ b/metadata/md5-cache/dev-vcs/hg-git-0.8.5
@@ -4,7 +4,7 @@ DESCRIPTION=push to and pull from a Git repository using Mercurial
 EAPI=5
 HOMEPAGE=http://hg-git.github.io https://pypi.python.org/pypi/hg-git
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-vcs/mercurial-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dulwich-0.9.7[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/h/hg-git/hg-git-0.8.5.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	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=32b757d6be9f29c2c4b54e4a73bd70e9
+_md5_=eb3091d612c0e555d325ad2e430321d9
diff --git a/metadata/md5-cache/dev-vcs/hgsubversion-1.8.5 b/metadata/md5-cache/dev-vcs/hgsubversion-1.8.5
index bad7a6ef77fb..a4daecf29819 100644
--- a/metadata/md5-cache/dev-vcs/hgsubversion-1.8.5
+++ b/metadata/md5-cache/dev-vcs/hgsubversion-1.8.5
@@ -4,7 +4,7 @@ DESCRIPTION=hgsubversion is a Mercurial extension for working with Subversion re
 EAPI=5
 HOMEPAGE=https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.python.org/pypi/hgsubversion
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=amd64 x86 ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-vcs/mercurial-1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/mercurial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( >=dev-python/subvertpy-0.7.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/subversion-1.5[python] ) 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/h/hgsubversion/hgsubversion-1.8.5.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	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=705acec93471a51857f16e2a014334f8
+_md5_=3352d52e4b98ec260e8bddb1ba9eaa1e
diff --git a/metadata/md5-cache/dev-vcs/rapidsvn-0.12.1-r3 b/metadata/md5-cache/dev-vcs/rapidsvn-0.12.1-r3
index 56fc536401cc..49c8deef9b72 100644
--- a/metadata/md5-cache/dev-vcs/rapidsvn-0.12.1-r3
+++ b/metadata/md5-cache/dev-vcs/rapidsvn-0.12.1-r3
@@ -4,7 +4,7 @@ DESCRIPTION=Cross-platform GUI front-end for the Subversion revision system
 EAPI=5
 HOMEPAGE=http://rapidsvn.tigris.org/
 IUSE=doc static-libs python_targets_python2_7
-KEYWORDS=amd64 arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1 FDL-1.2
 RDEPEND=>=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-libs/apr dev-libs/apr-util dev-vcs/subversion x11-libs/wxGTK:3.0[X]
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://www.rapidsvn.org/download/release/0.12.1/rapidsvn-0.12.1.tar.gz doc? ( https://dev.gentoo.org/~jlec/distfiles/svncpp.dox.xz )
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:python-single-r1 src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
-_md5_=70c1882aae7b932891c7d67541b0a6b2
+_md5_=3633600dd48e898f6f5d168d1db8b3cb
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-3.7.3 b/metadata/md5-cache/dev-vcs/tortoisehg-3.7.3
index 99684f345116..34ea2086169b 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-3.7.3
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-3.7.3
@@ -4,7 +4,7 @@ DESCRIPTION=Set of graphical tools for Mercurial
 EAPI=6
 HOMEPAGE=https://tortoisehg.bitbucket.org
 IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-vcs/mercurial-3.6 <dev-vcs/mercurial-3.8 dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qscintilla-python[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://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-3.7.3.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	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=8e9139d1b9b81d5a402c9b7ef95c2ecf
+_md5_=a6da29709f48385ef204a8942f349678
diff --git a/metadata/md5-cache/games-action/armagetronad-0.2.8.3.3 b/metadata/md5-cache/games-action/armagetronad-0.2.8.3.3
index 948a2963da01..c5b9faeeb710 100644
--- a/metadata/md5-cache/games-action/armagetronad-0.2.8.3.3
+++ b/metadata/md5-cache/games-action/armagetronad-0.2.8.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=Fast-paced 3D lightcycle game based on Tron
 EAPI=5
 HOMEPAGE=http://armagetronad.org/
 IUSE=dedicated sound
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libxml2 !dedicated? ( media-libs/libpng:0 media-libs/sdl-image[jpeg,png] virtual/glu virtual/opengl media-libs/libsdl[X,opengl,video] sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer ) ) games-misc/games-envd
 SLOT=0
 SRC_URI=https://launchpad.net/armagetronad/0.2.8/0.2.8.3.x/+download/armagetronad-0.2.8.3.3.src.tar.bz2
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:games src_unpack:base src_prepare:- src_configure:- src_compile:games src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fa90194e5f08ffe06e19ddf905df2385
+_md5_=c8ed217dac6bc9457707a67b20309652
diff --git a/metadata/md5-cache/games-action/extreme-tuxracer-0.7.2 b/metadata/md5-cache/games-action/extreme-tuxracer-0.7.2
index 4a2a9dcebdc1..c387ddcb9b48 100644
--- a/metadata/md5-cache/games-action/extreme-tuxracer-0.7.2
+++ b/metadata/md5-cache/games-action/extreme-tuxracer-0.7.2
@@ -3,11 +3,11 @@ DEPEND=virtual/opengl virtual/glu >=media-libs/libsfml-2.2 virtual/pkgconfig !<s
 DESCRIPTION=High speed arctic racing game based on Tux Racer
 EAPI=5
 HOMEPAGE=http://extremetuxracer.sourceforge.net/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=virtual/opengl virtual/glu >=media-libs/libsfml-2.2 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/extremetuxracer/etr-0.7.2.tar.xz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:games src_unpack:base src_prepare:- src_configure:games src_compile:games src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=09b45c1934fee236194015959125a413
+_md5_=169a395e1ee78d864b3b242db812e715
diff --git a/metadata/md5-cache/games-arcade/commandergenius-1.8.3 b/metadata/md5-cache/games-arcade/commandergenius-1.8.3
index 7782e5c35b90..34d9fd7c1cbb 100644
--- a/metadata/md5-cache/games-arcade/commandergenius-1.8.3
+++ b/metadata/md5-cache/games-arcade/commandergenius-1.8.3
@@ -4,7 +4,7 @@ DESCRIPTION=Open Source Commander Keen clone (needs original game files)
 EAPI=5
 HOMEPAGE=http://clonekeenplus.sourceforge.net
 IUSE=opengl tremor
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl2[X,opengl?,sound,video] media-libs/sdl2-image opengl? ( virtual/opengl ) tremor? ( media-libs/tremor ) !tremor? ( media-libs/libvorbis ) games-misc/games-envd
 RESTRICT=mirror
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/gerstrong/Commander-Genius/archive/v183release.tar.gz -> commandergenius-1.8.3.tar.gz
 _eclass_exported_funcs=pkg_preinst:games pkg_postinst:- pkg_setup:games src_unpack:base src_prepare:- src_configure:- src_compile:- src_test:cmake-utils src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0f2b46f6fefe08e8dcfcab878a2f65c9
+_md5_=a5984178ab56445de36b239ec58c1ca3
diff --git a/metadata/md5-cache/games-arcade/lbreakout2-2.6.5 b/metadata/md5-cache/games-arcade/lbreakout2-2.6.5
index 1da6bc824999..12e6682cf0a2 100644
--- a/metadata/md5-cache/games-arcade/lbreakout2-2.6.5
+++ b/metadata/md5-cache/games-arcade/lbreakout2-2.6.5
@@ -4,11 +4,11 @@ DESCRIPTION=Breakout clone written with the SDL library
 EAPI=5
 HOMEPAGE=http://lgames.sourceforge.net/index.php?project=LBreakout2
 IUSE=nls themes
-KEYWORDS=amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0 sys-libs/zlib media-libs/libsdl[sound,joystick,video] media-libs/sdl-net media-libs/sdl-mixer nls? ( virtual/libintl ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/lgames/lbreakout2-2.6.5.tar.gz mirror://sourceforge/lgames/add-ons/lbreakout2/lbreakout2-levelsets-20141220.tar.gz themes? ( mirror://sourceforge/lgames/add-ons/lbreakout2/lbreakout2-themes-20141220.tar.gz )
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:games src_unpack:- src_prepare:- src_configure:- src_compile:games src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0ee452d009cda5b78ba8a567eb153f6f
+_md5_=471a09a1292b18671eabd5bc146ea80d
diff --git a/metadata/md5-cache/games-arcade/performous-1.1 b/metadata/md5-cache/games-arcade/performous-1.1
index d261d5f1030f..898a8d26b214 100644
--- a/metadata/md5-cache/games-arcade/performous-1.1
+++ b/metadata/md5-cache/games-arcade/performous-1.1
@@ -4,11 +4,11 @@ DESCRIPTION=SingStar GPL clone
 EAPI=5
 HOMEPAGE=https://performous.org/
 IUSE=midi songs tools webcam
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 songs? ( CC-BY-NC-SA-2.5 CC-BY-NC-ND-2.5 )
 RDEPEND=dev-cpp/glibmm dev-cpp/libxmlpp media-libs/portaudio dev-libs/boost[threads(+)] dev-libs/glib:2 dev-libs/libxml2 gnome-base/librsvg media-gfx/imagemagick virtual/jpeg:0 media-libs/libpng:0 media-libs/libsdl2[joystick,video] virtual/ffmpeg virtual/opengl virtual/glu sys-libs/zlib virtual/libintl x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango media-libs/libepoxy midi? ( media-libs/portmidi ) webcam? ( media-libs/opencv ) games-misc/games-envd
 SLOT=0
 SRC_URI=https://github.com/performous/performous/archive/1.1.tar.gz -> performous-1.1.tar.gz songs? ( mirror://sourceforge/performous/ultrastar-songs-restricted-3.zip mirror://sourceforge/performous/ultrastar-songs-jc-1.zip mirror://sourceforge/performous/ultrastar-songs-libre-3.zip mirror://sourceforge/performous/ultrastar-songs-shearer-1.zip )
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:games src_unpack:base src_prepare:- src_configure:- src_compile:- src_test:cmake-utils src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7bab6c9531874f1be2971a9028b0aded
+_md5_=a3b521860859e53c7004fe5ea79f7d6d
diff --git a/metadata/md5-cache/games-board/freedoko-0.7.14 b/metadata/md5-cache/games-board/freedoko-0.7.14
index 336faadc13be..155582c4aa79 100644
--- a/metadata/md5-cache/games-board/freedoko-0.7.14
+++ b/metadata/md5-cache/games-board/freedoko-0.7.14
@@ -4,11 +4,11 @@ DESCRIPTION=FreeDoko is a Doppelkopf-game
 EAPI=5
 HOMEPAGE=http://free-doko.sourceforge.net
 IUSE=+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds net
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=net? ( net-libs/gnet dev-libs/glib:2 ) >=dev-cpp/gtkmm-2.4:2.4 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/free-doko/FreeDoko_0.7.14.src.zip backgrounds? ( mirror://sourceforge/free-doko/backgrounds.zip -> freedoko-backgrounds.zip ) kdecards? ( mirror://sourceforge/free-doko/kdecarddecks.zip ) xskatcards? ( mirror://sourceforge/free-doko/xskat.zip ) pysolcards? ( mirror://sourceforge/free-doko/pysol.zip ) gnomecards? ( mirror://sourceforge/free-doko/gnome-games.zip ) openclipartcards? ( mirror://sourceforge/free-doko/openclipart.zip ) !xskatcards? ( !kdecards? ( !gnomecards? ( !openclipartcards? ( !pysolcards? ( mirror://sourceforge/free-doko/xskat.zip ) ) ) ) )
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:games src_unpack:- src_prepare:- src_configure:games src_compile:- src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8ed28c73cc7617aaae8a4cd7d9c9bfb6
+_md5_=bacee2ee1848edded7fd02eae880f1f0
diff --git a/metadata/md5-cache/games-board/pokerth-1.1.1-r1 b/metadata/md5-cache/games-board/pokerth-1.1.1-r1
index 8bef52e834b3..2a37a2ead12c 100644
--- a/metadata/md5-cache/games-board/pokerth-1.1.1-r1
+++ b/metadata/md5-cache/games-board/pokerth-1.1.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Texas Hold'em poker game
 EAPI=5
 HOMEPAGE=http://www.pokerth.net/
 IUSE=dedicated
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain
 RDEPEND=dev-db/sqlite:3 dev-libs/boost:=[threads(+)] dev-libs/protobuf dev-libs/libgcrypt:0 dev-libs/tinyxml[stl] >=net-libs/libircclient-1.6-r2 >=net-misc/curl-7.16 dev-qt/qtcore:5 dev-qt/qtnetwork:5 virtual/gsasl !dedicated? ( media-libs/libsdl:0 media-libs/sdl-mixer[mod,vorbis] dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/pokerth/PokerTH-1.1.1-src.tar.bz2
 _eclass_exported_funcs=pkg_preinst:games pkg_postinst:games pkg_setup:games src_unpack:base src_prepare:- src_configure:- src_compile:games src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	d062ae4ba2fc40a19c11de2ad89b6616	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=adf866f79de3524c251d65176c1f7cbe
+_md5_=b683caf13ba83eaf0f4597da5e837c0a
diff --git a/metadata/md5-cache/games-board/pychess-0.12.3 b/metadata/md5-cache/games-board/pychess-0.12.3
index 4bdbf46fa1c8..4f051e1de2d5 100644
--- a/metadata/md5-cache/games-board/pychess-0.12.3
+++ b/metadata/md5-cache/games-board/pychess-0.12.3
@@ -4,7 +4,7 @@ DESCRIPTION=A chess client for Gnome
 EAPI=5
 HOMEPAGE=http://pychess.org/
 IUSE=gstreamer python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-python/librsvg-python x11-libs/gtksourceview:3.0 dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtksourceview:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gstreamer? ( dev-python/gst-python:0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/gconf-python x11-themes/gnome-icon-theme python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] games-misc/games-envd
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://pychess.org/download/pychess-0.12.3.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:games src_unpack:base src_prepare:- src_configure:games src_compile:- src_test:distutils-r1 src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	distutils-r1	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a50a0d63aada251398e7f9b22fd3b3e4
+_md5_=90e978ab60e6e6544263b406d503bac7
diff --git a/metadata/md5-cache/games-emulation/fbzx-3.0.0 b/metadata/md5-cache/games-emulation/fbzx-3.0.0
index 7ab61726ec17..92c7ddbc0126 100644
--- a/metadata/md5-cache/games-emulation/fbzx-3.0.0
+++ b/metadata/md5-cache/games-emulation/fbzx-3.0.0
@@ -3,11 +3,11 @@ DEPEND=media-libs/libsdl[video] media-sound/pulseaudio media-libs/alsa-lib virtu
 DESCRIPTION=A Sinclair Spectrum emulator, designed to work at full screen using the FrameBuffer
 EAPI=5
 HOMEPAGE=https://github.com/rastersoft/fbzx
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3+
 RDEPEND=media-libs/libsdl[video] media-sound/pulseaudio media-libs/alsa-lib games-misc/games-envd
 SLOT=0
 SRC_URI=https://github.com/rastersoft/fbzx/archive/3.0.0.tar.gz -> fbzx-3.0.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:games pkg_postinst:games pkg_setup:games src_unpack:base src_prepare:- src_configure:games src_compile:games src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=97a9c522fa32e39e7fb15eaf36beff36
+_md5_=0ff753ea005ca8acb5a1e9f82685f7bd
diff --git a/metadata/md5-cache/games-emulation/stella-4.7.2 b/metadata/md5-cache/games-emulation/stella-4.7.2
index 1f7b692caff4..b1097ec9c774 100644
--- a/metadata/md5-cache/games-emulation/stella-4.7.2
+++ b/metadata/md5-cache/games-emulation/stella-4.7.2
@@ -4,11 +4,11 @@ DESCRIPTION=Stella Atari 2600 VCS Emulator
 EAPI=5
 HOMEPAGE=http://stella.sourceforge.net/
 IUSE=joystick
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ BSD
 RDEPEND=media-libs/libsdl2[joystick?,opengl,video] media-libs/libpng:0 sys-libs/zlib games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/stella/stella-4.7.2-src.tar.xz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:games src_unpack:base src_prepare:- src_configure:- src_compile:games src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f43a0edf8d541e558eda4752f045a417
+_md5_=22c97edfe3a43076207712d7d6be3d04
diff --git a/metadata/md5-cache/games-engines/frobtads-1.2.3 b/metadata/md5-cache/games-engines/frobtads-1.2.3
index f3951d584aee..3d8c883e929f 100644
--- a/metadata/md5-cache/games-engines/frobtads-1.2.3
+++ b/metadata/md5-cache/games-engines/frobtads-1.2.3
@@ -4,7 +4,7 @@ DESCRIPTION=Curses-based interpreter and development tools for TADS 2 and TADS 3
 EAPI=5
 HOMEPAGE=http://www.tads.org/frobtads.htm
 IUSE=debug tads2compiler tads3compiler
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=TADS2 TADS3
 RDEPEND=net-misc/curl sys-libs/ncurses:0 games-misc/games-envd
 RESTRICT=!tads3compiler? ( test )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://www.tads.org/frobtads/frobtads-1.2.3.tar.gz
 _eclass_exported_funcs=pkg_preinst:games pkg_postinst:games pkg_setup:games src_unpack:base src_prepare:base src_configure:- src_compile:games src_test:- src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=82cb99d1ccaeb3b8ac80e87afefa0104
+_md5_=6749e072f3cb1a1da94f0ea563aa3a9c
diff --git a/metadata/md5-cache/games-engines/scummvm-1.8.0 b/metadata/md5-cache/games-engines/scummvm-1.8.0
index b3c3152066bb..04bbea42be1a 100644
--- a/metadata/md5-cache/games-engines/scummvm-1.8.0
+++ b/metadata/md5-cache/games-engines/scummvm-1.8.0
@@ -4,7 +4,7 @@ DESCRIPTION=Reimplementation of the SCUMM game engine used in Lucasarts adventur
 EAPI=5
 HOMEPAGE=http://scummvm.sourceforge.net/
 IUSE=aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype unsupported vorbis zlib
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception
 RDEPEND=>=media-libs/libsdl-1.2.2[sound,joystick,video] zlib? ( sys-libs/zlib ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) theora? ( media-libs/libtheora ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) flac? ( media-libs/flac ) opengl? ( virtual/opengl ) truetype? ( media-libs/freetype:2 ) fluidsynth? ( media-sound/fluidsynth ) games-misc/games-envd
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://scummvm.org/frs/scummvm/1.8.0/scummvm-1.8.0.tar.xz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:games src_unpack:base src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0ec983adf32287c617f9b3818cf72887
+_md5_=425dc4124203881c6f879f0190b5eabc
diff --git a/metadata/md5-cache/games-engines/scummvm-tools-1.8.0 b/metadata/md5-cache/games-engines/scummvm-tools-1.8.0
index 7eb39fe0110e..8130e86e1448 100644
--- a/metadata/md5-cache/games-engines/scummvm-tools-1.8.0
+++ b/metadata/md5-cache/games-engines/scummvm-tools-1.8.0
@@ -4,7 +4,7 @@ DESCRIPTION=utilities for the SCUMM game engine
 EAPI=5
 HOMEPAGE=http://scummvm.sourceforge.net/
 IUSE=flac iconv mad png vorbis
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=png? ( media-libs/libpng:0 ) mad? ( media-libs/libmad ) flac? ( media-libs/flac ) vorbis? ( media-libs/libvorbis ) iconv? ( virtual/libiconv media-libs/freetype:2 ) sys-libs/zlib >=dev-libs/boost-1.32 x11-libs/wxGTK:3.0 games-misc/games-envd
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://scummvm.org/frs/scummvm-tools/1.8.0/scummvm-tools-1.8.0.tar.xz
 _eclass_exported_funcs=pkg_preinst:games pkg_postinst:games pkg_setup:games src_unpack:base src_prepare:- src_configure:- src_compile:games src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
-_md5_=65ad91c51e859f3b5343b8468a333ed7
+_md5_=2912507997d7117a87c8486252443c75
diff --git a/metadata/md5-cache/games-fps/freedoom-0.10.1 b/metadata/md5-cache/games-fps/freedoom-0.10.1
index eed7d662a9a4..099365a46e79 100644
--- a/metadata/md5-cache/games-fps/freedoom-0.10.1
+++ b/metadata/md5-cache/games-fps/freedoom-0.10.1
@@ -3,11 +3,11 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Freedoom - Open Source Doom resources
 EAPI=5
 HOMEPAGE=http://www.nongnu.org/freedoom/
-KEYWORDS=amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=BSD
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=https://github.com/freedoom/freedoom/releases/download/v0.10.1/freedoom-0.10.1.zip https://github.com/freedoom/freedoom/releases/download/v0.10.1/freedm-0.10.1.zip
 _eclass_exported_funcs=pkg_preinst:games pkg_postinst:- pkg_setup:games src_unpack:base src_prepare:base src_configure:games src_compile:games src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=619f2536a41e276d8f68be8b2d36646d
+_md5_=d61b79a74981f4f9673ce8f6a2bb3f47
diff --git a/metadata/md5-cache/games-fps/warsow-community-map-pack-01 b/metadata/md5-cache/games-fps/warsow-community-map-pack-01
index 9da23da54ec0..3c71ce7e4d4a 100644
--- a/metadata/md5-cache/games-fps/warsow-community-map-pack-01
+++ b/metadata/md5-cache/games-fps/warsow-community-map-pack-01
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DESCRIPTION=Community Map Pack for the Warsow multiplayer FPS
 EAPI=5
 HOMEPAGE=http://www.warsow.net/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=freedist
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=http://update.warsow.net/mirror/warsow_comunity_map_pack_01.zip
 _eclass_exported_funcs=pkg_preinst:games pkg_postinst:games pkg_setup:games src_unpack:base src_prepare:base src_configure:games src_compile:games src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=62dace782307012e02c924ea6e39f95a
+_md5_=df110e64635141028fccd8f651c015c0
diff --git a/metadata/md5-cache/games-kids/tuxmath-2.0.3 b/metadata/md5-cache/games-kids/tuxmath-2.0.3
index 249a0d9c6400..af79f249e89e 100644
--- a/metadata/md5-cache/games-kids/tuxmath-2.0.3
+++ b/metadata/md5-cache/games-kids/tuxmath-2.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Educational arcade game where you have to solve maths problems
 EAPI=5
 HOMEPAGE=http://tux4kids.alioth.debian.org/tuxmath/
 IUSE=nls svg
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 OFL-1.1
 RDEPEND=dev-games/t4k-common[svg?] dev-libs/libxml2:2 media-libs/libsdl:0[video] media-libs/sdl-pango media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] media-libs/sdl-net nls? ( virtual/libintl ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://debian/pool/main/t/tuxmath/tuxmath_2.0.3.orig.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:games src_unpack:base src_prepare:- src_configure:- src_compile:games src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=21a9a0f13d2b2d546cc2084bd1c30bbd
+_md5_=cda8ee61b96f35d2a29372a65bf1f38a
diff --git a/metadata/md5-cache/games-misc/fortune-mod-flashrider-1.10 b/metadata/md5-cache/games-misc/fortune-mod-flashrider-1.10
index fa27bf0dddde..7feb8470273e 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-flashrider-1.10
+++ b/metadata/md5-cache/games-misc/fortune-mod-flashrider-1.10
@@ -3,10 +3,10 @@ DEPEND=games-misc/fortune-mod
 DESCRIPTION=Quotes from Prolinux articles and comments
 EAPI=5
 HOMEPAGE=http://downloads.nanolx.org/index.php?dir=fortunes-flashrider
-KEYWORDS=amd64 ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 x86 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=games-misc/fortune-mod
 SLOT=0
 SRC_URI=http://downloads.nanolx.org/fortunes-flashrider/fortunes-flashrider_1.10.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_install:-
-_md5_=e23f25a45a24914087e77380d1458e04
+_md5_=fbb77e9a2bfeb7bc048c240404213902
diff --git a/metadata/md5-cache/games-misc/opengfx-0.5.4 b/metadata/md5-cache/games-misc/opengfx-0.5.4
index f3cb55f83d3e..edd5ba86a21e 100644
--- a/metadata/md5-cache/games-misc/opengfx-0.5.4
+++ b/metadata/md5-cache/games-misc/opengfx-0.5.4
@@ -3,7 +3,7 @@ DEPEND=>=games-util/nml-0.4.0 games-util/grfcodec
 DESCRIPTION=OpenGFX data files for OpenTTD
 EAPI=5
 HOMEPAGE=http://bundles.openttdcoop.org/opengfx/
-KEYWORDS=amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2
 RDEPEND=games-misc/games-envd
 RESTRICT=test
@@ -11,4 +11,4 @@ SLOT=0
 SRC_URI=http://bundles.openttdcoop.org/opengfx/releases/0.5.4/opengfx-0.5.4-source.tar.xz
 _eclass_exported_funcs=pkg_preinst:games pkg_postinst:games pkg_setup:games src_unpack:base src_prepare:- src_configure:games src_compile:- src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=b9b170646600bedf65a48814dd5c4428
+_md5_=2b472ae8bbaed09aa2cb7facadff47d9
diff --git a/metadata/md5-cache/games-puzzle/sgt-puzzles-20160315 b/metadata/md5-cache/games-puzzle/sgt-puzzles-20160315
index 6c8b40091ad0..ab8a3ead3e1f 100644
--- a/metadata/md5-cache/games-puzzle/sgt-puzzles-20160315
+++ b/metadata/md5-cache/games-puzzle/sgt-puzzles-20160315
@@ -4,11 +4,11 @@ DESCRIPTION=Simon Tatham's Portable Puzzle Collection
 EAPI=5
 HOMEPAGE=http://www.chiark.greenend.org.uk/~sgtatham/puzzles/
 IUSE=doc gtk3 icons
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=!gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-20160315.c0bc13c.tar.gz https://dev.gentoo.org/~np-hardass/distfiles/sgt-puzzles/sgt-puzzles-icons-20160315.tar.xz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:games src_unpack:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9ff4123fb905f7f5b33fab706a81d12e
+_md5_=ed2ef7310b3f1aa92876342ad099045a
diff --git a/metadata/md5-cache/games-puzzle/wizznic-369 b/metadata/md5-cache/games-puzzle/wizznic-369
index a8a79fbb5437..1c380534b7be 100644
--- a/metadata/md5-cache/games-puzzle/wizznic-369
+++ b/metadata/md5-cache/games-puzzle/wizznic-369
@@ -3,11 +3,11 @@ DEPEND=media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-image[png]
 DESCRIPTION=Block-clearing puzzle game
 EAPI=5
 HOMEPAGE=http://wizznic.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] virtual/opengl games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/wizznic/Wizznic_src_build_369.tar.bz2
 _eclass_exported_funcs=pkg_preinst:games pkg_postinst:games pkg_setup:games src_unpack:base src_prepare:- src_configure:games src_compile:- src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=494e0f76a175f740f662b81064d3ec4d
+_md5_=cf21dc11b5dedb5f4d3943bf9bd237a0
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.16.2 b/metadata/md5-cache/games-roguelike/stone-soup-0.16.2
index d96c418cbeb2..200a01e86fe7 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.16.2
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.16.2
@@ -4,7 +4,7 @@ DESCRIPTION=Dungeon Crawl Stone Soup is a role-playing roguelike game of explora
 EAPI=5
 HOMEPAGE=http://crawl.develz.org/wordpress/
 IUSE=debug luajit ncurses test +tiles
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
 RDEPEND=dev-db/sqlite:3 luajit? ( >=dev-lang/luajit-2.0.0 ) sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] virtual/glu virtual/opengl ) games-misc/games-envd
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://crawl.develz.org/release/stone_soup-0.16.2.tar.xz https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:- src_unpack:base src_prepare:- src_configure:games src_compile:- src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1002af7debe288350366ff31c4860ae8
+_md5_=252d06d8088becb2877d5b63f21b295a
diff --git a/metadata/md5-cache/games-rpg/manaplus-1.6.3.26 b/metadata/md5-cache/games-rpg/manaplus-1.6.3.26
index 38bb9c6e4cb7..73e462765553 100644
--- a/metadata/md5-cache/games-rpg/manaplus-1.6.3.26
+++ b/metadata/md5-cache/games-rpg/manaplus-1.6.3.26
@@ -4,11 +4,11 @@ DESCRIPTION=OpenSource 2D MMORPG client for Evol Online and The Mana World
 EAPI=5
 HOMEPAGE=http://manaplus.evolonline.org
 IUSE=nls opengl
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-games/physfs-1.0.0 dev-libs/libxml2 media-libs/libpng:0= media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf net-misc/curl sys-libs/zlib x11-libs/libX11 x11-misc/xdg-utils x11-apps/xmessage media-fonts/dejavu media-fonts/wqy-microhei media-fonts/liberation-fonts media-fonts/mplus-outline-fonts nls? ( virtual/libintl ) opengl? ( virtual/opengl ) games-misc/games-envd
 SLOT=0
 SRC_URI=http://download.evolonline.org/manaplus/download/1.6.3.26/manaplus-1.6.3.26.tar.xz
 _eclass_exported_funcs=pkg_preinst:games pkg_postinst:games pkg_setup:games src_unpack:base src_prepare:base src_configure:- src_compile:games src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=0e41af8731c2ad4af4000779a369f89f
+_md5_=3fc585553317d78f799d49b1198b9de2
diff --git a/metadata/md5-cache/games-server/mednafen-server-0.5.2 b/metadata/md5-cache/games-server/mednafen-server-0.5.2
index c0e03e7ee72f..bae72308349e 100644
--- a/metadata/md5-cache/games-server/mednafen-server-0.5.2
+++ b/metadata/md5-cache/games-server/mednafen-server-0.5.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DESCRIPTION=Server for Mednafen emulator
 EAPI=5
 HOMEPAGE=http://mednafen.fobby.net/releases/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=http://mednafen.fobby.net/releases/files/mednafen-server-0.5.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:games pkg_postinst:- pkg_setup:games src_unpack:base src_prepare:- src_configure:games src_compile:games src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=11ac87ba11d09b7255433a8e6d3f3391
+_md5_=307f71a3c8f4a17387555fcf126c18ad
diff --git a/metadata/md5-cache/games-simulation/openttd-1.6.0 b/metadata/md5-cache/games-simulation/openttd-1.6.0
index 1ff27cd4f4ab..998552294adc 100644
--- a/metadata/md5-cache/games-simulation/openttd-1.6.0
+++ b/metadata/md5-cache/games-simulation/openttd-1.6.0
@@ -4,7 +4,7 @@ DESCRIPTION=OpenTTD is a clone of Transport Tycoon Deluxe
 EAPI=5
 HOMEPAGE=http://www.openttd.org/
 IUSE=aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 PDEPEND=!dedicated? ( openmedia? ( games-misc/openmsx games-misc/opensfx ) aplaymidi? ( media-sound/alsa-utils ) !aplaymidi? ( timidity? ( media-sound/timidity++ ) ) ) openmedia? ( >=games-misc/opengfx-0.4.7 )
 RDEPEND=!dedicated? ( media-libs/libsdl[sound,X,video] icu? ( dev-libs/icu:= ) truetype? ( media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib ) ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib ) games-misc/games-envd
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=http://binaries.openttd.org/releases/1.6.0/openttd-1.6.0-source.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:games src_unpack:base src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=09add2be257416e2f6ba0460358bdc21
+_md5_=1f01ec0aafccd6b6ff6e4dfe02b10f9b
diff --git a/metadata/md5-cache/games-strategy/endless-sky-0.8.11-r1 b/metadata/md5-cache/games-strategy/endless-sky-0.8.11-r1
index afc5a70004a1..e5a2158a4017 100644
--- a/metadata/md5-cache/games-strategy/endless-sky-0.8.11-r1
+++ b/metadata/md5-cache/games-strategy/endless-sky-0.8.11-r1
@@ -3,11 +3,11 @@ DEPEND=media-libs/glew media-libs/libsdl2 media-libs/libjpeg-turbo media-libs/li
 DESCRIPTION=Space exploration, trading & combat in the tradition of Terminal Velocity
 EAPI=6
 HOMEPAGE=https://endless-sky.github.io
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=CC-BY-SA-4.0 CC-BY-SA-3.0 GPL-3+ public-domain
 RDEPEND=media-libs/glew media-libs/libsdl2 media-libs/libjpeg-turbo media-libs/libpng:= media-libs/openal virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/endless-sky/endless-sky/archive/v0.8.11.tar.gz -> endless-sky-0.8.11.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	scons-utils	6a35944612b7ecb18a3803359554badc	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=857208c933d2a8c8342f1e1ef593c0c0
+_md5_=8b93e73550c50e29b3bb49c16da8fa12
diff --git a/metadata/md5-cache/games-strategy/hedgewars-0.9.22-r1 b/metadata/md5-cache/games-strategy/hedgewars-0.9.22-r1
index 4859f81a6aa3..1178a1d3ff05 100644
--- a/metadata/md5-cache/games-strategy/hedgewars-0.9.22-r1
+++ b/metadata/md5-cache/games-strategy/hedgewars-0.9.22-r1
@@ -3,11 +3,11 @@ DEPEND=dev-lang/lua:0= dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/freeglut media-
 DESCRIPTION=A turn-based strategy, artillery, action and comedy game
 EAPI=5
 HOMEPAGE=http://hedgewars.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 Apache-2.0 FDL-1.3
 RDEPEND=dev-lang/lua:0= dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/freeglut media-libs/libpng:0 media-libs/libsdl[sound,opengl,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf sys-libs/zlib virtual/ffmpeg app-arch/xz-utils media-fonts/wqy-zenhei >=media-fonts/dejavu-2.28 games-misc/games-envd
 SLOT=0
 SRC_URI=http://download.gna.org/hedgewars/hedgewars-src-0.9.22.tar.bz2 mirror://debian/pool/main/h/hedgewars/hedgewars_0.9.22-dfsg-7.debian.tar.xz
 _eclass_exported_funcs=pkg_preinst:games pkg_postinst:games pkg_setup:games src_unpack:base src_prepare:- src_configure:- src_compile:- src_test:cmake-utils src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bf32a58961f077a0539517c9120076b3
+_md5_=519c67d37e064c2ac4754aa3c040ffbc
diff --git a/metadata/md5-cache/games-strategy/lgeneral-1.3.1-r1 b/metadata/md5-cache/games-strategy/lgeneral-1.3.1-r1
index 43a2a7737829..21950da11681 100644
--- a/metadata/md5-cache/games-strategy/lgeneral-1.3.1-r1
+++ b/metadata/md5-cache/games-strategy/lgeneral-1.3.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Panzer General clone written in SDL
 EAPI=5
 HOMEPAGE=http://lgames.sourceforge.net/index.php?project=LGeneral
 IUSE=nls
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer nls? ( virtual/libintl ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/lgeneral/lgeneral-1.3.1.tar.gz mirror://sourceforge/lgeneral/pg-data.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:games src_unpack:base src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f3925faf976425ecf30f2c6a8624119d
+_md5_=d6000409537ed067b057cf861aee4dfe
diff --git a/metadata/md5-cache/games-strategy/naev-0.6.1 b/metadata/md5-cache/games-strategy/naev-0.6.1
index 04b0719a9659..ebb1e8fcad12 100644
--- a/metadata/md5-cache/games-strategy/naev-0.6.1
+++ b/metadata/md5-cache/games-strategy/naev-0.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=A 2D space trading and combat game, in a similar vein to Escape Velo
 EAPI=5
 HOMEPAGE=http://blog.naev.org/
 IUSE=debug +mixer +openal
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=media-libs/libsdl2[X,sound,video] dev-libs/libzip dev-libs/libxml2 >=media-libs/freetype-2 >=media-libs/libvorbis-1.2.1 >=media-libs/libpng-1.2:0 virtual/glu virtual/opengl dev-lang/lua:0 mixer? ( media-libs/sdl2-mixer ) openal? ( media-libs/openal ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/naev/naev-0.6.1.tar.bz2 mirror://sourceforge/naev/ndata-0.6.1.zip
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:games src_unpack:- src_prepare:base src_configure:- src_compile:- src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f140c2ea080ac83eb23801e9946fc575
+_md5_=7861ba0bbab0181eaa8dffceef8120dd
diff --git a/metadata/md5-cache/games-strategy/uqm-0.7.0-r3 b/metadata/md5-cache/games-strategy/uqm-0.7.0-r3
index 85a89c2916cf..11b7c5c78d42 100644
--- a/metadata/md5-cache/games-strategy/uqm-0.7.0-r3
+++ b/metadata/md5-cache/games-strategy/uqm-0.7.0-r3
@@ -4,11 +4,11 @@ DESCRIPTION=The Ur-Quan Masters: Port of Star Control 2
 EAPI=5
 HOMEPAGE=http://sc2.sourceforge.net/
 IUSE=music opengl remix voice
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=media-libs/libmikmod media-libs/libogg >=media-libs/libpng-1.4:0 media-libs/libsdl[X,sound,joystick,video] media-libs/libvorbis media-libs/sdl-image[png] sys-libs/zlib opengl? ( virtual/opengl ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/sc2/uqm-0.7.0-source.tgz mirror://sourceforge/sc2/uqm-0.7.0-content.uqm music? ( mirror://sourceforge/sc2/uqm-0.7.0-3domusic.uqm ) voice? ( mirror://sourceforge/sc2/uqm-0.7.0-voice.uqm ) remix? ( mirror://sourceforge/sc2/uqm-remix-disc1.uqm mirror://sourceforge/sc2/uqm-remix-disc2.uqm mirror://sourceforge/sc2/uqm-remix-disc3.uqm mirror://sourceforge/sc2/uqm-remix-disc4.uqm )
 _eclass_exported_funcs=pkg_preinst:games pkg_postinst:games pkg_setup:games src_unpack:base src_prepare:- src_configure:games src_compile:- src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=de3f895286b63bd8ed2dbc0b3b1b6111
+_md5_=37c2087f4ded00d385ce0202135ae4aa
diff --git a/metadata/md5-cache/games-strategy/warzone2100-3.1.5 b/metadata/md5-cache/games-strategy/warzone2100-3.1.5
index fda55680ae69..ead5d3e13cdd 100644
--- a/metadata/md5-cache/games-strategy/warzone2100-3.1.5
+++ b/metadata/md5-cache/games-strategy/warzone2100-3.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=3D real-time strategy game
 EAPI=5
 HOMEPAGE=http://wz2100.net/
 IUSE=debug nls qt4 videos
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+ CC-BY-SA-3.0 public-domain
 RDEPEND=>=dev-games/physfs-2[zip] dev-libs/fribidi media-libs/fontconfig media-libs/freetype:2 media-libs/glew:= media-libs/libogg media-libs/libpng:0 media-libs/libtheora media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXrandr dev-qt/qtcore:4 dev-qt/qtscript:4 nls? ( virtual/libintl ) qt4? ( dev-qt/qtgui:4 dev-qt/qtopengl:4 ) !qt4? ( media-libs/libsdl[opengl,video,X] ) media-fonts/dejavu games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/warzone2100/warzone2100-3.1.5.tar.xz videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> warzone2100-videos-2.2.wz )
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:games src_unpack:base src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c0ee18fdde6fc5fb08e216a58c96014c
+_md5_=9d90f8372dfed414414a7a942efb0e31
diff --git a/metadata/md5-cache/games-strategy/widelands-0.18 b/metadata/md5-cache/games-strategy/widelands-0.18
index ef4938b33233..862329a1873e 100644
--- a/metadata/md5-cache/games-strategy/widelands-0.18
+++ b/metadata/md5-cache/games-strategy/widelands-0.18
@@ -3,11 +3,11 @@ DEPEND=dev-lang/lua:0 media-libs/libsdl[video] media-libs/sdl-image[jpeg,png] me
 DESCRIPTION=A game similar to Settlers 2
 EAPI=5
 HOMEPAGE=http://www.widelands.org/
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=dev-lang/lua:0 media-libs/libsdl[video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-gfx media-libs/sdl-net media-libs/libpng:0 sys-libs/zlib[minizip] media-libs/glew media-libs/sdl-ttf >=dev-libs/boost-1.48 games-misc/games-envd
 SLOT=0
 SRC_URI=https://launchpad.net/widelands/build18/build-18/+download/widelands-build18-src.tar.bz2
 _eclass_exported_funcs=pkg_preinst:games pkg_postinst:games pkg_setup:games src_unpack:base src_prepare:- src_configure:- src_compile:- src_test:cmake-utils src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=36df6709a204261db2941f5817f04804
+_md5_=924237b57792d9569f6cd96339697d82
diff --git a/metadata/md5-cache/games-util/grfcodec-6.0.5 b/metadata/md5-cache/games-util/grfcodec-6.0.5
index a4a3142135dc..f5f92a925fbc 100644
--- a/metadata/md5-cache/games-util/grfcodec-6.0.5
+++ b/metadata/md5-cache/games-util/grfcodec-6.0.5
@@ -3,11 +3,11 @@ DEPEND=media-libs/libpng:0 !games-util/nforenum dev-lang/perl dev-libs/boost
 DESCRIPTION=A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files
 EAPI=5
 HOMEPAGE=http://dev.openttdcoop.org/projects/grfcodec
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=media-libs/libpng:0
 SLOT=0
 SRC_URI=http://binaries.openttd.org/extra/grfcodec/6.0.5/grfcodec-6.0.5-source.tar.xz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=63c9befc44f95fde9f7ff01b6565bae4
+_md5_=2f6e335bd758c43b9a935658968ead1e
diff --git a/metadata/md5-cache/games-util/joystick-1.5.1 b/metadata/md5-cache/games-util/joystick-1.5.1
index 01a8211461a3..e408bb123254 100644
--- a/metadata/md5-cache/games-util/joystick-1.5.1
+++ b/metadata/md5-cache/games-util/joystick-1.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=joystick testing utilities
 EAPI=6
 HOMEPAGE=http://sourceforge.net/projects/linuxconsole/ http://atrey.karlin.mff.cuni.cz/~vojtech/input/
 IUSE=sdl udev
-KEYWORDS=amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2
 RDEPEND=sdl? ( media-libs/libsdl:0[video] ) !<x11-libs/tslib-1.0-r2 udev? ( virtual/udev )
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxconsole/files/linuxconsoletools-1.5.1.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=3ed8c5004d839fcedc4d9e03d58ef9d8
+_md5_=517023eb9880f709e8193ab247a1682d
diff --git a/metadata/md5-cache/games-util/nml-0.4.4 b/metadata/md5-cache/games-util/nml-0.4.4
index f0ddbe7a4122..d010fc9a266f 100644
--- a/metadata/md5-cache/games-util/nml-0.4.4
+++ b/metadata/md5-cache/games-util/nml-0.4.4
@@ -4,7 +4,7 @@ DESCRIPTION=Compiler of NML files into grf/nfo files
 EAPI=5
 HOMEPAGE=http://dev.openttdcoop.org/projects/nml
 IUSE=python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=dev-python/pillow[zlib,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/ply[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://bundles.openttdcoop.org/nml/releases/0.4.4/nml-0.4.4.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:-
 _eclasses_=distutils-r1	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=15a7c4e8c3b23335a036a68fdcb9e34b
+_md5_=7a6db26e9a8cfe103e38a99491f66300
diff --git a/metadata/md5-cache/lxde-base/lxmenu-data-0.1.4 b/metadata/md5-cache/lxde-base/lxmenu-data-0.1.4
index d367d33434b1..18dea5b3af9a 100644
--- a/metadata/md5-cache/lxde-base/lxmenu-data-0.1.4
+++ b/metadata/md5-cache/lxde-base/lxmenu-data-0.1.4
@@ -3,9 +3,9 @@ DEPEND=sys-devel/gettext >=dev-util/intltool-0.40.0 virtual/pkgconfig
 DESCRIPTION=Provides files needed for LXDE application menus
 EAPI=5
 HOMEPAGE=http://lxde.sourceforge.net/
-KEYWORDS=~alpha amd64 arm ~arm64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxmenu-data-0.1.4.tar.xz
 _eclass_exported_funcs=src_install:-
-_md5_=ff787c71793c81e160e8437252f3dc03
+_md5_=f56eac9af111e23ce897142c3791d823
diff --git a/metadata/md5-cache/mail-filter/maildrop-2.8.3 b/metadata/md5-cache/mail-filter/maildrop-2.8.3
index 5309f4e7cbcb..1723b96e9c69 100644
--- a/metadata/md5-cache/mail-filter/maildrop-2.8.3
+++ b/metadata/md5-cache/mail-filter/maildrop-2.8.3
@@ -4,7 +4,7 @@ DESCRIPTION=Mail delivery agent/filter
 EAPI=5
 HOMEPAGE=http://www.courier-mta.org/maildrop/
 IUSE=berkdb debug dovecot fam gdbm ldap mysql postgres static-libs authlib +tools trashquota
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-3
 RDEPEND=!mail-mta/courier net-mail/mailbase dev-libs/libpcre net-dns/libidn net-libs/courier-unicode gdbm? ( >=sys-libs/gdbm-1.8.0 ) mysql? ( net-libs/courier-authlib ) postgres? ( net-libs/courier-authlib ) ldap? ( net-libs/courier-authlib ) authlib? ( net-libs/courier-authlib ) fam? ( virtual/fam ) !gdbm? ( berkdb? ( >=sys-libs/db-3:* ) ) tools? ( !mail-mta/netqmail !net-mail/courier-imap !mail-mta/mini-qmail ) dev-lang/perl dovecot? ( net-mail/dovecot )
 REQUIRED_USE=mysql? ( authlib ) postgres? ( authlib ) ldap? ( authlib )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/courier/maildrop-2.8.3.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=a0077c5681fe01bfd90b23d857af4a31
+_md5_=367f1a1652192d024f8e458faa902ad4
diff --git a/metadata/md5-cache/mail-mta/exim-4.87 b/metadata/md5-cache/mail-mta/exim-4.87
index 4fc6c57825d2..1dd2cc5e7e2c 100644
--- a/metadata/md5-cache/mail-mta/exim-4.87
+++ b/metadata/md5-cache/mail-mta/exim-4.87
@@ -4,7 +4,7 @@ DESCRIPTION=A highly configurable, drop-in replacement for sendmail
 EAPI=5
 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 ~ppc ~ppc64 ~x86
+KEYWORDS=alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86
 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/mysql ) 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=spf? ( exiscan-acl ) srs? ( exiscan-acl ) dmarc? ( spf dkim ) pkcs11? ( gnutls )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=ftp://ftp.exim.org/pub/exim/exim4/exim-4.87.tar.bz2 mirror://gentoo/system_filter.exim.gz doc? ( ftp://ftp.exim.org/pub/exim/exim4/exim-html-4.87.tar.bz2 )
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=230bf762a80f5193a90dc3804909d10b
+_md5_=ffb2672e3ee05d8c01a4e4e8b81b5983
diff --git a/metadata/md5-cache/mail-mta/postfix-3.1.0 b/metadata/md5-cache/mail-mta/postfix-3.1.0
index 7586596b9d73..72f776e8adc5 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.1.0
+++ b/metadata/md5-cache/mail-mta/postfix-3.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=6
 HOMEPAGE=http://www.postfix.org/
 IUSE=+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=IBM
 RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !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/fastforward selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=ldap-bind? ( ldap sasl )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.1.0.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=8f09e7a1e1ffa452e2c21ce30ce38084
+_md5_=5646da43056113634c92c6c5c7f19d55
diff --git a/metadata/md5-cache/media-gfx/cairosvg-1.0.7 b/metadata/md5-cache/media-gfx/cairosvg-1.0.7
index ae7b18b45c0e..153b10970980 100644
--- a/metadata/md5-cache/media-gfx/cairosvg-1.0.7
+++ b/metadata/md5-cache/media-gfx/cairosvg-1.0.7
@@ -4,7 +4,7 @@ DESCRIPTION=A simple cairo based SVG converter with support for PDF, PostScript
 EAPI=5
 HOMEPAGE=http://cairosvg.org/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/tinycss[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cssselect[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-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_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/C/CairoSVG/CairoSVG-1.0.7.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	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=dbfcaba28334fef1b1d974fb4a2deb87
+_md5_=12f0d997dc817eb7721fd32189cc89dd
diff --git a/metadata/md5-cache/media-gfx/gphotofs-0.5 b/metadata/md5-cache/media-gfx/gphotofs-0.5
index 50a100f50ccd..1476f58aac20 100644
--- a/metadata/md5-cache/media-gfx/gphotofs-0.5
+++ b/metadata/md5-cache/media-gfx/gphotofs-0.5
@@ -3,10 +3,10 @@ DEPEND=>=media-libs/libgphoto2-2.5.0 >=sys-fs/fuse-2.5 >=dev-libs/glib-2.6 virtu
 DESCRIPTION=FUSE file system for interfacing with digital cameras using gphoto2
 EAPI=4
 HOMEPAGE=http://www.gphoto.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libgphoto2-2.5.0 >=sys-fs/fuse-2.5 >=dev-libs/glib-2.6
 SLOT=0
 SRC_URI=mirror://sourceforge/gphoto/gphotofs-0.5.tar.bz2
 _eclass_exported_funcs=-
-_md5_=198d7b17d515c6623d0f07c19ff260dd
+_md5_=c6eaabb5406328692fa9cc6f2a38b85f
diff --git a/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1 b/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
index dab48a8705b2..35bc8e921175 100644
--- a/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
+++ b/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The Persistence of Vision Raytracer
 EAPI=6
 HOMEPAGE=http://www.povray.org/
 IUSE=debug +io-restrictions openexr static-libs tiff X test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=AGPL-3
 RDEPEND=>=dev-libs/boost-1.50.0:=[threads(+)] media-libs/libpng:0 sys-libs/zlib virtual/jpeg:0 openexr? ( media-libs/ilmbase media-libs/openexr ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libsdl )
 SLOT=0
 SRC_URI=https://github.com/POV-Ray/povray/archive/v3.7.0.0.tar.gz -> povray-3.7.0.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:- src_prepare:- src_configure:- src_test:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=4bde6a8679f9469d76af6f31cde94c83
+_md5_=ffdb73efd11b0268e095e4b3587220c4
diff --git a/metadata/md5-cache/media-gfx/tuxpaint-0.9.21-r2 b/metadata/md5-cache/media-gfx/tuxpaint-0.9.21-r2
index 28ab38eeee70..cdddd3e339e3 100644
--- a/metadata/md5-cache/media-gfx/tuxpaint-0.9.21-r2
+++ b/metadata/md5-cache/media-gfx/tuxpaint-0.9.21-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Drawing program designed for young children
 EAPI=6
 HOMEPAGE=http://www.tuxpaint.org/
 IUSE=nls
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=app-text/libpaper dev-libs/fribidi gnome-base/librsvg:2 >=media-libs/libpng-1.2:0= >=media-libs/freetype-2:2 media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf x11-libs/cairo
 SLOT=0
 SRC_URI=mirror://sourceforge/tuxpaint/tuxpaint-0.9.21.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=39e1c71d74fbfb1a479057441560912a
+_md5_=6c9502552cefb4ae79e92b914958a269
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.10.3 b/metadata/md5-cache/media-libs/gexiv2-0.10.3
index 6f73bce4865b..35e2d6e94547 100644
--- a/metadata/md5-cache/media-libs/gexiv2-0.10.3
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.3
@@ -4,7 +4,7 @@ DESCRIPTION=GObject-based wrapper around the Exiv2 library
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/gexiv2
 IUSE=introspection python static-libs python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-libs/glib-2.26.1:2 >=media-gfx/exiv2-0.21:0= introspection? ( dev-libs/gobject-introspection:= )
 REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://gnome/sources/gexiv2/0.10/gexiv2-0.10.3.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c44c6d73bcef24d883d929fdfe85b374
+_md5_=a4aba00bb82e400f4fc4af81a1b9585c
diff --git a/metadata/md5-cache/media-libs/libdvbpsi-1.3.0-r1 b/metadata/md5-cache/media-libs/libdvbpsi-1.3.0-r1
index 8c2d99135b12..7ec088dc2f54 100644
--- a/metadata/md5-cache/media-libs/libdvbpsi-1.3.0-r1
+++ b/metadata/md5-cache/media-libs/libdvbpsi-1.3.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=library for MPEG TS/DVB PSI tables decoding and generation
 EAPI=5
 HOMEPAGE=http://www.videolan.org/libdvbpsi
 IUSE=doc static-libs
-KEYWORDS=alpha amd64 arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0/10
 SRC_URI=http://download.videolan.org/pub/libdvbpsi/1.3.0/libdvbpsi-1.3.0.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
-_md5_=55bf6a40c3bafb07bf5dbe43ccaace19
+_md5_=6e1d47fa89946442f01becc938a9b8b9
diff --git a/metadata/md5-cache/media-libs/libgpod-0.8.3-r1 b/metadata/md5-cache/media-libs/libgpod-0.8.3-r1
index 6be9788fb19c..f08132ad3b0a 100644
--- a/metadata/md5-cache/media-libs/libgpod-0.8.3-r1
+++ b/metadata/md5-cache/media-libs/libgpod-0.8.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Shared library to access the contents of an iPod
 EAPI=6
 HOMEPAGE=http://www.gtkpod.org/libgpod/
 IUSE=+gtk python +udev ios mono static-libs python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2
 RDEPEND=>=app-pda/libplist-1.0:= >=dev-db/sqlite-3:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 sys-apps/sg3_utils gtk? ( x11-libs/gdk-pixbuf:2 ) ios? ( app-pda/libimobiledevice:= ) 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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=media-libs/mutagen-1.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pygobject-2.8:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) udev? ( virtual/udev ) mono? ( >=dev-lang/mono-1.9.1 >=dev-dotnet/gtk-sharp-2.12 )
 REQUIRED_USE=python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/gtkpod/libgpod-0.8.3.tar.bz2
 _eclass_exported_funcs=pkg_setup:- src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	mono-env	10809200679bcceefebac9e72bebb6e6	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	udev	73058269b3e70e34e084fa3981282338
-_md5_=dc0f84f93f0e8de8d2ed28ba0d9d8d4a
+_md5_=ab9d7c8bec541b06568f1d1701603675
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.11 b/metadata/md5-cache/media-libs/libmtp-1.1.11
index 9c7e2760b2e4..b4e0c6a5f68d 100644
--- a/metadata/md5-cache/media-libs/libmtp-1.1.11
+++ b/metadata/md5-cache/media-libs/libmtp-1.1.11
@@ -4,11 +4,11 @@ DESCRIPTION=An implementation of Microsoft's Media Transfer Protocol (MTP)
 EAPI=5
 HOMEPAGE=http://libmtp.sourceforge.net/
 IUSE=+crypt doc examples static-libs
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
 SLOT=0/9
 SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.11.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	udev	73058269b3e70e34e084fa3981282338	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=31d4a886ba76cc173070f5018d172d6f
+_md5_=438068674873cfb3306cef905cd16cb5
diff --git a/metadata/md5-cache/media-libs/libxmi-1.3 b/metadata/md5-cache/media-libs/libxmi-1.3
index 430f73e9155e..b013700beed5 100644
--- a/metadata/md5-cache/media-libs/libxmi-1.3
+++ b/metadata/md5-cache/media-libs/libxmi-1.3
@@ -4,11 +4,11 @@ DESCRIPTION=C/C++ function library for rasterizing 2-D vector graphics
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/libxmi/
 IUSE=static-libs
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!<=media-libs/plotutils-2.6
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/libxmi-1.3.tar.xz
 _eclass_exported_funcs=src_prepare:autotools-utils src_configure:autotools-utils src_compile:autotools-utils src_test:autotools-utils src_install:autotools-utils
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=87af36ee6fe270d36b08597c7b981edc
+_md5_=7f6c8c45ed5649c04e5dccf5d460691b
diff --git a/metadata/md5-cache/media-libs/mutagen-1.31 b/metadata/md5-cache/media-libs/mutagen-1.31
index 3e298a6d16d8..065348f38270 100644
--- a/metadata/md5-cache/media-libs/mutagen-1.31
+++ b/metadata/md5-cache/media-libs/mutagen-1.31
@@ -4,7 +4,7 @@ DESCRIPTION=Audio metadata tag reader and writer implemented in pure Python
 EAPI=5
 HOMEPAGE=https://bitbucket.org/lazka/mutagen https://pypi.python.org/pypi/mutagen
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://bitbucket.org/lazka/mutagen/downloads/mutagen-1.31.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:- src_install:distutils-r1
 _eclasses_=distutils-r1	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=62031ddee842e7d7edf6e0d2dd3caaaa
+_md5_=a8af64350c5fbf3a027bd6e908acbdad
diff --git a/metadata/md5-cache/media-libs/plotutils-2.6-r1 b/metadata/md5-cache/media-libs/plotutils-2.6-r1
index 9c5c4d9ab28c..e27e646155e1 100644
--- a/metadata/md5-cache/media-libs/plotutils-2.6-r1
+++ b/metadata/md5-cache/media-libs/plotutils-2.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Powerful C/C++ function library for exporting 2-D vector graphics
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/plotutils/
 IUSE=+png static-libs X
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!<media-libs/plotutils-2.6 media-libs/libxmi png? ( media-libs/libpng sys-libs/zlib ) X? ( x11-libs/libXaw x11-proto/xextproto )
 SLOT=0
 SRC_URI=mirror://gnu/plotutils/plotutils-2.6.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=50ff12cd28c57921f58e87f417f2e91b
+_md5_=236452e78619bf8ea8380a8e7dc2f5e5
diff --git a/metadata/md5-cache/media-libs/raul-0.8.0-r1 b/metadata/md5-cache/media-libs/raul-0.8.0-r1
index 886e2e74ff5e..a0e53615b2e1 100644
--- a/metadata/md5-cache/media-libs/raul-0.8.0-r1
+++ b/metadata/md5-cache/media-libs/raul-0.8.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=C++ utility library primarily aimed at audio/musical applications
 EAPI=5
 HOMEPAGE=http://wiki.drobilla.net/Raul
 IUSE=debug doc test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost >=dev-libs/glib-2.14.0
 SLOT=0
 SRC_URI=http://download.drobilla.net/raul-0.8.0.tar.bz2
 _eclass_exported_funcs=pkg_setup:python-any-r1 src_prepare:- src_configure:- src_compile:waf-utils src_test:- src_install:waf-utils
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	waf-utils	c21174962af5ca8091b66f58612797ce
-_md5_=aa76d6f56738f793a550947174b68212
+_md5_=bf9b946ca221d4ddc6576f26bf036ba3
diff --git a/metadata/md5-cache/media-libs/sdl2-ttf-2.0.14 b/metadata/md5-cache/media-libs/sdl2-ttf-2.0.14
index 8b2c11eee8b3..29abfa8cadd2 100644
--- a/metadata/md5-cache/media-libs/sdl2-ttf-2.0.14
+++ b/metadata/md5-cache/media-libs/sdl2-ttf-2.0.14
@@ -4,11 +4,11 @@ DESCRIPTION=library that allows you to use TrueType fonts in SDL applications
 EAPI=5
 HOMEPAGE=http://www.libsdl.org/projects/SDL_ttf/
 IUSE=static-libs X 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=ZLIB
 RDEPEND=X? ( >=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(-)?] ) >=media-libs/libsdl2-2.0.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(-)?] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[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://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.14.tar.gz
 _eclass_exported_funcs=src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=3a000a944c8cea199af78d6c24fec63d
+_md5_=a96214489d0f151874e8b73a8ac9766b
diff --git a/metadata/md5-cache/media-sound/aacgain-1.9 b/metadata/md5-cache/media-sound/aacgain-1.9
index ba2d236b3ff9..ccfad7ccf03a 100644
--- a/metadata/md5-cache/media-sound/aacgain-1.9
+++ b/metadata/md5-cache/media-sound/aacgain-1.9
@@ -3,10 +3,10 @@ DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=s
 DESCRIPTION=AACGain normalizes the volume of digital music files using the Replay Gain algorithm
 EAPI=4
 HOMEPAGE=http://aacgain.altosdesign.com/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://sbriesen.de/gentoo/distfiles/aacgain-1.9.tar.xz https://mp4v2.googlecode.com/files/mp4v2-1.9.1.tar.bz2 mirror://sourceforge/mp3gain/mp3gain-1_5_2-src.zip mirror://sourceforge/faac/faad2-2.7.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_unpack:- src_prepare:- src_configure:- src_compile:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=7e5962babea46367575174f99b418efb
+_md5_=9ec592735609d56f8e85e1eb4a3fbcb3
diff --git a/metadata/md5-cache/media-sound/apetag-1.12 b/metadata/md5-cache/media-sound/apetag-1.12
index 9efbef1bca0e..83afa0f17f9c 100644
--- a/metadata/md5-cache/media-sound/apetag-1.12
+++ b/metadata/md5-cache/media-sound/apetag-1.12
@@ -3,11 +3,11 @@ DEPEND==dev-lang/python-2*
 DESCRIPTION=Command-line ape 2.0 tagger
 EAPI=3
 HOMEPAGE=http://muth.org/Robert/Apetag/
-KEYWORDS=amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND==dev-lang/python-2*
 SLOT=0
 SRC_URI=http://muth.org/Robert/Apetag/apetag.1.12.tar.gz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_compile:- src_install:-
 _eclasses_=multilib	d062ae4ba2fc40a19c11de2ad89b6616	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=afd5c18f862d684e69904203e1a2be0b
+_md5_=4a61c3e29fb130f20922c97ea9dadd62
diff --git a/metadata/md5-cache/media-sound/cmus-2.7.1 b/metadata/md5-cache/media-sound/cmus-2.7.1
index 13a3b736cedb..048599480e51 100644
--- a/metadata/md5-cache/media-sound/cmus-2.7.1
+++ b/metadata/md5-cache/media-sound/cmus-2.7.1
@@ -4,7 +4,7 @@ DESCRIPTION=A ncurses based music player with plugin support for many formats
 EAPI=5
 HOMEPAGE=http://cmus.github.io/
 IUSE=aac alsa ao cue cdio cddb discid debug examples +flac jack libsamplerate +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio tremor +unicode +vorbis wavpack wma
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) cue? ( media-libs/libcue ) cdio? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) discid? ( media-libs/libdiscid ) flac? ( media-libs/flac ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9:0 ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) tremor? ( media-libs/tremor ) !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) wavpack? ( media-sound/wavpack ) wma? ( media-video/ffmpeg:= ) pidgin? ( net-im/pidgin dev-python/dbus-python )
 REQUIRED_USE=tremor? ( vorbis ) mp4? ( aac )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/cmus/cmus/archive/v2.7.1.tar.gz -> cmus-2.7.1.tar.gz
 _eclass_exported_funcs=src_configure:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=b3dfd9e43c31c2a38259d3ae6bc809c3
+_md5_=1ecaba647bf51fd3c09a762660939886
diff --git a/metadata/md5-cache/media-sound/exaile-3.4.5 b/metadata/md5-cache/media-sound/exaile-3.4.5
index 75df0e2abb70..1caf378608f3 100644
--- a/metadata/md5-cache/media-sound/exaile-3.4.5
+++ b/metadata/md5-cache/media-sound/exaile-3.4.5
@@ -4,7 +4,7 @@ DESCRIPTION=a media player aiming to be similar to AmaroK, but for GTK+
 EAPI=5
 HOMEPAGE=http://www.exaile.org/
 IUSE=cddb libnotify nls python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2 GPL-3
 RDEPEND=dev-python/dbus-python dev-python/gst-python:0.10 >=dev-python/pygtk-2.17 >=dev-python/pygobject-2.18:2 media-libs/gst-plugins-good:0.10 >=media-libs/mutagen-1.10 media-plugins/gst-plugins-meta:0.10 cddb? ( dev-python/cddb-py ) libnotify? ( dev-python/notify-python )
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/exaile/exaile/archive/3.4.5.tar.gz -> exaile-3.4.5.tar.gz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=1d457cf9fd4add2f98ecda4090a098e2
+_md5_=5af0a58ada6280c17e5378712e1e0057
diff --git a/metadata/md5-cache/media-sound/mpg123-1.22.4 b/metadata/md5-cache/media-sound/mpg123-1.22.4
index 88326cf11b2e..073f8f94d7ec 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.22.4
+++ b/metadata/md5-cache/media-sound/mpg123-1.22.4
@@ -4,11 +4,11 @@ DESCRIPTION=a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
 EAPI=5
 HOMEPAGE=http://www.mpg123.org/
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse 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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-eselect/eselect-mpg123 || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.mpg123.org/download/mpg123-1.22.4.tar.bz2
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=7f394e9bf52e201472690d01e18abea3
+_md5_=c65056bee4d2ce122a0a6b1a091fa5ad
diff --git a/metadata/md5-cache/media-sound/mpg321-0.3.2 b/metadata/md5-cache/media-sound/mpg321-0.3.2
index 1e998679e378..a97190a2bcab 100644
--- a/metadata/md5-cache/media-sound/mpg321-0.3.2
+++ b/metadata/md5-cache/media-sound/mpg321-0.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=A realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
 EAPI=5
 HOMEPAGE=http://mpg321.sourceforge.net/
 IUSE=alsa ipv6
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-mpg123 >=media-libs/libao-1 media-libs/libid3tag media-libs/libmad sys-libs/zlib alsa? ( media-libs/alsa-lib )
 SLOT=0
 SRC_URI=mirror://sourceforge/mpg321/mpg321_0.3.2.orig.tar.gz -> mpg321-0.3.2.tar.gz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=c1b55871ad6e0c573a20025e714e1083
+_md5_=05da4bd44b99553423f332ce25ca2ce6
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-0.7.4 b/metadata/md5-cache/media-sound/ncmpcpp-0.7.4
index 95eae8683917..11dba20afe6e 100644
--- a/metadata/md5-cache/media-sound/ncmpcpp-0.7.4
+++ b/metadata/md5-cache/media-sound/ncmpcpp-0.7.4
@@ -4,11 +4,11 @@ DESCRIPTION=featureful ncurses based MPD client inspired by ncmpc
 EAPI=5
 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.4.tar.bz2
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=fba9996fc0d211128162fd6a4380b2d2
+_md5_=fb976f8cc7621fa87b44f6c8f03afa16
diff --git a/metadata/md5-cache/media-sound/tagtool-0.12.3-r1 b/metadata/md5-cache/media-sound/tagtool-0.12.3-r1
index 32d84e4b1c45..600591918453 100644
--- a/metadata/md5-cache/media-sound/tagtool-0.12.3-r1
+++ b/metadata/md5-cache/media-sound/tagtool-0.12.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Audio Tag Tool Ogg/Mp3 Tagger
 EAPI=6
 HOMEPAGE=http://pwp.netcabo.pt/paol/tagtool
 IUSE=mp3 +vorbis
-KEYWORDS=amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 >=gnome-base/libglade-2.6 mp3? ( >=media-libs/id3lib-3.8.3-r6 ) vorbis? ( >=media-libs/libvorbis-1 )
 REQUIRED_USE=|| ( mp3 vorbis )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/tagtool/tagtool-0.12.3.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=c249bd8044c1554bfe2bf0bad4014172
+_md5_=0f16305cb53a60856543580aabc43370
diff --git a/metadata/md5-cache/media-sound/tapiir-0.7.3 b/metadata/md5-cache/media-sound/tapiir-0.7.3
index 58d249f6bf33..ddfef3e9c59e 100644
--- a/metadata/md5-cache/media-sound/tapiir-0.7.3
+++ b/metadata/md5-cache/media-sound/tapiir-0.7.3
@@ -3,11 +3,11 @@ DEPEND=media-sound/jack-audio-connection-kit media-libs/alsa-lib x11-libs/fltk:1
 DESCRIPTION=a flexible audio effects processor, inspired on the classical magnetic tape delay systems
 EAPI=5
 HOMEPAGE=http://www.resorama.com/maarten/tapiir/
-KEYWORDS=amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-sound/jack-audio-connection-kit media-libs/alsa-lib x11-libs/fltk:1
 SLOT=0
 SRC_URI=http://www.resorama.com/maarten/files/tapiir-0.7.3.tgz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=bbc613fce04f18187a26b4a9f0370b31
+_md5_=33dc0468fbd12d0b29fcd1ff1ec1e6b4
diff --git a/metadata/md5-cache/media-sound/timemachine-0.3.3-r1 b/metadata/md5-cache/media-sound/timemachine-0.3.3-r1
index 0a5f33060cf1..aed5033d01ea 100644
--- a/metadata/md5-cache/media-sound/timemachine-0.3.3-r1
+++ b/metadata/md5-cache/media-sound/timemachine-0.3.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=JACK client record button remembering the last 10 seconds when press
 EAPI=6
 HOMEPAGE=http://plugin.org.uk/timemachine/
 IUSE=lash
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/jack-audio-connection-kit-0.80 x11-libs/gtk+:2 >=media-libs/libsndfile-1.0.5 media-libs/liblo lash? ( >=media-sound/lash-0.5 )
 SLOT=0
 SRC_URI=http://plugin.org.uk/timemachine/timemachine-0.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=8bdaebbd1e62271b2c5d9ccad0fd55e1
+_md5_=76edec38bf1e3a9c7fbcd5aa777fed7f
diff --git a/metadata/md5-cache/media-tv/freevo-1.9.0-r1 b/metadata/md5-cache/media-tv/freevo-1.9.0-r1
index 694f5dd29c33..4bcddd34db21 100644
--- a/metadata/md5-cache/media-tv/freevo-1.9.0-r1
+++ b/metadata/md5-cache/media-tv/freevo-1.9.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Digital video jukebox (PVR, DVR)
 EAPI=5
 HOMEPAGE=http://www.freevo.org/
 IUSE=cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer nls tv vorbis xine X python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-python/beautifulsoup:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/twisted-core-2.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/twisted-web-0.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/kaa-base-0.6.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/kaa-metadata-0.7.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/kaa-imlib2-0.2.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/kaa-display[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] media-video/mplayer[fbcon?] >=media-libs/libsdl-1.2.5[fbcon?] media-libs/sdl-image[jpeg,png] x11-apps/xset cdparanoia? ( media-sound/cdparanoia ) dvd? ( >=media-video/lsdvd-0.10 fbcon? ( media-libs/xine-lib[fbcon] ) encode? ( media-video/dvdbackup ) ) flac? ( media-libs/flac ) gphoto2? ( media-libs/libgphoto2 ) jpeg? ( virtual/jpeg ) lame? ( media-sound/lame ) lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 ) matrox? ( >=media-video/matroxset-0.3 ) mixer? ( media-sound/aumix ) tv? ( media-tv/xmltv ) xine? ( media-video/xine-ui ) vorbis? ( media-sound/vorbis-tools ) >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-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=mirror://sourceforge/freevo/freevo-1.9.0.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:-
 _eclasses_=distutils-r1	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=f7525d4ec7ccea7c797bfad3259a0a71
+_md5_=803c74097bdda1d44ee594a6c215dff1
diff --git a/metadata/md5-cache/media-video/qx11grab-0.4.12 b/metadata/md5-cache/media-video/qx11grab-0.4.12
index b00388e9d056..317b0a2d4741 100644
--- a/metadata/md5-cache/media-video/qx11grab-0.4.12
+++ b/metadata/md5-cache/media-video/qx11grab-0.4.12
@@ -4,7 +4,7 @@ DESCRIPTION=X11 desktop video grabber tray
 EAPI=5
 HOMEPAGE=http://qx11grab.hjcms.de/
 IUSE=libav kde opengl pulseaudio
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 PDEPEND=virtual/freedesktop-icon-theme
 RDEPEND=dev-libs/qjson >=dev-qt/qtcore-4.7.4:4 >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility] >=media-libs/alsa-lib-1.0.26 >=media-libs/fontconfig-2.4 >=media-libs/freetype-2.4:2 >=sys-apps/dbus-1.6.4 >=x11-libs/libX11-1.3.4 >=x11-libs/libXrandr-1.3 libav? ( >=media-video/libav-9:0=[X,encode,truetype] ) !libav? ( >=media-video/ffmpeg-1.1:0=[X,encode,truetype] ) kde? ( kde-base/kdelibs:4 ) opengl? ( >=dev-qt/qtopengl-4.7.4:4 ) pulseaudio? ( media-sound/pulseaudio )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://qx11grab.hjcms.de/downloads/0.4.12/qx11grab-0.4.12.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9eaa040bf47d9b0bab7ce0f30b70dd34
+_md5_=2a0445c08146403571d8b14f7c17dab5
diff --git a/metadata/md5-cache/media-video/tovid-0.35.2 b/metadata/md5-cache/media-video/tovid-0.35.2
index 653f0dc19d65..0b2d03557952 100644
--- a/metadata/md5-cache/media-video/tovid-0.35.2
+++ b/metadata/md5-cache/media-video/tovid-0.35.2
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of DVD authoring tools
 EAPI=5
 HOMEPAGE=http://tovid.wikia.com/wiki/Tovid_Wiki
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-cdr/dvd+rw-tools dev-tcltk/tix || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) media-sound/normalize >=media-sound/sox-14.3.2 media-video/dvdauthor >=media-video/mjpegtools-2.0.0 || ( >=media-video/mplayer-1.0_rc4_p20110101[dvdnav] media-video/mpv[libmpv,dvdnav] ) sys-devel/bc virtual/ffmpeg >=dev-lang/python-2.7.5-r2:2.7[tk] >=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_3(-),-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://github.com/tovid-suite/tovid/archive/v0.35.2.tar.gz -> tovid-0.35.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:-
 _eclasses_=distutils-r1	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b3f987ad4a50afd07a3faa3e0664e5e2
+_md5_=f33cdf4a3f4c257934bdb50c96a6a2a1
diff --git a/metadata/md5-cache/net-analyzer/echoping-6.0.2_p434-r2 b/metadata/md5-cache/net-analyzer/echoping-6.0.2_p434-r2
index 139bcb49a65a..7a9c1b10a73a 100644
--- a/metadata/md5-cache/net-analyzer/echoping-6.0.2_p434-r2
+++ b/metadata/md5-cache/net-analyzer/echoping-6.0.2_p434-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Small program to test performances of remote servers
 EAPI=5
 HOMEPAGE=http://echoping.sourceforge.net/
 IUSE=gnutls http icp idn priority smtp ssl tos postgres ldap
-KEYWORDS=amd64 ~hppa ~x86
+KEYWORDS=amd64 ~hppa x86
 LICENSE=GPL-2
 RDEPEND=idn? ( net-dns/libidn ) postgres? ( dev-db/postgresql:* ) ldap? ( net-nds/openldap ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3:= ) !gnutls? ( >=dev-libs/openssl-0.9.7d:= ) )
 REQUIRED_USE=gnutls? ( ssl )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/echoping-6.0.2_p434.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=1d5d5d6db7ec67a3f6d8886c2a16f1cf
+_md5_=e74c624d8aaec9384c9d1347b001c6a0
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.4.4-r1 b/metadata/md5-cache/net-analyzer/icinga2-2.4.4-r1
index c43cd46209bc..4e1ee1b77c52 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-2.4.4-r1
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.4.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Distributed, general purpose, network monitoring engine
 EAPI=5
 HOMEPAGE=http://icinga.org/icinga2
 IUSE=+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax apache2
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0 >=dev-libs/boost-1.41 console? ( dev-libs/libedit ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) classicui? ( net-analyzer/icinga[web] ) studio? ( x11-libs/wxGTK:2.9 ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=!minimal? ( || ( mysql postgres ) )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/Icinga/icinga2/archive/v2.4.4.tar.gz -> icinga2-2.4.4.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:cmake-utils src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	depend.apache	e3c541cb90838388f81620d630c28f41	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b6e8bacdc8edc2a25c81355ed711d0a2
+_md5_=eba244cbd33c3b990bd8ff6b18e789c1
diff --git a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.1.2 b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.1.2
index 57c9dae3eda5..9204119a90e9 100644
--- a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.1.2
+++ b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu
 EAPI=5
 HOMEPAGE=https://www.monitoring-plugins.org/
 IUSE=gnutls ipv6 ldap libressl mysql dns fping game postgres samba snmp ssh +ssl
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls ) ) dns? ( net-dns/bind-tools ) game? ( games-util/qstat ) fping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) !net-analyzer/nagios-plugins
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://www.monitoring-plugins.org/download/monitoring-plugins-2.1.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- src_configure:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=b1a6070368daf858acbd8f634ce57cb9
+_md5_=bdae4f6346e30033048160753b085dcf
diff --git a/metadata/md5-cache/net-analyzer/nmap-7.12 b/metadata/md5-cache/net-analyzer/nmap-7.12
index 0497bb951dfd..3b3b2825856a 100644
--- a/metadata/md5-cache/net-analyzer/nmap-7.12
+++ b/metadata/md5-cache/net-analyzer/nmap-7.12
@@ -4,7 +4,7 @@ DESCRIPTION=A utility for network discovery and security auditing
 EAPI=5
 HOMEPAGE=http://nmap.org/
 IUSE=ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap linguas_de linguas_fr linguas_hi linguas_hr linguas_it linguas_ja linguas_pl linguas_pt_BR linguas_ru linguas_zh python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap[ipv6?] zenmap? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) system-lua? ( >=dev-lang/lua-5.2[deprecated] ) ndiff? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
 REQUIRED_USE=system-lua? ( nse ) ndiff? ( python_targets_python2_7 ) zenmap? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://nmap.org/dist/nmap-7.12.tar.bz2 https://dev.gentoo.org/~jer/nmap-logo-64.png
 _eclass_exported_funcs=pkg_setup:- src_unpack:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=c72125426c86195528274294ea2c2da7
+_md5_=35267f4e6ee250261186947bb87558c1
diff --git a/metadata/md5-cache/net-analyzer/tcpflow-1.4.5_p1-r1 b/metadata/md5-cache/net-analyzer/tcpflow-1.4.5_p1-r1
index dc0700870d81..2f61b9e619dc 100644
--- a/metadata/md5-cache/net-analyzer/tcpflow-1.4.5_p1-r1
+++ b/metadata/md5-cache/net-analyzer/tcpflow-1.4.5_p1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A tool for monitoring, capturing and storing TCP connections flows
 EAPI=5
 HOMEPAGE=https://github.com/simsong/tcpflow http://packages.qa.debian.org/t/tcpflow.html
 IUSE=cairo test
-KEYWORDS=amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-3
 RDEPEND=app-forensics/afflib dev-libs/boost dev-libs/openssl:= net-libs/http-parser:= net-libs/libpcap sys-libs/zlib cairo? ( x11-libs/cairo )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/t/tcpflow/tcpflow_1.4.5+repack1.orig.tar.gz mirror://debian/pool/main/t/tcpflow/tcpflow_1.4.5+repack1-1.debian.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=6618de5275124d4ba9c826200c3f727a
+_md5_=4d5b0a5ec98238564ce8cdc32b118812
diff --git a/metadata/md5-cache/net-analyzer/vnstat-1.15 b/metadata/md5-cache/net-analyzer/vnstat-1.15
index 0fa0b912a939..ed90a8bc2f2d 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-1.15
+++ b/metadata/md5-cache/net-analyzer/vnstat-1.15
@@ -4,11 +4,11 @@ DESCRIPTION=Console-based network traffic monitor that keeps statistics of netwo
 EAPI=5
 HOMEPAGE=http://humdi.net/vnstat/
 IUSE=gd selinux test
-KEYWORDS=amd64 arm hppa ~ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm hppa ~ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-vnstatd )
 SLOT=0
 SRC_URI=http://humdi.net/vnstat/vnstat-1.15.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_compile:- src_install:-
 _eclasses_=multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=f6ac231271278beb942054a7570e42cf
+_md5_=66f14d2d9c94f2bffd91afc6b7b2d97e
diff --git a/metadata/md5-cache/net-dns/avahi-0.6.32 b/metadata/md5-cache/net-dns/avahi-0.6.32
index 076df9d22641..5f9bb3940b90 100644
--- a/metadata/md5-cache/net-dns/avahi-0.6.32
+++ b/metadata/md5-cache/net-dns/avahi-0.6.32
@@ -4,7 +4,7 @@ DESCRIPTION=System which facilitates service discovery on a local network
 EAPI=5
 HOMEPAGE=http://avahi.org/
 IUSE=autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils 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 python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libdaemon dev-libs/expat dev-libs/glib: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(-)?] gdbm? ( sys-libs/gdbm[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(-)?] ) qt4? ( dev-qt/qtcore: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(-)?] ) gtk? ( x11-libs/gtk+: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(-)?] ) gtk3? ( x11-libs/gtk+:3[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(-)?] ) dbus? ( sys-apps/dbus[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(-)?] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) mono? ( dev-lang/mono gtk? ( dev-dotnet/gtk-sharp ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( dev-python/pygtk ) dbus? ( dev-python/dbus-python ) ) bookmarks? ( dev-python/twisted-core dev-python/twisted-web ) howl-compat? ( !net-misc/howl ) mdnsresponder-compat? ( !net-misc/mDNSResponder ) selinux? ( sec-policy/selinux-avahi )
 REQUIRED_USE=utils? ( || ( gtk gtk3 ) ) python? ( dbus gdbm ) mono? ( dbus ) howl-compat? ( dbus ) mdnsresponder-compat? ( dbus )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/lathiat/avahi/archive/v0.6.32.tar.gz -> avahi-0.6.32.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	mono-env	10809200679bcceefebac9e72bebb6e6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=f24f1d3ae434e215b8b811bbac08aa1a
+_md5_=d673776bd094c31dcd7a1c36123ae098
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.0.7.2 b/metadata/md5-cache/net-firewall/shorewall-5.0.7.2
index 02acc1c3b212..75b7024f5e00 100644
--- a/metadata/md5-cache/net-firewall/shorewall-5.0.7.2
+++ b/metadata/md5-cache/net-firewall/shorewall-5.0.7.2
@@ -4,7 +4,7 @@ DESCRIPTION=A high-level tool for configuring Netfilter
 EAPI=6
 HOMEPAGE=http://www.shorewall.net/
 IUSE=doc +init +ipv4 ipv6 lite4 lite6
-KEYWORDS=alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
 REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://www.shorewall.net/pub/shorewall/5.0/shorewall-5.0.7/shorewall-core-5.0.7.2.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.0/shorewall-5.0.7/shorewall-5.0.7.2.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.0/shorewall-5.0.7/shorewall6-5.0.7.2.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.0/shorewall-5.0.7/shorewall-lite-5.0.7.2.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.0/shorewall-5.0.7/shorewall6-lite-5.0.7.2.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.0/shorewall-5.0.7/shorewall-init-5.0.7.2.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.0/shorewall-5.0.7/shorewall-docs-html-5.0.7.2.tar.bz2 )
 _eclass_exported_funcs=pkg_pretend:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	d062ae4ba2fc40a19c11de2ad89b6616	prefix	e7f2b9c6e57342e5d25eac22fce23062	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7caf68d4411242095e6e0a24d5f8bceb
+_md5_=795325d74309a70c6e539f82561916aa
diff --git a/metadata/md5-cache/net-irc/ngircd-23-r1 b/metadata/md5-cache/net-irc/ngircd-23-r1
index ba390709bbbb..b344e703e536 100644
--- a/metadata/md5-cache/net-irc/ngircd-23-r1
+++ b/metadata/md5-cache/net-irc/ngircd-23-r1
@@ -4,7 +4,7 @@ DESCRIPTION=An IRC server written from scratch
 EAPI=5
 HOMEPAGE=http://ngircd.barton.de/
 IUSE=debug gnutls iconv ident ipv6 libressl pam ssl tcpd zlib
-KEYWORDS=amd64 ~x86 ~x64-macos
+KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=GPL-2
 RDEPEND=iconv? ( virtual/libiconv ) ident? ( net-libs/libident ) pam? ( virtual/pam ) ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0 ) ) gnutls? ( net-libs/gnutls ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) zlib? ( sys-libs/zlib )
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://ngircd.barton.de/pub/ngircd/ngircd-23.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:autotools-utils src_configure:- src_compile:autotools-utils src_test:autotools-utils src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=d87109785810c6c1d47143ca6907058f
+_md5_=6e6aa1ad4efb5e972fac1e939fb95896
diff --git a/metadata/md5-cache/net-irc/weechat-1.4-r1 b/metadata/md5-cache/net-irc/weechat-1.4-r1
index c5e95dd2fb1e..67912c9cc585 100644
--- a/metadata/md5-cache/net-irc/weechat-1.4-r1
+++ b/metadata/md5-cache/net-irc/weechat-1.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Portable and multi-interface IRC client
 EAPI=5
 HOMEPAGE=http://weechat.org/
 IUSE=doc nls +ssl test linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_pt_BR linguas_ru linguas_tr guile lua +perl +python ruby tcl +alias +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( dev-scheme/guile:12 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,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_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://weechat.org/files/src/weechat-1.4.tar.bz2
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=92c9ebf992a43e213dcd7835dd46cd56
+_md5_=8a4d4dfd4b95e199727bc8ab99c596f1
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.49 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.49
index 2020af00cb7d..6c941126229f 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.49
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.49
@@ -4,10 +4,10 @@ DESCRIPTION=Small C library to run an HTTP server as part of another application
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/libmicrohttpd/
 IUSE=epoll messages ssl static-libs test
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
 SLOT=0/12
 SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.49.tar.gz
 _eclass_exported_funcs=src_configure:- src_test:- src_install:-
-_md5_=39497bf170531b63f0916e3099d599b0
+_md5_=d3f11b18f1d86c4cac6d03ad800d873d
diff --git a/metadata/md5-cache/net-libs/libproxy-0.4.13-r1 b/metadata/md5-cache/net-libs/libproxy-0.4.13-r1
index 1ed79bcd262b..ffb31035a003 100644
--- a/metadata/md5-cache/net-libs/libproxy-0.4.13-r1
+++ b/metadata/md5-cache/net-libs/libproxy-0.4.13-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Library for automatic proxy configuration management
 EAPI=6
 HOMEPAGE=https://github.com/libproxy/libproxy
 IUSE=gnome kde mono networkmanager perl python spidermonkey test webkit 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 python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 PDEPEND=networkmanager? ( net-misc/networkmanager )
 RDEPEND=gnome? ( dev-libs/glib: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(-)?] ) mono? ( dev-lang/mono ) networkmanager? ( sys-apps/dbus: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(-)?] ) perl? ( dev-lang/perl:= ) python? ( 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(-)] ) spidermonkey? ( >=dev-lang/spidermonkey-1.8.5:0= ) webkit? ( net-libs/webkit-gtk:4 ) kde? ( || ( kde-frameworks/kconfig:5 kde-apps/kreadconfig:4 ) )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=https://github.com/libproxy/libproxy/archive/0.4.13.tar.gz -> libproxy-0.4.13.tar.gz
 _eclass_exported_funcs=pkg_setup:mono-env src_prepare:cmake-utils src_configure:- src_compile:cmake-multilib src_test:cmake-multilib src_install:cmake-multilib
 _eclasses_=cmake-multilib	273c15f5a0a06438a38bb5c3e98fa2db	cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	mono-env	10809200679bcceefebac9e72bebb6e6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b886c0263544456ba373bd081783ded5
+_md5_=0ba0c37b67602c497222a6685cb6d32c
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.10.0 b/metadata/md5-cache/net-libs/nghttp2-1.10.0
index c1b0f3713ff0..fecba47a63c0 100644
--- a/metadata/md5-cache/net-libs/nghttp2-1.10.0
+++ b/metadata/md5-cache/net-libs/nghttp2-1.10.0
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP/2 C Library
 EAPI=6
 HOMEPAGE=https://nghttp2.org/
 IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=cxx? ( dev-libs/boost:=[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(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc ) utils? ( >=dev-libs/libev-4.15 !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist] ) libressl? ( dev-libs/libressl ) >=sys-libs/zlib-1.2.3 ) xml? ( >=dev-libs/libxml2-2.7.7:2 )
 SLOT=0/1.14
 SRC_URI=https://github.com/tatsuhiro-t/nghttp2/releases/download/v1.10.0/nghttp2-1.10.0.tar.gz
 _eclass_exported_funcs=src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=6637cd4c17ddcc5313d0e1ca76ba209b
+_md5_=003d826d108af7a45cedb41189b881d2
diff --git a/metadata/md5-cache/net-libs/zeromq-4.1.4 b/metadata/md5-cache/net-libs/zeromq-4.1.4
index 96d53de015ea..22f56ed9961f 100644
--- a/metadata/md5-cache/net-libs/zeromq-4.1.4
+++ b/metadata/md5-cache/net-libs/zeromq-4.1.4
@@ -4,11 +4,11 @@ DESCRIPTION=A brokerless kernel
 EAPI=5
 HOMEPAGE=http://www.zeromq.org/
 IUSE=pgm static-libs test
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=dev-libs/libsodium:= pgm? ( =net-libs/openpgm-5.2.122 )
 SLOT=0/5
 SRC_URI=http://download.zeromq.org/zeromq-4.1.4.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:autotools-utils src_test:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=e91bc40cadaee424576f918948b6935b
+_md5_=bf02ea2ddb726f6774566ecf06f54b88
diff --git a/metadata/md5-cache/net-misc/chrony-2.3 b/metadata/md5-cache/net-misc/chrony-2.3
index a7092b5be6f6..2d08551c574f 100644
--- a/metadata/md5-cache/net-misc/chrony-2.3
+++ b/metadata/md5-cache/net-misc/chrony-2.3
@@ -4,7 +4,7 @@ DESCRIPTION=NTP client and server programs
 EAPI=5
 HOMEPAGE=http://chrony.tuxfamily.org/
 IUSE=caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns
-KEYWORDS=~alpha amd64 ~arm hppa ~mips ~ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm hppa ~mips ~ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sys-libs/readline-4.1-r4:= ) selinux? ( sec-policy/selinux-chronyd )
 REQUIRED_USE=?? ( libedit readline )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=http://download.tuxfamily.org/chrony/chrony-2.3.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=b598df4b5af1a282282d93c8be66c328
+_md5_=0e24b266077bbebc336e5c7aee5438e1
diff --git a/metadata/md5-cache/net-misc/geoipupdate-2.2.2 b/metadata/md5-cache/net-misc/geoipupdate-2.2.2
index 2e2ea5406934..f6d9fed9507a 100644
--- a/metadata/md5-cache/net-misc/geoipupdate-2.2.2
+++ b/metadata/md5-cache/net-misc/geoipupdate-2.2.2
@@ -3,10 +3,10 @@ DEPEND=net-misc/curl sys-libs/zlib
 DESCRIPTION=performs automatic updates of GeoIP2 and GeoIP Legacy binary databases
 EAPI=5
 HOMEPAGE=https://github.com/maxmind/geoipupdate
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=net-misc/curl sys-libs/zlib !<dev-libs/geoip-1.6.0
 SLOT=0
 SRC_URI=https://github.com/maxmind/geoipupdate/releases/download/v2.2.2/geoipupdate-2.2.2.tar.gz
 _eclass_exported_funcs=src_install:-
-_md5_=a7536747374283a9f38386aa960d1e9a
+_md5_=f847d3bb5effe8a6d67c0259564f8f9f
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.25 b/metadata/md5-cache/net-misc/memcached-1.4.25
index 6c1dd1115062..55d63a5be917 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.25
+++ b/metadata/md5-cache/net-misc/memcached-1.4.25
@@ -4,11 +4,11 @@ DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=5
 HOMEPAGE=http://memcached.org/
 IUSE=test slabs-reassign debug sasl selinux
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-memcached )
 SLOT=0
 SRC_URI=http://www.memcached.org/files/memcached-1.4.25.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=511ae5dd37c154a2c305778b42c39b07
+_md5_=17d9ee1f5cc2f11efb8ef066d9085f94
diff --git a/metadata/md5-cache/net-misc/radvd-2.12 b/metadata/md5-cache/net-misc/radvd-2.12
index ea145e36b3c0..6875fc6e2876 100644
--- a/metadata/md5-cache/net-misc/radvd-2.12
+++ b/metadata/md5-cache/net-misc/radvd-2.12
@@ -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.12.tar.gz
 _eclass_exported_funcs=pkg_postinst:readme.gentoo pkg_setup:- src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=a09121d5ea911b2593b7f4de3943c4e9
+_md5_=f28046b52a323137f53eaa5c78a66042
diff --git a/metadata/md5-cache/net-misc/radvd-2.13 b/metadata/md5-cache/net-misc/radvd-2.13
index 5c7583c8c788..a53bbd28b3ea 100644
--- a/metadata/md5-cache/net-misc/radvd-2.13
+++ b/metadata/md5-cache/net-misc/radvd-2.13
@@ -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.13.tar.gz
 _eclass_exported_funcs=pkg_postinst:readme.gentoo pkg_setup:- src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=a09121d5ea911b2593b7f4de3943c4e9
+_md5_=f28046b52a323137f53eaa5c78a66042
diff --git a/metadata/md5-cache/net-misc/tlsdate-0.0.13 b/metadata/md5-cache/net-misc/tlsdate-0.0.13
index 08db571b311c..1d2ce3dd956f 100644
--- a/metadata/md5-cache/net-misc/tlsdate-0.0.13
+++ b/metadata/md5-cache/net-misc/tlsdate-0.0.13
@@ -4,11 +4,11 @@ DESCRIPTION=Update local time over HTTPS
 EAPI=4
 HOMEPAGE=https://github.com/ioerror/tlsdate
 IUSE=dbus +seccomp static-libs
-KEYWORDS=amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~s390 ~sh ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~s390 ~sh ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl dev-libs/libevent dbus? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=https://github.com/ioerror/tlsdate/tarball/tlsdate-0.0.13 -> tlsdate-0.0.13.tar.gz
 _eclass_exported_funcs=pkg_preinst:- src_unpack:vcs-snapshot src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d
-_md5_=7bca0b7491fbc9f51d7faa3eba9cbf1b
+_md5_=3269debfaa5441a215eb786fb3b5eb7e
diff --git a/metadata/md5-cache/net-misc/unison-2.48.3 b/metadata/md5-cache/net-misc/unison-2.48.3
index 47e3680e066c..f9833121835f 100644
--- a/metadata/md5-cache/net-misc/unison-2.48.3
+++ b/metadata/md5-cache/net-misc/unison-2.48.3
@@ -4,11 +4,11 @@ DESCRIPTION=Two-way cross-platform file synchronizer
 EAPI=5
 HOMEPAGE=http://www.cis.upenn.edu/~bcpierce/unison/
 IUSE=gtk doc static debug threads +ocamlopt test
-KEYWORDS=amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=gtk? ( >=dev-ml/lablgtk-2.2 || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) ) !net-misc/unison:0 app-eselect/eselect-unison
 SLOT=2.48
 SRC_URI=http://www.cis.upenn.edu/~bcpierce/unison/download/releases/unison-2.48.3/unison-2.48.3.tar.gz doc? ( http://www.cis.upenn.edu/~bcpierce/unison/download/releases/unison-2.48.3/unison-2.48.3-manual.pdf http://www.cis.upenn.edu/~bcpierce/unison/download/releases/unison-2.48.3/unison-2.48.3-manual.html )
 _eclass_exported_funcs=pkg_postinst:- src_compile:- src_test:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d8905bbf09c48af89415a6a9beca623d
+_md5_=4a19f1000e7cd4142514c93388c27cae
diff --git a/metadata/md5-cache/net-misc/wicd-1.7.4-r1 b/metadata/md5-cache/net-misc/wicd-1.7.4-r1
index 628f43251efd..2d6cc725ade5 100644
--- a/metadata/md5-cache/net-misc/wicd-1.7.4-r1
+++ b/metadata/md5-cache/net-misc/wicd-1.7.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A lightweight wired and wireless network manager for Linux
 EAPI=6
 HOMEPAGE=https://launchpad.net/wicd
 IUSE=doc X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils gnome-shell python_targets_python2_7
-KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses?,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] X? ( gtk? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( x11-misc/ktsuss x11-libs/gksu kde-apps/kdesu ) ) || ( net-misc/dhcpcd net-misc/dhcp net-misc/pump ) net-wireless/wireless-tools net-wireless/wpa_supplicant || ( sys-apps/net-tools sys-apps/ethtool ) !gtk? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ioctl? ( dev-python/python-iwscan[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-wpactrl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libnotify? ( dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ncurses? ( dev-python/urwid[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pm-utils? ( sys-power/pm-utils ) gnome-shell? ( gnome-base/gnome-shell ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses?,xml] ) >=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://launchpad.net/wicd/1.7/1.7.4/+download/wicd-1.7.4.tar.gz mac4lin? ( https://dev.gentoo.org/~anarchy/dist/wicd-mac4lin-icons.tar.xz ) ambiance? ( http://freetimesblog.altervista.org/blog/wp-content/uploads/downloads/2010/05/Icone-Wicd-Lucid.tar.gz )
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:linux-info src_prepare:- src_configure:- src_compile:distutils-r1 src_test:distutils-r1 src_install:-
 _eclasses_=distutils-r1	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3d8767377bbf7a016da9e6c24359cc6e
+_md5_=90133096c5bdb26f092b7d0fd8d8e5bf
diff --git a/metadata/md5-cache/net-nntp/pan-0.139-r2 b/metadata/md5-cache/net-nntp/pan-0.139-r2
index 117de521b91c..41e5d672c5ab 100644
--- a/metadata/md5-cache/net-nntp/pan-0.139-r2
+++ b/metadata/md5-cache/net-nntp/pan-0.139-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A newsreader for GNOME
 EAPI=5
 HOMEPAGE=http://pan.rebelbase.com/
 IUSE=dbus gnome-keyring libnotify spell ssl
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 >=x11-libs/gtk+-2.16:2 dev-libs/gmime:2.6 gnome-keyring? ( >=gnome-base/libgnome-keyring-3.2 ) libnotify? ( >=x11-libs/libnotify-0.4.1:0= ) spell? ( >=app-text/enchant-1.6 >=app-text/gtkspell-2.0.7:2 ) ssl? ( >=net-libs/gnutls-3:0= )
 SLOT=0
 SRC_URI=http://pan.rebelbase.com/download/releases/0.139/source/pan-0.139.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=ee2a973c78648c7496a594879686f4e1
+_md5_=c7341f5682960d0d5a1e798bf53dd5f7
diff --git a/metadata/md5-cache/net-print/cups-2.1.3-r1 b/metadata/md5-cache/net-print/cups-2.1.3-r1
index 66762fedc7b3..9b073fd87cad 100644
--- a/metadata/md5-cache/net-print/cups-2.1.3-r1
+++ b/metadata/md5-cache/net-print/cups-2.1.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=The Common Unix Printing System
 EAPI=6
 HOMEPAGE=http://www.cups.org/
 IUSE=acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf +linguas_ca +linguas_cs +linguas_de +linguas_es +linguas_fr +linguas_it +linguas_ja +linguas_ru 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 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint
 LICENSE=GPL-2
 PDEPEND=>=net-print/cups-filters-1.0.43
 RDEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-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(-)?] ) java? ( >=virtual/jre-1.6:* ) kerberos? ( >=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(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) 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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ssl? ( >=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(-)?] >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[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-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) selinux? ( sec-policy/selinux-cups ) java? ( >=dev-java/java-config-2.2.0-r3 )
@@ -14,4 +14,4 @@ SLOT=0
 SRC_URI=http://www.cups.org/software/2.1.3/cups-2.1.3-source.tar.bz2
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fbdfdda19c2b4cc7f7028a796f7ebdd2
+_md5_=c7d2058628f22c64c107593ca1f13e3e
diff --git a/metadata/md5-cache/net-print/hplip-3.16.3 b/metadata/md5-cache/net-print/hplip-3.16.3
index 2c6504fff0df..cf7aa94028dc 100644
--- a/metadata/md5-cache/net-print/hplip-3.16.3
+++ b/metadata/md5-cache/net-print/hplip-3.16.3
@@ -4,7 +4,7 @@ DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service
 EAPI=5
 HOMEPAGE=http://hplipopensource.com/hplip-web/index.html
 IUSE=doc fax +hpcups hpijs kde libnotify -libusb0 minimal parport policykit qt4 scanner snmp static-ppds X python_targets_python2_7
-KEYWORDS=amd64 arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 hpijs? ( || ( >=net-print/cups-filters-1.0.43-r1[foomatic] >=net-print/foomatic-filters-3.0.20080507[cups] ) ) !minimal? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=net-print/cups-1.4.0 !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( >=sys-apps/dbus-1.6.8-r1 ) snmp? ( net-analyzer/net-snmp dev-libs/openssl:0 ) ) >=app-text/ghostscript-gpl-8.71-r3 policykit? ( sys-auth/polkit ) !minimal? ( >=dev-python/dbus-python-1.1.1-r1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pygobject-2.28.6-r53:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] kernel_linux? ( virtual/udev ) scanner? ( >=dev-python/reportlab-2.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pillow-1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) fax? ( >=dev-python/reportlab-2.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) qt4? ( >=dev-python/PyQt4-4.9.6-r2[dbus,X,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] libnotify? ( >=dev-python/notify-python-0.1.1-r3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ) )
 REQUIRED_USE=!minimal? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.16.3.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.16.2-patches-1.tar.xz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2bc4c99f18e103d002c50924f8c8bd81
+_md5_=a27c43bc56bae9233470be794a197941
diff --git a/metadata/md5-cache/net-voip/vidyodesktop-3.6.3.017 b/metadata/md5-cache/net-voip/vidyodesktop-3.6.3.017
index 6ba0b40c710e..65a9df3d63b6 100644
--- a/metadata/md5-cache/net-voip/vidyodesktop-3.6.3.017
+++ b/metadata/md5-cache/net-voip/vidyodesktop-3.6.3.017
@@ -2,7 +2,7 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Enterprise video conferencing platform
 EAPI=5
 HOMEPAGE=http://www.vidyo.com/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Vidyo-EULA
 RDEPEND=app-arch/bzip2 dev-libs/expat dev-libs/glib dev-libs/libffi sys-apps/util-linux sys-libs/glibc sys-devel/gcc media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/glu media-libs/libpng media-libs/mesa net-dns/libidn sys-libs/zlib x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXv x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4
 RESTRICT=mirror strip
@@ -10,4 +10,4 @@ SLOT=0
 SRC_URI=amd64? ( https://demo.vidyo.com/upload/VidyoDesktopInstaller-ubuntu64-TAG_VD_3_6_3_017.deb ) x86? ( https://demo.vidyo.com/upload/VidyoDesktopInstaller-ubuntu-TAG_VD_3_6_3_017.deb )
 _eclass_exported_funcs=src_unpack:unpacker src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=950fe6789b47430e8bf448fc1a356e31
+_md5_=6b0222bffdca9657723a99b8d011cb59
diff --git a/metadata/md5-cache/net-wireless/bluez-5.39 b/metadata/md5-cache/net-wireless/bluez-5.39
index a51920bf07c4..942b194e74d5 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.39
+++ b/metadata/md5-cache/net-wireless/bluez-5.39
@@ -4,7 +4,7 @@ DESCRIPTION=Bluetooth Tools and System Daemons for Linux
 EAPI=6
 HOMEPAGE=http://www.bluez.org
 IUSE=cups doc debug deprecated extra-tools experimental +obex +readline selinux systemd test test-programs +udev python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.6:= >=sys-apps/hwids-20121202.2 cups? ( net-print/cups:= ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:= ) systemd? ( sys-apps/systemd ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( 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_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_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/dbus-python-1[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_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pygobject:3[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_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] )
 REQUIRED_USE=test? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) ) test-programs? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
@@ -12,4 +12,4 @@ SLOT=0/3
 SRC_URI=mirror://kernel/linux/bluetooth/bluez-5.39.tar.xz
 _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_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	udev	73058269b3e70e34e084fa3981282338	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=7f84d91af1dd03e6b1143104b1ffc162
+_md5_=c9cfe2128f93ddb9371b4a4769797fd6
diff --git a/metadata/md5-cache/sci-geosciences/mtkbabel-0.8.3.1-r1 b/metadata/md5-cache/sci-geosciences/mtkbabel-0.8.3.1-r1
index 4458c75588cf..0804df696787 100644
--- a/metadata/md5-cache/sci-geosciences/mtkbabel-0.8.3.1-r1
+++ b/metadata/md5-cache/sci-geosciences/mtkbabel-0.8.3.1-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=MTKBabel is a Perl program to operate the i-Blue 747 GPS data logger
 EAPI=6
 HOMEPAGE=http://sourceforge.net/projects/mtkbabel/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Device-SerialPort dev-perl/TimeDate
 SLOT=0
 SRC_URI=mirror://sourceforge/mtkbabel/mtkbabel-0.8.3.1.tar.gz
 _eclass_exported_funcs=src_install:-
-_md5_=0f5417cda0caaad55f50c82a8c6bc798
+_md5_=c26ef9af9d9210984b69d10845adfdda
diff --git a/metadata/md5-cache/sci-libs/ccfits-2.4 b/metadata/md5-cache/sci-libs/ccfits-2.4
index 78079e4f49e4..669f3bc7ab6b 100644
--- a/metadata/md5-cache/sci-libs/ccfits-2.4
+++ b/metadata/md5-cache/sci-libs/ccfits-2.4
@@ -4,11 +4,11 @@ DESCRIPTION=C++ interface for cfitsio
 EAPI=4
 HOMEPAGE=http://heasarc.gsfc.nasa.gov/fitsio/CCfits/
 IUSE=doc static-libs
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=sci-libs/cfitsio-3.080
 SLOT=0
 SRC_URI=http://heasarc.gsfc.nasa.gov/fitsio/CCfits//CCfits-2.4.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=2fc8cde187729743e25fc5e6437455ed
+_md5_=ebdfce4fd7cfa2ccc267d54116576f01
diff --git a/metadata/md5-cache/sci-libs/gsl-1.16 b/metadata/md5-cache/sci-libs/gsl-1.16
index 7f1a27f59b74..9418f06c0fca 100644
--- a/metadata/md5-cache/sci-libs/gsl-1.16
+++ b/metadata/md5-cache/sci-libs/gsl-1.16
@@ -4,11 +4,11 @@ DESCRIPTION=The GNU Scientific Library
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gsl/
 IUSE=cblas-external static-libs
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=cblas-external? ( virtual/cblas )
 SLOT=0
 SRC_URI=mirror://gnu/gsl/gsl-1.16.tar.gz
 _eclass_exported_funcs=pkg_pretend:- pkg_postinst:- src_prepare:- src_configure:- src_test:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=d9b30f1a5b5e69b8312546f44dfc904a
+_md5_=f4205e914e5c25cb855db79a58ffe3bb
diff --git a/metadata/md5-cache/sci-mathematics/gimps-28.9 b/metadata/md5-cache/sci-mathematics/gimps-28.9
index 80f9ae28ed1e..fb9834f0f56d 100644
--- a/metadata/md5-cache/sci-mathematics/gimps-28.9
+++ b/metadata/md5-cache/sci-mathematics/gimps-28.9
@@ -3,11 +3,11 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=The Great Internet Mersenne Prime Search
 EAPI=6
 HOMEPAGE=http://mersenne.org/
-KEYWORDS=-* amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=GIMPS
 RDEPEND=net-misc/curl
 SLOT=0
 SRC_URI=amd64? ( ftp://mersenne.org/gimps/p95v289.linux64.tar.gz ) x86? ( ftp://mersenne.org/gimps/p95v289.linux32.tar.gz )
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_install:-
 _eclasses_=multilib	d062ae4ba2fc40a19c11de2ad89b6616	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=4914244a1c78e2d3ebc58cfd91e2fe7f
+_md5_=329ec575a234da694418a13dac2827bd
diff --git a/metadata/md5-cache/sci-mathematics/ginac-1.6.6 b/metadata/md5-cache/sci-mathematics/ginac-1.6.6
index a1e54de9f230..905f2c1cf13c 100644
--- a/metadata/md5-cache/sci-mathematics/ginac-1.6.6
+++ b/metadata/md5-cache/sci-mathematics/ginac-1.6.6
@@ -4,11 +4,11 @@ DESCRIPTION=C++ library and tools for symbolic calculations
 EAPI=5
 HOMEPAGE=http://www.ginac.de/
 IUSE=doc static-libs
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=sci-libs/cln-1.2.2
 SLOT=0
 SRC_URI=http://www.ginac.de/ginac-1.6.6.tar.bz2
 _eclass_exported_funcs=src_prepare:autotools-utils src_configure:- src_compile:- src_test:autotools-utils src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=7a509b48a65c5ad9896aa4b9e19ce959
+_md5_=4949d758b8724234050adec75a8e2122
diff --git a/metadata/md5-cache/sci-mathematics/normaliz-3.1.1 b/metadata/md5-cache/sci-mathematics/normaliz-3.1.1
index 3e77c4a2faf5..82677a54fbb5 100644
--- a/metadata/md5-cache/sci-mathematics/normaliz-3.1.1
+++ b/metadata/md5-cache/sci-mathematics/normaliz-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Tool for computations in affine monoids and more
 EAPI=5
 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://www.normaliz.uni-osnabrueck.de/wp-content/uploads/2016/04/Normaliz3.1.1.zip
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=057ed15c66897938950bc50c367f2824
+_md5_=ee7577a7117aa1015ea180217403053c
diff --git a/metadata/md5-cache/sci-visualization/epix-1.2.11-r1 b/metadata/md5-cache/sci-visualization/epix-1.2.11-r1
index 5a53a3c0227a..d11807e47a90 100644
--- a/metadata/md5-cache/sci-visualization/epix-1.2.11-r1
+++ b/metadata/md5-cache/sci-visualization/epix-1.2.11-r1
@@ -4,11 +4,11 @@ DESCRIPTION=2- and 3-D plotter for creating images (to be used in LaTeX)
 EAPI=5
 HOMEPAGE=http://mathcs.holycross.edu/~ahwang/current/ePiX.html
 IUSE=doc emacs examples
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra dev-tex/xcolor emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=http://mathcs.holycross.edu/~ahwang/epix/epix-1.2.11_withpdf.tar.bz2
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=4fef81459bdd89175a20528dff64668b
+_md5_=2daa28d0164aaeaca103fb4a2a13f8cb
diff --git a/metadata/md5-cache/sys-apps/hdparm-9.48 b/metadata/md5-cache/sys-apps/hdparm-9.48
index a7f6935d7009..a0cdc861ac85 100644
--- a/metadata/md5-cache/sys-apps/hdparm-9.48
+++ b/metadata/md5-cache/sys-apps/hdparm-9.48
@@ -3,10 +3,10 @@ DESCRIPTION=Utility to change hard drive performance parameters
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/hdparm/
 IUSE=static
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/hdparm/hdparm-9.48.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=185f1cd0f928f177356d12740b00bd5d
+_md5_=9d95be74cf26db61fba8792e9dcc61f4
diff --git a/metadata/md5-cache/sys-apps/irqbalance-1.0.9-r1 b/metadata/md5-cache/sys-apps/irqbalance-1.0.9-r1
index e0037abb43a1..77ebce8769e4 100644
--- a/metadata/md5-cache/sys-apps/irqbalance-1.0.9-r1
+++ b/metadata/md5-cache/sys-apps/irqbalance-1.0.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Distribute hardware interrupts across processors on a multiprocessor
 EAPI=5
 HOMEPAGE=https://github.com/Irqbalance/irqbalance
 IUSE=caps +numa selinux
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) selinux? ( sec-policy/selinux-irqbalance )
 SLOT=0
 SRC_URI=https://github.com/Irqbalance/irqbalance/archive/v1.0.9.tar.gz -> irqbalance-1.0.9.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:autotools-utils src_configure:- src_compile:autotools-utils src_test:autotools-utils src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dc4b3e4ecca4e64741813f0f5185038e
+_md5_=7570d4c437aea0cde2317b1e82aea772
diff --git a/metadata/md5-cache/sys-apps/kmod-22 b/metadata/md5-cache/sys-apps/kmod-22
index c09046218354..3bdeab9ffd73 100644
--- a/metadata/md5-cache/sys-apps/kmod-22
+++ b/metadata/md5-cache/sys-apps/kmod-22
@@ -4,7 +4,7 @@ DESCRIPTION=library and tools for managing linux kernel modules
 EAPI=5
 HOMEPAGE=https://git.kernel.org/?p=utils/kernel/kmod/kmod.git
 IUSE=debug doc lzma python static-libs +tools zlib python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=LGPL-2
 RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) zlib? ( >=sys-libs/zlib-1.2.6 )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kmod/kmod-22.tar.xz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=4dba8c872a86510855c6883c1c112eba
+_md5_=5c93db6d57bb6d07ed43f45bfd4336b0
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.16-r1 b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.16-r1
index 296fca1d5523..d0acf82c615e 100644
--- a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.16-r1
+++ b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.16-r1
@@ -4,7 +4,7 @@ DESCRIPTION=PC/SC Architecture smartcard middleware library
 EAPI=6
 HOMEPAGE=http://pcsclite.alioth.debian.org/
 IUSE=python libusb policykit selinux +udev 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=alpha amd64 arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD ISC MIT GPL-3+ GPL-2
 RDEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/udev ) policykit? ( >=sys-auth/polkit-0.111 ) 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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) !<app-crypt/ccid-1.4.1-r1 !<sys-apps/baselayout-2 !<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-pcscd )
 REQUIRED_USE=^^ ( udev libusb ) python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://alioth.debian.org/download.php/file/4164/pcsc-lite-1.8.16.tar.bz2
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	udev	73058269b3e70e34e084fa3981282338	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=bec1368a09e3b80553164157393107bc
+_md5_=302dd254cb80289b558a5d4f3c0bb697
diff --git a/metadata/md5-cache/sys-apps/sdparm-1.10 b/metadata/md5-cache/sys-apps/sdparm-1.10
index 63199d2584bd..0d74008dd3c8 100644
--- a/metadata/md5-cache/sys-apps/sdparm-1.10
+++ b/metadata/md5-cache/sys-apps/sdparm-1.10
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/sg3_utils-1.42
 DESCRIPTION=Utility to output and modify parameters on a SCSI device, like hdparm
 EAPI=5
 HOMEPAGE=http://sg.danny.cz/sg/sdparm.html
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=sys-apps/sg3_utils-1.42
 SLOT=0
 SRC_URI=http://sg.danny.cz/sg/p/sdparm-1.10.tgz
 _eclass_exported_funcs=src_configure:- src_install:-
-_md5_=a7c71afbab4811759570c11610b101b6
+_md5_=eb9d57799e949cf4be5f878d41205b46
diff --git a/metadata/md5-cache/sys-apps/sg3_utils-1.42 b/metadata/md5-cache/sys-apps/sg3_utils-1.42
index 820d4d86d113..fbe01467ef0a 100644
--- a/metadata/md5-cache/sys-apps/sg3_utils-1.42
+++ b/metadata/md5-cache/sys-apps/sg3_utils-1.42
@@ -4,11 +4,11 @@ DESCRIPTION=Apps for querying the sg SCSI interface
 EAPI=5
 HOMEPAGE=http://sg.danny.cz/sg/
 IUSE=static-libs
-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=GPL-2
 PDEPEND=>=sys-apps/rescan-scsi-bus-1.24
 SLOT=0
 SRC_URI=http://sg.danny.cz/sg/p/sg3_utils-1.42.tgz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=719aa32b1ea14cd9fffe9bcbd1a04aad
+_md5_=ce713a283f5f5dc3ef5da024a42d0cfa
diff --git a/metadata/md5-cache/sys-apps/sysvinit-2.88-r9 b/metadata/md5-cache/sys-apps/sysvinit-2.88-r9
index 3fdfc0ef04ba..8928c627dba5 100644
--- a/metadata/md5-cache/sys-apps/sysvinit-2.88-r9
+++ b/metadata/md5-cache/sys-apps/sysvinit-2.88-r9
@@ -4,11 +4,11 @@ DESCRIPTION=/sbin/init - parent of all processes
 EAPI=5
 HOMEPAGE=https://savannah.nongnu.org/projects/sysvinit
 IUSE=selinux ibm static kernel_FreeBSD
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) selinux? ( sec-policy/selinux-shutdown )
 SLOT=0
 SRC_URI=mirror://nongnu/sysvinit/sysvinit-2.88dsf.tar.bz2
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=cf3d51b6f11644ea061ff75b2d52c2ff
+_md5_=ba20f32c995a71b7d63fa251b656d603
diff --git a/metadata/md5-cache/sys-block/megactl-0.4.1-r2 b/metadata/md5-cache/sys-block/megactl-0.4.1-r2
index a4d90f16ae47..22ad37da1571 100644
--- a/metadata/md5-cache/sys-block/megactl-0.4.1-r2
+++ b/metadata/md5-cache/sys-block/megactl-0.4.1-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=LSI MegaRAID control utility
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/megactl/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/megactl/megactl-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=df548b0160a2f71218248321a97e71ab
+_md5_=24e7ed7e149ab99e79018e23c3ddcdfc
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.63 b/metadata/md5-cache/sys-block/tgt-1.0.63
index 3f22fd0423eb..68d922d548f3 100644
--- a/metadata/md5-cache/sys-block/tgt-1.0.63
+++ b/metadata/md5-cache/sys-block/tgt-1.0.63
@@ -4,11 +4,11 @@ DESCRIPTION=Linux SCSI target framework (tgt)
 EAPI=5
 HOMEPAGE=http://stgt.sourceforge.net
 IUSE=fcoe fcp ibmvio infiniband rbd
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-infiniband/libibverbs:= sys-infiniband/librdmacm:= ) app-text/docbook-xsl-stylesheets dev-libs/libaio sys-apps/sg3_utils
 SLOT=0
 SRC_URI=https://github.com/fujita/tgt/tarball/v1.0.63 -> tgt-1.0.63.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=0f613c637952356e91b891e32f3468b5
+_md5_=8b2098c1e67f9decd4d9a5d1be667da9
diff --git a/metadata/md5-cache/sys-boot/plymouth-0.9.2 b/metadata/md5-cache/sys-boot/plymouth-0.9.2
index 428518989616..a44ee15ff247 100644
--- a/metadata/md5-cache/sys-boot/plymouth-0.9.2
+++ b/metadata/md5-cache/sys-boot/plymouth-0.9.2
@@ -4,11 +4,11 @@ DESCRIPTION=Graphical boot animation (splash) and logger
 EAPI=5
 HOMEPAGE=https://cgit.freedesktop.org/plymouth/
 IUSE=debug gdm +gtk +libkms +pango static-libs
-KEYWORDS=alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2.16:= gtk? ( dev-libs/glib:2 >=x11-libs/gtk+-3.14:3 x11-libs/cairo ) libkms? ( x11-libs/libdrm[libkms] ) pango? ( >=x11-libs/pango-1.21 ) virtual/udev !<sys-kernel/dracut-0.37-r3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png https://www.freedesktop.org/software/plymouth/releases/plymouth-0.9.2.tar.bz2
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_compile:autotools-utils src_test:autotools-utils src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=1686dfd2757d5cb107da385b0a6f991d
+_md5_=b013c2d4201562f8d36cffd34b9782ff
diff --git a/metadata/md5-cache/sys-cluster/cinder-7.0.2 b/metadata/md5-cache/sys-cluster/cinder-7.0.2
index 0762d9fa73e9..8242f4fe168d 100644
--- a/metadata/md5-cache/sys-cluster/cinder-7.0.2
+++ b/metadata/md5-cache/sys-cluster/cinder-7.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-vo
 EAPI=5
 HOMEPAGE=https://launchpad.net/cinder
 IUSE=+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/anyjson-0.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/Babel-2.1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/enum34-1.1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.17.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/eventlet-0.17.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/greenlet-0.4.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystonemiddleware-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/keystonemiddleware-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-3.0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/kombu-3.0.30[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/lxml-3.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/oslo-config-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-concurrency-2.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/oslo-concurrency-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/oslo-context-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-db-2.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/oslo-db-4.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-log-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/oslo-log-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-1.16.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-messaging-1.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-messaging-1.17.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-messaging-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-messaging-2.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-messaging-2.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-messaging-2.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-messaging-2.8.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-messaging-2.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-messaging-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/oslo-messaging-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-2.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-middleware-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-middleware-3.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/oslo-middleware-3.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-policy-0.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/oslo-policy-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-reports-0.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/oslo-reports-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-rootwrap-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/oslo-rootwrap-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/oslo-serialization-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-service-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/oslo-service-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-utils-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/oslo-utils-3.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-versionedobjects-0.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/oslo-versionedobjects-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/osprofiler-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/osprofiler-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/paramiko-1.13.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/paramiko-1.16.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/paste-2.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/pastedeploy-1.5.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/pycrypto-2.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyparsing-2.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/pyparsing-2.0.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/python-barbicanclient-3.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.18.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/python-glanceclient-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-2.28.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/python-novaclient-2.35.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/python-keystoneclient-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/python-keystoneclient-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/python-swiftclient-2.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/requests-2.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/requests-2.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/requests-2.8.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/retrying-1.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/routes-2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/taskflow-1.16.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/taskflow-1.25.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/rtslib-fb-2.1.41[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/rtslib-fb-2.1.58[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/six-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sqlite? ( >=dev-python/sqlalchemy-0.9.9[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-0.9.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( dev-python/psycopg:2 >=dev-python/sqlalchemy-0.9.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-migrate-0.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/stevedore-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/suds-0.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/webob-1.5.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/oslo-i18n-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-vmware-0.16.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/oslo-vmware-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/os-brick-0.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/os-brick-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] iscsi? ( sys-block/tgt sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils 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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://tarballs.openstack.org/cinder/cinder-7.0.2.tar.gz https://dev.gentoo.org/~prometheanfire/dist/cinder/liberty/cinder.conf.sample -> liberty-cinder.conf.sample
 _eclass_exported_funcs=pkg_postinst:- 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	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c3a0c69244ef0b695e0f3ebef69b554d
+_md5_=d7ffb31e295d92281a04da82c1287f2d
diff --git a/metadata/md5-cache/sys-devel/bison-3.0.4-r1 b/metadata/md5-cache/sys-devel/bison-3.0.4-r1
index b9d1a28e974f..3888a29c9c6b 100644
--- a/metadata/md5-cache/sys-devel/bison-3.0.4-r1
+++ b/metadata/md5-cache/sys-devel/bison-3.0.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A general-purpose (yacc-compatible) parser generator
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/bison/
 IUSE=examples nls static test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-devel/m4-1.4.16
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-3.0.4.tar.xz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=ecd627740282c0fa53563cdea7752275
+_md5_=f256d34bd0d135fd7157082bad959f34
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-4.4.1 b/metadata/md5-cache/sys-fs/btrfs-progs-4.4.1
index bffc974a11b4..f1ae48b98686 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-4.4.1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-4.4.1
@@ -4,7 +4,7 @@ DESCRIPTION=Btrfs filesystem utilities
 EAPI=5
 HOMEPAGE=https://btrfs.wiki.kernel.org
 IUSE=+convert static static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= )
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.4.1.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=24a0bd0d85806fa510d9516b32fbbbbb
+_md5_=d9f7a337e6dbcc3b46dd6fcb816671b1
diff --git a/metadata/md5-cache/sys-fs/loop-aes-3.7h b/metadata/md5-cache/sys-fs/loop-aes-3.7h
index cdbd34636938..b36914a82558 100644
--- a/metadata/md5-cache/sys-fs/loop-aes-3.7h
+++ b/metadata/md5-cache/sys-fs/loop-aes-3.7h
@@ -4,11 +4,11 @@ DESCRIPTION=Linux kernel module to encrypt disk partitions with AES cipher
 EAPI=5
 HOMEPAGE=http://loop-aes.sourceforge.net/loop-AES.README
 IUSE=cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock kernel_linux
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/loop-aes/loop-AES-v3.7h.tar.bz2
 _eclass_exported_funcs=pkg_preinst:linux-mod pkg_postrm:linux-mod pkg_postinst:- pkg_setup:- src_compile:linux-mod src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=33f9b5eb034778357f2212d316f4a18d
+_md5_=a0c014a0b2a8555da2167f271f151bdb
diff --git a/metadata/md5-cache/sys-fs/udftools-1.1 b/metadata/md5-cache/sys-fs/udftools-1.1
index f78ae3972931..18f4196d1596 100644
--- a/metadata/md5-cache/sys-fs/udftools-1.1
+++ b/metadata/md5-cache/sys-fs/udftools-1.1
@@ -3,11 +3,11 @@ DEPEND=sys-libs/readline:0=
 DESCRIPTION=Ben Fennema's tools for packet writing and the UDF filesystem
 EAPI=5
 HOMEPAGE=https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/
-KEYWORDS=amd64 ~ppc ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/pali/udftools/releases/download/1.1/udftools-1.1.tar.gz
 _eclass_exported_funcs=src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=daff33e80a5e13e398172e270c57fd3a
+_md5_=112b27f0ee33281d31b77f8e9104d17c
diff --git a/metadata/md5-cache/sys-fs/udisks-2.1.7 b/metadata/md5-cache/sys-fs/udisks-2.1.7
index 17438c61e1dd..f4d411c5ff12 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.1.7
+++ b/metadata/md5-cache/sys-fs/udisks-2.1.7
@@ -4,11 +4,11 @@ DESCRIPTION=Daemon providing interfaces to work with storage devices
 EAPI=5
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/udisks
 IUSE=acl debug cryptsetup +gptfdisk +introspection selinux systemd
-KEYWORDS=alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 >=virtual/libgudev-165:= virtual/udev acl? ( virtual/acl ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) systemd? ( >=sys-apps/systemd-209 ) >=sys-apps/util-linux-2.20.1-r2 >=sys-block/parted-3 virtual/eject cryptsetup? ( sys-fs/cryptsetup[udev(+)] sys-fs/lvm2[udev(+)] ) gptfdisk? ( >=sys-apps/gptfdisk-0.8 ) selinux? ( sec-policy/selinux-devicekit )
 SLOT=2
 SRC_URI=https://udisks.freedesktop.org/releases/udisks-2.1.7.tar.bz2
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	792f83d5ec9536cb5ccef375469d8bde	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=416071824769d543aad679c80c2982c9
+_md5_=ff6204aba952139dc79796670361a8b2
diff --git a/metadata/md5-cache/sys-fs/xfsdump-3.1.6 b/metadata/md5-cache/sys-fs/xfsdump-3.1.6
index 068428005dcb..dcd15d88bd39 100644
--- a/metadata/md5-cache/sys-fs/xfsdump-3.1.6
+++ b/metadata/md5-cache/sys-fs/xfsdump-3.1.6
@@ -4,11 +4,11 @@ DESCRIPTION=xfs dump/restore utilities
 EAPI=5
 HOMEPAGE=http://oss.sgi.com/projects/xfs
 IUSE=nls
-KEYWORDS=alpha amd64 hppa ia64 ~mips ~ppc ppc64 -sparc ~x86
+KEYWORDS=alpha amd64 hppa ia64 ~mips ~ppc ppc64 -sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-fs/e2fsprogs >=sys-fs/xfsprogs-3.2.0 sys-apps/dmapi >=sys-apps/attr-2.4.19
 SLOT=0
 SRC_URI=ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsdump-3.1.6.tar.gz ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/xfsdump-3.1.6.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=0a77bc1547d963b9b8d5738504cf0b36
+_md5_=bf81940f8c4e7dcb7306117c76c904e7
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-4.5.0 b/metadata/md5-cache/sys-fs/xfsprogs-4.5.0
index b25e943a0be7..59901340e150 100644
--- a/metadata/md5-cache/sys-fs/xfsprogs-4.5.0
+++ b/metadata/md5-cache/sys-fs/xfsprogs-4.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=xfs filesystem utilities
 EAPI=5
 HOMEPAGE=http://oss.sgi.com/projects/xfs/
 IUSE=libedit nls readline static static-libs
-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=LGPL-2.1
 RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3
 REQUIRED_USE=static? ( static-libs )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-4.5.0.tar.gz ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/xfsprogs-4.5.0.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=68518ec3e672bd7bc0fb3983d22ebaee
+_md5_=f2a22eecf32951f24b791808e613f0b0
diff --git a/metadata/md5-cache/sys-kernel/genkernel-next-64 b/metadata/md5-cache/sys-kernel/genkernel-next-64
index 50887fa0daf4..4fd0b72e4883 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-next-64
+++ b/metadata/md5-cache/sys-kernel/genkernel-next-64
@@ -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/v64.tar.gz -> 64.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=60c6ca1542b4b110d5a1ee6983ad3a4d
+_md5_=d041a2bf3252aed53e94aece31e793ce
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20160331 b/metadata/md5-cache/sys-kernel/linux-firmware-20160331
index 408ba2dcfaf9..257d1ec06055 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20160331
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20160331
@@ -3,11 +3,11 @@ DESCRIPTION=Linux firmware files
 EAPI=5
 HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
 IUSE=savedconfig savedconfig
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-1 GPL-2 GPL-3 BSD freedist
 RDEPEND=!savedconfig? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode )
 SLOT=0
 SRC_URI=mirror://gentoo/linux-firmware-20160331.tar.xz
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- src_unpack:- src_prepare:- src_install:-
 _eclasses_=portability	bb1a0ed8ea152b957d17339f01d4d7f5	savedconfig	7de7daa586f6bf361639e77d6f2299db
-_md5_=4c641299035f27d6872662e116290fa3
+_md5_=edad0a2d641e1bdce36958726a6cd4c0
diff --git a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.111.12 b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.111.12
index abb9183c32a3..2f52de1e5cad 100644
--- a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.111.12
+++ b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.111.12
@@ -4,7 +4,7 @@ DESCRIPTION=Kernel sources with OpenVZ patchset
 EAPI=5
 HOMEPAGE=http://www.openvz.org
 IUSE=symlink build
-KEYWORDS=amd64 ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ppc64 ~sparc x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
@@ -12,4 +12,4 @@ SLOT=2.6.32.111.12
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab111.12/patches/patch-042stab111.12-combined.gz
 _eclass_exported_funcs=pkg_preinst:kernel-2 pkg_postrm:kernel-2 pkg_postinst:kernel-2 pkg_setup:kernel-2 src_unpack:kernel-2 src_compile:kernel-2 src_test:kernel-2 src_install:kernel-2
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	kernel-2	42f76647114dfe0b91855624a26b2cc2	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6d61e2664b2d81187b127f1c2eba2751
+_md5_=0b4f628d6459d959affe7de0eee1ef67
diff --git a/metadata/md5-cache/sys-power/apcupsd-3.14.13 b/metadata/md5-cache/sys-power/apcupsd-3.14.13
index a84d1602f809..49c28d7838bc 100644
--- a/metadata/md5-cache/sys-power/apcupsd-3.14.13
+++ b/metadata/md5-cache/sys-power/apcupsd-3.14.13
@@ -4,11 +4,11 @@ DESCRIPTION=APC UPS daemon with integrated tcp/ip remote shutdown
 EAPI=5
 HOMEPAGE=http://www.apcupsd.org/
 IUSE=snmp +usb cgi nls gnome kernel_linux
-KEYWORDS=amd64 ~arm ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~ppc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/util-linux-2.23[tty-helpers(-)] <=sys-apps/sysvinit-2.88-r4 sys-freebsd/freebsd-ubin ) cgi? ( >=media-libs/gd-1.8.4 ) nls? ( sys-devel/gettext ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) gnome? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/glib:2 >=gnome-base/gconf-2.0 ) sys-apps/openrc virtual/mailx
 SLOT=0
 SRC_URI=mirror://sourceforge/apcupsd/apcupsd-3.14.13.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7770c0bc843c6c3827cc8ba98b409452
+_md5_=f1b080b62352e7bf3e9d3a69c923a852
diff --git a/metadata/md5-cache/sys-power/pmtools-20110323-r1 b/metadata/md5-cache/sys-power/pmtools-20110323-r1
index f2c2287604dc..88d84430ba77 100644
--- a/metadata/md5-cache/sys-power/pmtools-20110323-r1
+++ b/metadata/md5-cache/sys-power/pmtools-20110323-r1
@@ -3,11 +3,11 @@ DESCRIPTION=Collection of tools for ACPI and power management
 EAPI=5
 HOMEPAGE=https://github.com/anyc/pmtools/
 IUSE=doc
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-power/iasl-20090521
 SLOT=0
 SRC_URI=https://github.com/anyc/pmtools/tarball/20110323 -> pmtools-20110323.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=293698f46f357f402b8315e4414ecdba
+_md5_=cfd1442bf0439e58ad355115048b201a
diff --git a/metadata/md5-cache/sys-power/upower-0.99.4 b/metadata/md5-cache/sys-power/upower-0.99.4
index 52c49ace3d3d..572ad5f669e4 100644
--- a/metadata/md5-cache/sys-power/upower-0.99.4
+++ b/metadata/md5-cache/sys-power/upower-0.99.4
@@ -4,11 +4,11 @@ DESCRIPTION=D-Bus abstraction for enumerating power devices, querying history an
 EAPI=5
 HOMEPAGE=https://upower.freedesktop.org/
 IUSE=doc +introspection ios kernel_FreeBSD kernel_linux selinux
-KEYWORDS=alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.34:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( virtual/libusb:1 virtual/libgudev:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-1:= ) ) selinux? ( sec-policy/selinux-devicekit )
 SLOT=0/3
 SRC_URI=https://upower.freedesktop.org/releases/upower-0.99.4.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=d6da40eaa7bd7df6b6b1794e00bdbf7c
+_md5_=1526c200e9c2a6a665dc721e41424c8c
diff --git a/metadata/md5-cache/sys-process/audit-2.4.3-r1 b/metadata/md5-cache/sys-process/audit-2.4.3-r1
index 042703f0726a..4b7427723acf 100644
--- a/metadata/md5-cache/sys-process/audit-2.4.3-r1
+++ b/metadata/md5-cache/sys-process/audit-2.4.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Userspace utilities for storing and processing auditing records
 EAPI=5
 HOMEPAGE=https://people.redhat.com/sgrubb/audit/
 IUSE=ldap python 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 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2
 RDEPEND=ldap? ( net-nds/openldap ) sys-libs/libcap-ng
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-2.4.3.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=56f718b3d1902c05120c3bf4b6cd00ba
+_md5_=527c13f83a89273ddab261174a523d4e
diff --git a/metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1 b/metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1
index 174d54f80904..9fe9e87d2844 100644
--- a/metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1
+++ b/metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1
@@ -3,11 +3,11 @@ DEPEND=sys-libs/libcap >=www-servers/apache-2.4.7[-threads] =www-servers/apache-
 DESCRIPTION=Run virtual hosts under separate users/groups
 EAPI=5
 HOMEPAGE=http://mpm-itk.sesse.net/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=sys-libs/libcap >=www-servers/apache-2.4.7[-threads] =www-servers/apache-2.4*
 SLOT=0
 SRC_URI=http://mpm-itk.sesse.net/mpm-itk-2.4.7-04.tar.gz
 _eclass_exported_funcs=pkg_postinst:apache-module pkg_setup:- src_compile:apache-module src_install:apache-module
 _eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	depend.apache	e3c541cb90838388f81620d630c28f41	eutils	792f83d5ec9536cb5ccef375469d8bde	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4c6f6352ad15e6ad513ed61739c3c43c
+_md5_=dc3b66b40c45a55397be534ba66e1861
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.2.0 b/metadata/md5-cache/www-apps/icingaweb2-2.2.0
index 91dc1ae6ce63..06800ca67e80 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-2.2.0
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Icinga Web 2 - Frontend for icinga2
 EAPI=5
 HOMEPAGE=http://www.icinga.org/
 IUSE=apache2 ldap mysql nginx postgres apache2
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/icinga2-2.1.1 || ( dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] ) dev-php/pecl-imagick apache2? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) apache2? ( =www-servers/apache-2* )
 SLOT=0
 SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.2.0 -> icingaweb2-2.2.0.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_install:-
 _eclasses_=depend.apache	e3c541cb90838388f81620d630c28f41	eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=5c2075fcee5c44062d2c60a372d53102
+_md5_=5e5a7cf17ef3ea21f532a19d89ae2f77
diff --git a/metadata/md5-cache/x11-libs/cairo-1.14.6 b/metadata/md5-cache/x11-libs/cairo-1.14.6
index 915fd1e861fd..8b342639ce44 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.14.6
+++ b/metadata/md5-cache/x11-libs/cairo-1.14.6
@@ -4,7 +4,7 @@ DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=5
 HOMEPAGE=http://cairographics.org/
 IUSE=X aqua debug directfb gles2 +glib opengl static-libs +svg valgrind xcb xlib-xcb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=dev-libs/lzo-2.06-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(-)?] >=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(-)?] >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] sys-libs/binutils-libs:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/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(-)?] >=x11-libs/pixman-0.32.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(-)?] directfb? ( dev-libs/DirectFB ) gles2? ( >=media-libs/mesa-9.1.6[gles2,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(-)?] ) glib? ( >=dev-libs/glib-2.34.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(-)?] ) opengl? ( || ( >=media-libs/mesa-9.1.6[egl,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/opengl-apple ) ) X? ( >=x11-libs/libXrender-0.9.8[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/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(-)?] ) xcb? ( >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 REQUIRED_USE=gles2? ( !opengl ) xlib-xcb? ( xcb )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=http://cairographics.org/releases/cairo-1.14.6.tar.xz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=32186e00e2204ed0aa8b5b16715be855
+_md5_=6e938e7d74f5d36ee1cc47a2c188196f
diff --git a/metadata/md5-cache/x11-libs/motif-2.3.5 b/metadata/md5-cache/x11-libs/motif-2.3.5
index fed81a46653f..ed0dbcad8653 100644
--- a/metadata/md5-cache/x11-libs/motif-2.3.5
+++ b/metadata/md5-cache/x11-libs/motif-2.3.5
@@ -4,11 +4,11 @@ DESCRIPTION=The Motif user interface component toolkit
 EAPI=6
 HOMEPAGE=http://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=abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] ) >=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.5%20Source%20Code/motif-2.3.5.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	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=bc8788ed3c61e4f73f0ed46ef6c4a22f
+_md5_=6da17f00c8e45b05ccafcf676fe76cfc
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r2 b/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r2
index 53d42161494b..a9507720582b 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r2
+++ b/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
 EAPI=5
 HOMEPAGE=http://wxwidgets.org/
 IUSE=+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit 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 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
 PDEPEND=>=app-eselect/eselect-wxwidgets-20131230
 RDEPEND=dev-libs/expat[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(-)?] sdl? ( media-libs/libsdl[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(-)?] ) X? ( >=dev-libs/glib-2.22: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(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg: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(-)?] >=x11-libs/gtk+-2.18: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/gdk-pixbuf[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/libSM[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/libXxf86vm[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/pango[X,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(-)?] gstreamer? ( media-libs/gstreamer:0.10[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/gst-plugins-base:0.10[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(-)?] ) libnotify? ( x11-libs/libnotify[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(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webkit? ( net-libs/webkit-gtk:2 ) ) aqua? ( x11-libs/gtk+:2[aqua=,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/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
@@ -12,4 +12,4 @@ SLOT=3.0
 SRC_URI=mirror://sourceforge/wxpython/wxPython-src-3.0.2.0.tar.bz2 doc? ( mirror://sourceforge/wxpython/wxPython-docs-3.0.2.0.tar.bz2 )
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=6907ae0e27a3c7612be72bbfd61c7602
+_md5_=3b2e6e428ef3c0eab159dc9d8cedf37a
diff --git a/metadata/md5-cache/x11-misc/dunst-1.1.0 b/metadata/md5-cache/x11-misc/dunst-1.1.0
index 27ad235db92f..fc72876a85f0 100644
--- a/metadata/md5-cache/x11-misc/dunst-1.1.0
+++ b/metadata/md5-cache/x11-misc/dunst-1.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=customizable and lightweight notification-daemon
 EAPI=5
 HOMEPAGE=http://www.knopwob.org/dunst/
 IUSE=dunstify
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/glib:2 dev-libs/libxdg-basedir sys-apps/dbus x11-libs/libXScrnSaver x11-libs/libXft x11-libs/libXinerama x11-libs/cairo[X,glib] x11-libs/pango[X] dunstify? ( x11-libs/libnotify )
 SLOT=0
 SRC_URI=http://www.knopwob.org/public/dunst-release/dunst-1.1.0.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=a8b4dab9f4ded5343ec3a63c205d761a
+_md5_=91d115d34cb0b88c31adbe1454d23386
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.16.7 b/metadata/md5-cache/x11-misc/lightdm-1.16.7
index 9e52d54892b8..b3aa54f62ede 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.16.7
+++ b/metadata/md5-cache/x11-misc/lightdm-1.16.7
@@ -4,7 +4,7 @@ DESCRIPTION=A lightweight display manager
 EAPI=5
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/LightDM
 IUSE=audit +gtk +introspection kde qt4 qt5 +gnome
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=GPL-3 LGPL-3
 PDEPEND=gtk? ( x11-misc/lightdm-gtk-greeter ) kde? ( x11-misc/lightdm-kde )
 RDEPEND=audit? ( sys-process/audit ) >=dev-libs/glib-2.32.3:2 dev-libs/libxml2 gnome? ( sys-apps/accountsservice ) virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( >=dev-libs/gobject-introspection-1 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 ) >=sys-auth/pambase-20101024-r2
@@ -14,4 +14,4 @@ SLOT=0
 SRC_URI=https://launchpad.net/lightdm/1.16/1.16.7/+download/lightdm-1.16.7.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
 _eclass_exported_funcs=pkg_postinst:readme.gentoo src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=612d1c2ed84f98b8c721f4dc611a5a1b
+_md5_=436deb75b48fed30512e8547e018680a
diff --git a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.1-r1 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.1-r1
index d32699762490..cc91ff3556c5 100644
--- a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.1-r1
+++ b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=LightDM GTK+ Greeter
 EAPI=4
 HOMEPAGE=https://launchpad.net/lightdm-gtk-greeter
 IUSE=ayatana branding
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=GPL-3 LGPL-3 branding? ( CC-BY-3.0 )
 RDEPEND=ayatana? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard || ( >=x11-themes/adwaita-icon-theme-3.14.1 x11-themes/gnome-icon-theme )
 SLOT=0
 SRC_URI=https://launchpad.net/lightdm-gtk-greeter/2.0/2.0.1/+download/lightdm-gtk-greeter-2.0.1.tar.gz branding? ( https://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=05705ad04983b48fc2330d46e3494997
+_md5_=e1c21764ac2f0d866d05f7b80b7561b5
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.4.1-r3 b/metadata/md5-cache/x11-misc/virtualgl-2.4.1-r3
index 6116ec3da776..704d3a282dc3 100644
--- a/metadata/md5-cache/x11-misc/virtualgl-2.4.1-r3
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.4.1-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Run OpenGL applications remotely with full 3D hardware acceleration
 EAPI=5
 HOMEPAGE=http://www.virtualgl.org/
 IUSE=libressl ssl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl: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(-)?] ) ) media-libs/libjpeg-turbo[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/libX11[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[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/libXv[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/glu[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/opengl[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(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/virtualgl/files/2.4.1/VirtualGL-2.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:cmake-multilib src_test:cmake-multilib src_install:-
 _eclasses_=cmake-multilib	273c15f5a0a06438a38bb5c3e98fa2db	cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=57943ffac6120e64f9c1565f37b4dada
+_md5_=d80fe63eccf383f2901274eed0dce1e4
diff --git a/metadata/md5-cache/x11-misc/xosview-1.17 b/metadata/md5-cache/x11-misc/xosview-1.17
index 20bd50f212ea..48aac68f4747 100644
--- a/metadata/md5-cache/x11-misc/xosview-1.17
+++ b/metadata/md5-cache/x11-misc/xosview-1.17
@@ -4,11 +4,11 @@ DESCRIPTION=X11 operating system viewer
 EAPI=5
 HOMEPAGE=http://www.pogo.org.uk/~mark/xosview/
 IUSE=suid
-KEYWORDS=amd64 ~ppc ppc64 ~x86
+KEYWORDS=amd64 ~ppc ppc64 x86
 LICENSE=GPL-2 BSD
 RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXt media-fonts/font-misc-misc
 SLOT=0
 SRC_URI=http://www.pogo.org.uk/~mark/xosview/releases/xosview-1.17.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=bde7f908634d3d7cc310c61b6e01db22
+_md5_=3873471dad2783c29181b351d03af932
diff --git a/metadata/md5-cache/x11-wm/dwm-6.1 b/metadata/md5-cache/x11-wm/dwm-6.1
index 3b514dc72875..920f95be9087 100644
--- a/metadata/md5-cache/x11-wm/dwm-6.1
+++ b/metadata/md5-cache/x11-wm/dwm-6.1
@@ -4,11 +4,11 @@ DESCRIPTION=a dynamic window manager for X11
 EAPI=5
 HOMEPAGE=http://dwm.suckless.org/
 IUSE=xinerama savedconfig
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 media-libs/freetype xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=http://dl.suckless.org/dwm/dwm-6.1.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	portability	bb1a0ed8ea152b957d17339f01d4d7f5	savedconfig	7de7daa586f6bf361639e77d6f2299db	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=215456b16a621b31d15bd8cf0def5565
+_md5_=ca055241d3c1fd3f582cf3579fd20e19
diff --git a/metadata/md5-cache/x11-wm/openbox-3.6.1 b/metadata/md5-cache/x11-wm/openbox-3.6.1
index 61b11e9cdd5b..e162140b8374 100644
--- a/metadata/md5-cache/x11-wm/openbox-3.6.1
+++ b/metadata/md5-cache/x11-wm/openbox-3.6.1
@@ -4,7 +4,7 @@ DESCRIPTION=A standards compliant, fast, light-weight, extensible window manager
 EAPI=5
 HOMEPAGE=http://openbox.org/
 IUSE=branding debug imlib nls session startup-notification static-libs svg xdg python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) svg? ( gnome-base/librsvg:2 ) xdg? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=xdg? ( || ( python_targets_python2_7 ) )
@@ -12,4 +12,4 @@ SLOT=3
 SRC_URI=http://openbox.org/dist/openbox/openbox-3.6.1.tar.gz branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )
 _eclass_exported_funcs=src_unpack:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=af8a3c7dd8b8305378e4f24a4ae549e5
+_md5_=18d036d441b5124a72fb467536097fe4
diff --git a/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r2 b/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r2
index 4fe3e3bd14df..237066eda312 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r2
+++ b/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r2
@@ -3,11 +3,11 @@ DEPEND=|| ( dev-lang/vala:0.30[vapigen(+)] ) >=xfce-base/exo-0.10 >=xfce-base/ga
 DESCRIPTION=Vala bindings for the Xfce desktop environment
 EAPI=5
 HOMEPAGE=https://wiki.xfce.org/vala-bindings
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=|| ( dev-lang/vala:0.30[vapigen(+)] ) >=xfce-base/exo-0.10 >=xfce-base/garcon-0.2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/bindings/xfce4-vala/4.10/xfce4-vala-4.10.3.tar.bz2
 _eclass_exported_funcs=pkg_preinst:xfconf pkg_postrm:xfconf pkg_postinst:xfconf pkg_setup:- src_prepare:- src_configure:xfconf src_install:xfconf
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	vala	7541b78609c301de4ea866a8cc1b53a6	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48	xfconf	d842ab8b2140980394561496bf157447
-_md5_=c710583de26ee6a01b9e4dae5b357684
+_md5_=96d9d70794f88c1254050c3c5ce2f2d6
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 9b7857a45ad1..b3a067e24808 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 25 Jun 2016 20:02:16 +0000
+Sat, 25 Jun 2016 20:22:41 +0000
author	Repository QA checks <repo-qa-checks@gentoo.org>	2016-06-25 20:22:42 +0000
committer	Repository QA checks <repo-qa-checks@gentoo.org>	2016-06-25 20:22:42 +0000
commit	95c92104ff9df58c58497fb371f8c53610a8be1a (patch)
tree	1d1089d2314e1ff997501457646be79b4cdc464b /metadata
parent	Merge updates from master (diff)
download	gentoo-95c92104ff9df58c58497fb371f8c53610a8be1a.tar.gz gentoo-95c92104ff9df58c58497fb371f8c53610a8be1a.tar.bz2 gentoo-95c92104ff9df58c58497fb371f8c53610a8be1a.zip