2017-01-04 17:16:40 UTC

author: Repository QA checks <repo-qa-checks@gentoo.org> 2017-01-04 17:16:42 +0000
committer: Repository QA checks <repo-qa-checks@gentoo.org> 2017-01-04 17:16:42 +0000
commit: f9a9136a435130161b847e3af4f556c0d00dc7c2 (patch)
tree: bdfa155be49a278335bb4b5d11ac48292d8e1f45 /metadata/md5-cache
parent: Merge commit '082d2e572755d30ba7143486447cd92b21352f36' (diff)
download: gentoo-f9a9136a435130161b847e3af4f556c0d00dc7c2.tar.gz
gentoo-f9a9136a435130161b847e3af4f556c0d00dc7c2.tar.bz2
gentoo-f9a9136a435130161b847e3af4f556c0d00dc7c2.zip
152 files changed, 316 insertions, 375 deletions
diff --git a/metadata/md5-cache/app-admin/conky-1.10.4 b/metadata/md5-cache/app-admin/conky-1.10.4
index 404c835a637f..50ddc64663f0 100644
--- a/metadata/md5-cache/app-admin/conky-1.10.4
+++ b/metadata/md5-cache/app-admin/conky-1.10.4
@@ -4,11 +4,11 @@ DESCRIPTION=An advanced, highly configurable system monitor for X
 EAPI=6
 HOMEPAGE=https://github.com/brndnmtthws/conky
 IUSE=apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax weather-metar weather-xoap webserver wifi X xmms2
-KEYWORDS=alpha amd64 ~arm ~ppc ~x86
+KEYWORDS=alpha amd64 ~arm ~ppc x86
 LICENSE=GPL-3 BSD LGPL-2.1 MIT
 RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( >=virtual/mysql-5.0 ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) >=dev-lang/lua-5.1.4-r8:0 apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.4.tar.gz -> conky-1.10.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	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=da23d91d90f5ad762409f6780866a84d
+_md5_=b48cc0dab245f89e7c47c2b45420c6d2
diff --git a/metadata/md5-cache/app-admin/swatchdog-3.2.4 b/metadata/md5-cache/app-admin/swatchdog-3.2.4
index ec790ae365a2..2b59649b70ec 100644
--- a/metadata/md5-cache/app-admin/swatchdog-3.2.4
+++ b/metadata/md5-cache/app-admin/swatchdog-3.2.4
@@ -3,11 +3,11 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Simple log watcher
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/swatch/
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Date-Manip dev-perl/Date-Calc dev-perl/File-Tail dev-perl/TimeDate >=virtual/perl-Time-HiRes-1.12 !app-admin/swatch dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/swatch/swatchdog-3.2.4.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	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-app	11f61997f1d4923276dd72a750617c7d	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=9015064d44b53b5ec7229cd65f2e0fca
+_md5_=b1b56584f8d44bf8399fdb9145139392
diff --git a/metadata/md5-cache/app-arch/lzip-1.18 b/metadata/md5-cache/app-arch/lzip-1.18
index 496e7cf3c994..ee6c7a822e50 100644
--- a/metadata/md5-cache/app-arch/lzip-1.18
+++ b/metadata/md5-cache/app-arch/lzip-1.18
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure
 DESCRIPTION=lossless data compressor based on the LZMA algorithm
 EAPI=5
 HOMEPAGE=http://www.nongnu.org/lzip/lzip.html
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases-noredirect/lzip/lzip-1.18.tar.gz
 _eclass_exported_funcs=src_configure:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=637d598d2366b8afbc19ff09b8547dbc
+_md5_=5542d3f5cd2d5848d5cf70dac39dd59b
diff --git a/metadata/md5-cache/app-backup/backintime-1.1.12 b/metadata/md5-cache/app-backup/backintime-1.1.12
index 0d1ca5847628..716fb691f181 100644
--- a/metadata/md5-cache/app-backup/backintime-1.1.12
+++ b/metadata/md5-cache/app-backup/backintime-1.1.12
@@ -4,7 +4,7 @@ DESCRIPTION=Backup system inspired by TimeVault and FlyBack, with a GUI for GNOM
 EAPI=5
 HOMEPAGE=http://backintime.le-web.org/
 IUSE=qt4 python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=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_4(+)?,python_single_target_python3_5(+)?] dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] net-misc/openssh net-misc/rsync[xattr,acl] qt4? ( dev-python/PyQt4 )
 REQUIRED_USE=^^ ( 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
 SRC_URI=http://backintime.le-web.org/download/backintime/backintime-1.1.12.tar.gz
 _eclass_exported_funcs=pkg_setup:python-single-r1 src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=92b14fdc5e801bf61a71b52de2e304d4
+_md5_=e5f5a32a3b858c70441d1ca96947da90
diff --git a/metadata/md5-cache/app-crypt/easy-rsa-3.0.1-r1 b/metadata/md5-cache/app-crypt/easy-rsa-3.0.1-r1
index 0796d50da113..e82d7040c802 100644
--- a/metadata/md5-cache/app-crypt/easy-rsa-3.0.1-r1
+++ b/metadata/md5-cache/app-crypt/easy-rsa-3.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Small RSA key management package, based on OpenSSL
 EAPI=5
 HOMEPAGE=http://openvpn.net/
 IUSE=libressl
-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
 RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) !<net-misc/openvpn-2.3
 SLOT=0
 SRC_URI=https://github.com/OpenVPN/easy-rsa/releases/download/3.0.1/EasyRSA-3.0.1.tgz
 _eclass_exported_funcs=src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=b5502ba5de7d8c73b7638a45b588de77
+_md5_=2db9e755170f02dd69df4adfca1dae3a
diff --git a/metadata/md5-cache/app-doc/kicad-doc-4.0.1 b/metadata/md5-cache/app-doc/kicad-doc-4.0.1
index b2cbc4b70abf..f042c0299c24 100644
--- a/metadata/md5-cache/app-doc/kicad-doc-4.0.1
+++ b/metadata/md5-cache/app-doc/kicad-doc-4.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Electronic Schematic and PCB design tools manuals
 EAPI=5
 HOMEPAGE=http://www.kicad-pcb.org/
 IUSE=html pdf l10n_en l10n_fr l10n_it l10n_ja l10n_nl l10n_pl
-KEYWORDS=~amd64
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-3+ CC-BY-3.0 ) GPL-2
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-doc/archive/4.0.1.tar.gz -> kicad-doc-4.0.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=47f786af610aa8ccdbd5613b8366aece
+_md5_=5326340638925afd4ff5b77d7ecf1127
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.10.0_pre20161220 b/metadata/md5-cache/app-emulation/docker-compose-1.10.0_pre20161220
deleted file mode 100644
index 52dccf8eae68..000000000000
--- a/metadata/md5-cache/app-emulation/docker-compose-1.10.0_pre20161220
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docker-py-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docker-py-3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/requests-2.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Multi-container orchestration for Docker
-EAPI=5
-HOMEPAGE=https://www.docker.com/
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docker-py-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docker-py-3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/requests-2.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=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 )
-SLOT=0
-SRC_URI=https://github.com/docker/compose/archive/09690e1758d39f1213a9f44ab027ad69e1de0653.tar.gz -> docker-compose-1.10.0_pre20161220.tar.gz
-_eclass_exported_funcs=src_unpack:vcs-snapshot src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=92bcfa63f20a9b8c331f462a4ece55ab
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.10.0_pre20161220-r1 b/metadata/md5-cache/app-emulation/docker-compose-1.10.0_pre20161220-r1
new file mode 100644
index 000000000000..59900729d66f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.10.0_pre20161220-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/colorama-0.3.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/colorama-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docker-py-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docker-py-3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/requests-2.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Multi-container orchestration for Docker
+EAPI=5
+HOMEPAGE=https://www.docker.com/
+IUSE=test python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/colorama-0.3.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/colorama-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docker-py-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docker-py-3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/requests-2.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=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 )
+SLOT=0
+SRC_URI=https://github.com/docker/compose/archive/09690e1758d39f1213a9f44ab027ad69e1de0653.tar.gz -> docker-compose-1.10.0_pre20161220.tar.gz
+_eclass_exported_funcs=src_unpack:vcs-snapshot src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=3ed7b3cad18d6102a65a72eb82a0753f
diff --git a/metadata/md5-cache/app-emulation/free42-1.5.12 b/metadata/md5-cache/app-emulation/free42-1.5.12
index ef26fb00dfc7..fec7e7741d69 100644
--- a/metadata/md5-cache/app-emulation/free42-1.5.12
+++ b/metadata/md5-cache/app-emulation/free42-1.5.12
@@ -4,11 +4,11 @@ DESCRIPTION=An HP-42S Calculator Simulator
 EAPI=6
 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.12.tgz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=0734dd543a9ccaf3bdd7efe92197ccea
+_md5_=afe5ebaf1bda97b4311261234399a26b
diff --git a/metadata/md5-cache/app-eselect/eselect-renpy-0.6 b/metadata/md5-cache/app-eselect/eselect-renpy-0.6
index 8c4addaca5c1..2445af16a809 100644
--- a/metadata/md5-cache/app-eselect/eselect-renpy-0.6
+++ b/metadata/md5-cache/app-eselect/eselect-renpy-0.6
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DESCRIPTION=Manages renpy symlink
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-lib-bin-symlink games-misc/games-envd
 SLOT=0
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- pkg_setup:- src_unpack:base src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=dfc9b0c283331ca69aa0cf22d0e3ceda
+_md5_=1d95b112f15a3188fc870f208c6df937
diff --git a/metadata/md5-cache/app-eselect/eselect-rust-0.3_pre20150428 b/metadata/md5-cache/app-eselect/eselect-rust-0.3_pre20150428
index 2122176d2405..fc01201052c5 100644
--- a/metadata/md5-cache/app-eselect/eselect-rust-0.3_pre20150428
+++ b/metadata/md5-cache/app-eselect/eselect-rust-0.3_pre20150428
@@ -2,10 +2,10 @@ DEFINED_PHASES=postinst preinst prerm
 DESCRIPTION=eselect module for rust
 EAPI=5
 HOMEPAGE=https://github.com/jauhien/eselect-rust
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://github.com/jauhien/eselect-rust/archive/0.3_pre20150428.tar.gz -> eselect-rust-0.3_pre20150428.tar.gz
 _eclass_exported_funcs=pkg_prerm:- pkg_preinst:- pkg_postinst:-
-_md5_=0bbc68133a15c45fe3a8422529904938
+_md5_=34547a52d4b366d9b591d5926f8420c8
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20161102.3.27.2-r2 b/metadata/md5-cache/app-misc/ca-certificates-20161102.3.27.2-r2
index 641fc2446ddc..3efaab62cb9e 100644
--- a/metadata/md5-cache/app-misc/ca-certificates-20161102.3.27.2-r2
+++ b/metadata/md5-cache/app-misc/ca-certificates-20161102.3.27.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Common CA Certificates PEM files
 EAPI=5
 HOMEPAGE=http://packages.debian.org/sid/ca-certificates
 IUSE=insecure_certs cacert
-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 ~x86-winnt
+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 ~x86-winnt
 LICENSE=MPL-1.1
 RDEPEND=app-misc/c_rehash sys-apps/debianutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20161102.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_27_2_RTM/src/nss-3.27.2.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_unpack:- src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=43a771ac880af4bef8aaccf3a76582ec
+_md5_=4e9d3dff80fdf9cebf1a5d3c72947fbd
diff --git a/metadata/md5-cache/app-misc/cmatrix-1.2a-r3 b/metadata/md5-cache/app-misc/cmatrix-1.2a-r3
index 86543388330a..ea40c4bcc108 100644
--- a/metadata/md5-cache/app-misc/cmatrix-1.2a-r3
+++ b/metadata/md5-cache/app-misc/cmatrix-1.2a-r3
@@ -4,11 +4,11 @@ DESCRIPTION=An ncurses based app to show a scrolling screen from the Matrix
 EAPI=6
 HOMEPAGE=http://www.asty.org/cmatrix
 IUSE=X
-KEYWORDS=alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=X? ( x11-apps/mkfontdir ) sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://www.asty.org/cmatrix/dist/cmatrix-1.2a.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ee31f91c34da9ea5b3c066fe866b5d6f
+_md5_=e71264872633fdee5c81c2e8525e54ef
diff --git a/metadata/md5-cache/app-misc/gentoo-0.20.7 b/metadata/md5-cache/app-misc/gentoo-0.20.7
index 34402da27607..0a96bbdc0e65 100644
--- a/metadata/md5-cache/app-misc/gentoo-0.20.7
+++ b/metadata/md5-cache/app-misc/gentoo-0.20.7
@@ -4,11 +4,11 @@ DESCRIPTION=Graphical file manager for Unix-like systems, using GTK+
 EAPI=6
 HOMEPAGE=http://gentoo.sourceforge.net/
 IUSE=nls
-KEYWORDS=alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>x11-libs/gtk+-3.12:3 dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango
 SLOT=0
 SRC_URI=mirror://sourceforge/gentoo/gentoo-0.20.7.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f29bdfa16598b7f9faebd97279cb04ea
+_md5_=a1e4f6e0cd1030ceb7ffe9175b2e68df
diff --git a/metadata/md5-cache/app-misc/gourmet-0.17.4-r1 b/metadata/md5-cache/app-misc/gourmet-0.17.4-r1
index 7d4a702570ad..93a4fc04648d 100644
--- a/metadata/md5-cache/app-misc/gourmet-0.17.4-r1
+++ b/metadata/md5-cache/app-misc/gourmet-0.17.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Recipe Organizer and Shopping List Generator for Gnome
 EAPI=5
 HOMEPAGE=https://thinkle.github.com/gourmet/
 IUSE=-i18n -ipython pdf print spell sound web python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/pygtk-2.22.0:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.9-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] i18n? ( dev-python/elib-intl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ipython? ( >=dev-python/ipython-0.13.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pdf? ( >=dev-python/reportlab-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-poppler-0.12.1-r4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) print? ( >=dev-python/reportlab-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-poppler-0.12.1-r4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) spell? ( >=dev-python/gtkspell-python-2.25.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sound? ( >=dev-python/gst-python-0.10.22-r1:0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) web? ( >=dev-python/beautifulsoup-3.2.1-r1:python-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/thinkle/gourmet/archive/0.17.4.tar.gz -> gourmet-0.17.4.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=eeb0c727d8c1df817a3bd832a7ebbfb6
+_md5_=340fa9d38199a416818fbbc34c7f373d
diff --git a/metadata/md5-cache/app-misc/hachoir-metadata-1.3.3-r1 b/metadata/md5-cache/app-misc/hachoir-metadata-1.3.3-r1
index a990a9590318..9c2a8765d561 100644
--- a/metadata/md5-cache/app-misc/hachoir-metadata-1.3.3-r1
+++ b/metadata/md5-cache/app-misc/hachoir-metadata-1.3.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Program to extract metadata using Hachoir library
 EAPI=5
 HOMEPAGE=https://bitbucket.org/haypo/hachoir/wiki/hachoir-metadata https://pypi.python.org/pypi/hachoir-metadata
 IUSE=gnome gtk kde qt4 python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/hachoir-core-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-parser-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( >=dev-python/pygtk-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome? ( gnome-base/nautilus gnome-extra/zenity ) kde? ( kde-apps/konqueror ) qt4? ( dev-python/PyQt4[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/hachoir-metadata/hachoir-metadata-1.3.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	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d348eebb1dbdec9193d7f0c3759764a4
+_md5_=05194be94cdd56f7c3e49e2390e3fe29
diff --git a/metadata/md5-cache/app-misc/mosquitto-1.4.10 b/metadata/md5-cache/app-misc/mosquitto-1.4.10
index b7e4ffc1d001..d3f8659f1800 100644
--- a/metadata/md5-cache/app-misc/mosquitto-1.4.10
+++ b/metadata/md5-cache/app-misc/mosquitto-1.4.10
@@ -4,11 +4,11 @@ DESCRIPTION=An Open Source MQTT v3 Broker
 EAPI=5
 HOMEPAGE=http://mosquitto.org/
 IUSE=bridge examples +persistence +srv ssl tcpd
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=EPL-1.0
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://mosquitto.org/files/source/mosquitto-1.4.10.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=5e704d74434ff94bb15421f462362daa
+_md5_=83240b392de889c9593c59a68a9f2d05
diff --git a/metadata/md5-cache/app-misc/muttprint-0.73-r4 b/metadata/md5-cache/app-misc/muttprint-0.73-r4
index b1dd79bffc8d..8f56302cf5e1 100644
--- a/metadata/md5-cache/app-misc/muttprint-0.73-r4
+++ b/metadata/md5-cache/app-misc/muttprint-0.73-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Script for pretty printing of your mails
 EAPI=5
 HOMEPAGE=http://muttprint.sourceforge.net
 IUSE=doc
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/TimeDate dev-perl/Text-Iconv virtual/latex-base dev-texlive/texlive-latexextra
 SLOT=0
 SRC_URI=mirror://sourceforge/muttprint/muttprint-0.73.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_test:autotools-utils src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=b721a2589a6723473dcbda3bdd40f72c
+_md5_=660dd74f6fa8e850136e65acd7d46557
diff --git a/metadata/md5-cache/app-misc/srm-1.2.15 b/metadata/md5-cache/app-misc/srm-1.2.15
index 62534d1edcc8..1b1e6da98ef7 100644
--- a/metadata/md5-cache/app-misc/srm-1.2.15
+++ b/metadata/md5-cache/app-misc/srm-1.2.15
@@ -4,10 +4,10 @@ DESCRIPTION=A command-line compatible rm which destroys file contents before unl
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/srm/
 IUSE=debug
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://sourceforge/srm/srm-1.2.15.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=8cb23a44d5d53ecb6a2c682be0d0b340
+_md5_=1ded9e1b86621cac981261e722eaa5e6
diff --git a/metadata/md5-cache/app-misc/vifm-0.8.2 b/metadata/md5-cache/app-misc/vifm-0.8.2
index 825daa34275a..2306681035f4 100644
--- a/metadata/md5-cache/app-misc/vifm-0.8.2
+++ b/metadata/md5-cache/app-misc/vifm-0.8.2
@@ -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.2.tar.bz2
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf
-_md5_=5271c0d364424c7597d39e020630fcb9
+_md5_=f3bbf74c221bd6b962ef68c28cdd81f2
diff --git a/metadata/md5-cache/app-office/texstudio-2.11.0 b/metadata/md5-cache/app-office/texstudio-2.11.0
index 7c7a303301bc..e14f502214d7 100644
--- a/metadata/md5-cache/app-office/texstudio-2.11.0
+++ b/metadata/md5-cache/app-office/texstudio-2.11.0
@@ -4,7 +4,7 @@ DESCRIPTION=Free cross-platform LaTeX editor (fork from texmakerX)
 EAPI=5
 HOMEPAGE=http://texstudio.sourceforge.net/
 IUSE=video qt4 +qt5
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=app-text/hunspell app-text/poppler:=[qt4?,qt5?] >=dev-libs/quazip-0.7.1[qt4?,qt5?] dev-qt/qtsingleapplication[X,qt4?,qt5?] x11-libs/libX11 x11-libs/libXext qt4? ( dev-qt/designer:4 >=dev-qt/qtgui-4.8.5:4 >=dev-qt/qtcore-4.6.1:4 >=dev-qt/qtscript-4.6.1:4 >=dev-qt/qtsvg-4.6.1:4 >=dev-qt/qttest-4.6.1:4 ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) video? ( media-libs/phonon[qt4?,qt5?] ) virtual/latex-base app-text/psutils app-text/ghostscript-gpl media-libs/netpbm
 REQUIRED_USE=^^ ( qt4 qt5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/texstudio/texstudio/TeXstudio%202.11.0/texstudio-2.11.0.tar.gz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=707a842088645c8f5493d3d802702af9
+_md5_=bb4ced882841efcdec8a61521bbc9d58
diff --git a/metadata/md5-cache/app-officeext/ooofbtools-2.47 b/metadata/md5-cache/app-officeext/ooofbtools-2.47
index 877e9d0b96c8..83cf330b1bf3 100644
--- a/metadata/md5-cache/app-officeext/ooofbtools-2.47
+++ b/metadata/md5-cache/app-officeext/ooofbtools-2.47
@@ -4,7 +4,7 @@ DESCRIPTION=OpenOffice extension for the FictionBook2 format with validation
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/fbtools/
 IUSE=office_implementation_libreoffice office_implementation_openoffice
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/libxml2 app-arch/zip office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( app-office/openoffice-bin )
 REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/fbtools/files/release/OOoFBTools-2.47.zip
 _eclass_exported_funcs=pkg_prerm:office-ext-r1 pkg_postinst:office-ext-r1 src_unpack:office-ext-r1 src_prepare:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	office-ext-r1	342fc56feaa095aba175303656869008	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=434e0328ec6a7e4a4397681f42152fb0
+_md5_=7f0e6c5dd80af65e21495a05e65c701c
diff --git a/metadata/md5-cache/app-officeext/texmaths-0.41 b/metadata/md5-cache/app-officeext/texmaths-0.41
index e8c2b8430329..2785e6021b59 100644
--- a/metadata/md5-cache/app-officeext/texmaths-0.41
+++ b/metadata/md5-cache/app-officeext/texmaths-0.41
@@ -4,7 +4,7 @@ DESCRIPTION=LaTeX Equation Editor for LibreOffice
 EAPI=5
 HOMEPAGE=http://roland65.free.fr/texmaths/
 IUSE=office_implementation_libreoffice office_implementation_openoffice
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/dvisvgm virtual/tex-base office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( app-office/openoffice-bin )
 REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/texmaths/TexMaths-0.41.oxt
 _eclass_exported_funcs=pkg_prerm:office-ext-r1 pkg_postinst:office-ext-r1 src_unpack:office-ext-r1 src_install:office-ext-r1
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	office-ext-r1	342fc56feaa095aba175303656869008	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f4288158461b92a29983a9374a45bb8e
+_md5_=e0486dcb9ca6bd2249564dbc23a31733
diff --git a/metadata/md5-cache/app-text/dblatex-0.3.7 b/metadata/md5-cache/app-text/dblatex-0.3.7
index 4e2c668f27b5..1863e773415f 100644
--- a/metadata/md5-cache/app-text/dblatex-0.3.7
+++ b/metadata/md5-cache/app-text/dblatex-0.3.7
@@ -4,7 +4,7 @@ DESCRIPTION=Transform DocBook using TeX macros
 EAPI=5
 HOMEPAGE=http://dblatex.sourceforge.net/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/texlive dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathextra dev-texlive/texlive-pictures dev-texlive/texlive-xetex dev-libs/libxslt app-text/docbook-xml-dtd:4.5 gnome-base/librsvg 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://sourceforge/dblatex/dblatex-0.3.7.tar.bz2
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3900c8bce2b383262085abd6e914d2f8
+_md5_=11aa35d8f759bd5083f382e3e1a24062
diff --git a/metadata/md5-cache/app-text/lcdf-typetools-2.106 b/metadata/md5-cache/app-text/lcdf-typetools-2.106
index 15182ffb9be4..b66febe23a59 100644
--- a/metadata/md5-cache/app-text/lcdf-typetools-2.106
+++ b/metadata/md5-cache/app-text/lcdf-typetools-2.106
@@ -4,11 +4,11 @@ DESCRIPTION=Font utilities for eg manipulating OTF
 EAPI=5
 HOMEPAGE=http://www.lcdf.org/type/#typetools
 IUSE=+kpathsea
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=kpathsea? ( virtual/tex-base dev-libs/kpathsea )
 SLOT=0
 SRC_URI=http://www.lcdf.org/type/lcdf-typetools-2.106.tar.gz
 _eclass_exported_funcs=src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=2a6aa8a11d37eafc31376db595c6fdc9
+_md5_=f57664502260b746dce5e2366cedb1a2
diff --git a/metadata/md5-cache/app-text/wgetpaste-2.28 b/metadata/md5-cache/app-text/wgetpaste-2.28
index e59a0e16d6d0..cb834f339215 100644
--- a/metadata/md5-cache/app-text/wgetpaste-2.28
+++ b/metadata/md5-cache/app-text/wgetpaste-2.28
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Command-line interface to various pastebins
 EAPI=5
 HOMEPAGE=http://wgetpaste.zlin.dk/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-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-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=net-misc/wget
 SLOT=0
 SRC_URI=http://wgetpaste.zlin.dk/wgetpaste-2.28.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_install:-
-_md5_=5862fdec484ba37bcf4c4ea9753bcdc7
+_md5_=8ffbf2c0ee953dae90bd39fa25ab661c
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.2.24 b/metadata/md5-cache/app-text/xapian-omega-1.2.24
index 63bb725286cd..b7d172249d25 100644
--- a/metadata/md5-cache/app-text/xapian-omega-1.2.24
+++ b/metadata/md5-cache/app-text/xapian-omega-1.2.24
@@ -3,10 +3,10 @@ DEPEND=dev-libs/xapian:0/1.2.22 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
 EAPI=5
 HOMEPAGE=http://www.xapian.org/
-KEYWORDS=alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/xapian:0/1.2.22 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.oligarchy.co.uk/xapian/1.2.24/xapian-omega-1.2.24.tar.xz
 _eclass_exported_funcs=src_install:-
-_md5_=f8aaaccfece66f6695ed97fdaa5a6e3c
+_md5_=f23a0ce0a867e6765ea656f47fa65543
diff --git a/metadata/md5-cache/dev-cpp/asio-1.10.8 b/metadata/md5-cache/dev-cpp/asio-1.10.8
index 32b175774242..7e977529474e 100644
--- a/metadata/md5-cache/dev-cpp/asio-1.10.8
+++ b/metadata/md5-cache/dev-cpp/asio-1.10.8
@@ -4,10 +4,10 @@ DESCRIPTION=Asynchronous Network Library
 EAPI=6
 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=dev-libs/boost ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/asio/asio/asio-1.10.8.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_install:-
-_md5_=06623400d7c4bf65c594ceab8822cc65
+_md5_=a46ee653707358291006815debff8f98
diff --git a/metadata/md5-cache/dev-cpp/commoncpp2-1.8.1-r2 b/metadata/md5-cache/dev-cpp/commoncpp2-1.8.1-r2
index 9b897176830a..f68ea6878269 100644
--- a/metadata/md5-cache/dev-cpp/commoncpp2-1.8.1-r2
+++ b/metadata/md5-cache/dev-cpp/commoncpp2-1.8.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=C++ library offering portable support for system-related services
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/commoncpp/
 IUSE=debug doc examples ipv6 gnutls ssl static-libs
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib ssl? ( gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) )
 SLOT=0
 SRC_URI=mirror://gnu/commoncpp/commoncpp2-1.8.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=7d85d63200ec9cf32d823bbd590879bd
+_md5_=11dca8a26133c2a3a3d3980db5313610
diff --git a/metadata/md5-cache/dev-db/couchdb-1.6.1-r2 b/metadata/md5-cache/dev-db/couchdb-1.6.1-r2
index 495466bd4336..ef06be5892de 100644
--- a/metadata/md5-cache/dev-db/couchdb-1.6.1-r2
+++ b/metadata/md5-cache/dev-db/couchdb-1.6.1-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Distributed, fault-tolerant and schema-free document-oriented databa
 EAPI=5
 HOMEPAGE=http://couchdb.apache.org/
 IUSE=libressl selinux test
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/icu-4.3.1:= <dev-lang/erlang-19.0[ssl] !libressl? ( >=dev-libs/openssl-0.9.8j:0 ) libressl? ( dev-libs/libressl ) >=net-misc/curl-7.18.2 <dev-lang/spidermonkey-1.8.7 selinux? ( sec-policy/selinux-couchdb )
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://apache/couchdb/source/1.6.1/apache-couchdb-1.6.1.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=f2f1b4e22bd48851afed862503ab93c6
+_md5_=ff9982477e44b81fa951de07aea9519e
diff --git a/metadata/md5-cache/dev-db/sqlite-3.13.0 b/metadata/md5-cache/dev-db/sqlite-3.13.0
index 59f1c14967cb..a0ba9395319d 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.13.0
+++ b/metadata/md5-cache/dev-db/sqlite-3.13.0
@@ -4,11 +4,11 @@ DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=5
 HOMEPAGE=https://sqlite.org/
 IUSE=debug doc icu +readline secure-delete static-libs tcl test tools 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 ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=icu? ( dev-libs/icu: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(-)?] ) readline? ( sys-libs/readline: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(-)?] ) tcl? ( dev-lang/tcl: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(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=3
 SRC_URI=doc? ( https://sqlite.org/2016/sqlite-doc-3130000.zip ) tcl? ( https://sqlite.org/2016/sqlite-src-3130000.zip ) test? ( https://sqlite.org/2016/sqlite-src-3130000.zip ) tools? ( https://sqlite.org/2016/sqlite-src-3130000.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2016/sqlite-autoconf-3130000.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_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0e77f9c91577d14d2211bedb77903b3b
+_md5_=48f5503320b58604b620d22225e1f0fc
diff --git a/metadata/md5-cache/dev-db/sqlitebrowser-3.8.0-r1 b/metadata/md5-cache/dev-db/sqlitebrowser-3.8.0-r1
index dd3f29bb646b..64c0b8ea3b49 100644
--- a/metadata/md5-cache/dev-db/sqlitebrowser-3.8.0-r1
+++ b/metadata/md5-cache/dev-db/sqlitebrowser-3.8.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=SQLite Database Browser
 EAPI=5
 HOMEPAGE=http://sqlitebrowser.org
 IUSE=qt5 test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3 MPL-2.0
 RDEPEND=dev-cpp/antlr-cpp:2 dev-db/sqlite:3 dev-libs/qcustomplot[qt5=] x11-libs/qscintilla:= !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=https://github.com/sqlitebrowser/sqlitebrowser/archive/v3.8.0.tar.gz -> sqlitebrowser-3.8.0.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a14908c9cb605b2326c41a57909be5f1
+_md5_=c6c8f4c61f5a852a991772612860b863
diff --git a/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1 b/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1
index ad8ec6d6ff3d..abf0c7ea3b84 100644
--- a/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1
+++ b/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A library of routines for managing a database
 EAPI=5
 HOMEPAGE=http://fallabs.com/tokyocabinet/
 IUSE=bzip2 debug doc examples threads zlib
-KEYWORDS=alpha amd64 ~arm hppa ~ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=alpha amd64 ~arm hppa ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://fallabs.com/tokyocabinet/tokyocabinet-1.4.48.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_test:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=39308d874f8143d2b276099e311c5ccb
+_md5_=f59655669611244189cac989e1f5f9c6
diff --git a/metadata/md5-cache/dev-games/simgear-2016.3.1 b/metadata/md5-cache/dev-games/simgear-2016.3.1
index 02220202437c..c481970a30e7 100644
--- a/metadata/md5-cache/dev-games/simgear-2016.3.1
+++ b/metadata/md5-cache/dev-games/simgear-2016.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Development library for simulation games
 EAPI=6
 HOMEPAGE=http://www.simgear.org/
 IUSE=+dns debug subversion test
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) subversion? ( dev-vcs/subversion )
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/simgear-2016.3.1.tar.bz2
 _eclass_exported_funcs=src_prepare:cmake-utils src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7354b5dbb9358b91d12616812d14988b
+_md5_=911c690f20c826d80deb57c052ac80dc
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.8 b/metadata/md5-cache/dev-java/tomcat-native-1.2.8
index d19872efb199..6d94df6ea8ed 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.8
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.8
@@ -4,11 +4,11 @@ DESCRIPTION=Native APR library for Tomcat
 EAPI=5
 HOMEPAGE=http://tomcat.apache.org/
 IUSE=test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1 dev-libs/openssl:= >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.8/source/tomcat-native-1.2.8-src.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_postinst:- pkg_setup:java-pkg-2 src_prepare:java-pkg-2 src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6d6e79d464af2606a96a4baa7f161026
+_md5_=759606736750c1d5b194f953baac473f
diff --git a/metadata/md5-cache/dev-lang/tuprolog-2.9.2 b/metadata/md5-cache/dev-lang/tuprolog-2.9.2
index ae8ef9333de0..fbb977700257 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-2.9.2
+++ b/metadata/md5-cache/dev-lang/tuprolog-2.9.2
@@ -4,11 +4,11 @@ DESCRIPTION=tuProlog is a light-weight Prolog for Internet applications and infr
 EAPI=5
 HOMEPAGE=http://tuprolog.unibo.it/
 IUSE=doc examples test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 RDEPEND=>=virtual/jdk-1.7:= dev-java/javassist:3 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/tuprolog-2.9.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:- src_test:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=23f3e1c88dbe7a1c1711852ebaf7592c
+_md5_=0acc76400f93a5da579cfa1bbe4773ab
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.4-r1 b/metadata/md5-cache/dev-libs/libxml2-2.9.4-r1
index ef9a86081e2a..608a83d519bf 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.4-r1
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Version 2 of the library to manipulate XML files
 EAPI=6
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_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=~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 ~x86-winnt
+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 ~x86-winnt
 LICENSE=MIT
 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(-)?] icu? ( >=dev-libs/icu-51.2-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(-)?] ) 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(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=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(-)] ) readline? ( sys-libs/readline:= )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.4.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
 _eclass_exported_funcs=pkg_postinst:- src_unpack:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=441eec43919de127e630841e81e1012b
+_md5_=a74aaf83b1e6c248bbc4c461ca4d3581
diff --git a/metadata/md5-cache/dev-libs/nss-3.27.2 b/metadata/md5-cache/dev-libs/nss-3.27.2
index bef6076eb7d8..f4d53c103079 100644
--- a/metadata/md5-cache/dev-libs/nss-3.27.2
+++ b/metadata/md5-cache/dev-libs/nss-3.27.2
@@ -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_27_2_RTM/src/nss-3.27.2.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch ) nss-pem? ( https://dev.gentoo.org/~polynomial-c/nss-pem-20160329.tar.xz )
 _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	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=2af001bf1178c34dfeb27fba7a4193a1
+_md5_=8b76ffb70487db14a5845acf14cc62f5
diff --git a/metadata/md5-cache/dev-libs/xapian-1.2.24 b/metadata/md5-cache/dev-libs/xapian-1.2.24
index d766b3270089..0a34d0963d01 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.2.24
+++ b/metadata/md5-cache/dev-libs/xapian-1.2.24
@@ -4,11 +4,11 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=5
 HOMEPAGE=http://www.xapian.org/
 IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0/1.2.22
 SRC_URI=http://oligarchy.co.uk/xapian/1.2.24/xapian-core-1.2.24.tar.xz
 _eclass_exported_funcs=src_configure:- src_test:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=53a902c8f335ffef71e7a847d95d26f1
+_md5_=b5aea2fbce1154b23a7362b2f40851cf
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.24 b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.24
index a853c5fb36be..bccac740acbd 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.24
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.24
@@ -4,7 +4,7 @@ DESCRIPTION=SWIG and JNI bindings for Xapian
 EAPI=5
 HOMEPAGE=http://www.xapian.org/
 IUSE=java lua perl php python ruby tcl elibc_FreeBSD java php_targets_php5-5 php_targets_php5-6 python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/xapian:0/1.2.22 lua? ( dev-lang/lua:0 ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:= ) tcl? ( >=dev-lang/tcl-8.1:0= ) java? ( >=virtual/jre-1.3 ) java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-6? ( dev-lang/php:5.6 ) )
 REQUIRED_USE=|| ( java lua perl php python ruby tcl ) php? ( || ( php_targets_php5-5 php_targets_php5-6 ) )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://oligarchy.co.uk/xapian/1.2.24/xapian-bindings-1.2.24.tar.xz
 _eclass_exported_funcs=pkg_preinst:java-pkg-opt-2 pkg_setup:- src_unpack:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=78d2a97542ddf26e70e966036e7b4f31
+_md5_=9003496bfe00ab914dcdd2d999f16d08
diff --git a/metadata/md5-cache/dev-perl/Unicode-LineBreak-2016.3.0 b/metadata/md5-cache/dev-perl/Unicode-LineBreak-2016.3.0
index d4509872f658..8a515c695848 100644
--- a/metadata/md5-cache/dev-perl/Unicode-LineBreak-2016.3.0
+++ b/metadata/md5-cache/dev-perl/Unicode-LineBreak-2016.3.0
@@ -3,11 +3,11 @@ DEPEND=dev-perl/MIME-Charset virtual/perl-Encode dev-lang/perl:=[-build(-)]
 DESCRIPTION=UAX #14 Unicode Line Breaking Algorithm
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Unicode-LineBreak/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MIME-Charset virtual/perl-Encode dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEZUMI/Unicode-LineBreak-2016.003.tar.gz
 _eclass_exported_funcs=src_unpack:perl-module src_prepare:perl-module src_configure:perl-module src_compile:perl-module src_test:perl-module src_install:perl-module
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=93e1de04a9a5ada974974c6a090e8506
+_md5_=fbbb4e021b06381a964cb6d37bb47092
diff --git a/metadata/md5-cache/dev-php/pecl-geoip-1.1.1-r2 b/metadata/md5-cache/dev-php/pecl-geoip-1.1.1-r2
index a9db0f04d586..ca00c88d2226 100644
--- a/metadata/md5-cache/dev-php/pecl-geoip-1.1.1-r2
+++ b/metadata/md5-cache/dev-php/pecl-geoip-1.1.1-r2
@@ -4,7 +4,7 @@ DESCRIPTION=PHP extension to map IP address to geographic places
 EAPI=6
 HOMEPAGE=http://pecl.php.net/geoip
 IUSE=php_targets_php5-6 php_targets_php7-0
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PHP-3
 RDEPEND=dev-libs/geoip php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://pecl.php.net/get/geoip-1.1.1.tgz
 _eclass_exported_funcs=src_unpack:php-ext-source-r3 src_prepare:php-ext-source-r3 src_configure:php-ext-source-r3 src_compile:php-ext-source-r3 src_test:php-ext-pecl-r3 src_install:php-ext-pecl-r3
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	php-ext-pecl-r3	362ad55b4b4b63dd1cf7df6cbca082c3	php-ext-source-r3	a30f64f44cd0439913e37281006faaca	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d65f58e5305ea02eb0a9ca508c0d0296
+_md5_=61b4445b9ae8995faa5a194a5acc9461
diff --git a/metadata/md5-cache/dev-python/colorlog-2.7.0 b/metadata/md5-cache/dev-python/colorlog-2.7.0
index 07db6b7a5489..65679c39a8ae 100644
--- a/metadata/md5-cache/dev-python/colorlog-2.7.0
+++ b/metadata/md5-cache/dev-python/colorlog-2.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=Log formatting with colors
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/colorlog https://github.com/borntyping/python-colorlog
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=mirror://pypi/c/colorlog/colorlog-2.7.0.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=14a58556bbe16fdd68d9bf6203a38de9
+_md5_=a2f81bbae6d4494c97460bc94cae1c17
diff --git a/metadata/md5-cache/dev-python/coverage-4.1 b/metadata/md5-cache/dev-python/coverage-4.1
index aaadbead49a7..1fca7ad2a87f 100644
--- a/metadata/md5-cache/dev-python/coverage-4.1
+++ b/metadata/md5-cache/dev-python/coverage-4.1
@@ -4,7 +4,7 @@ DESCRIPTION=Code coverage measurement for Python
 EAPI=5
 HOMEPAGE=http://nedbatchelder.com/code/coverage/ https://pypi.python.org/pypi/coverage
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) python_targets_pypy3? ( virtual/pypy3:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-4.1.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=26ac3265152d8a80f5af0678d2a522b4
+_md5_=326b3db43faf600a9456e22399267aa8
diff --git a/metadata/md5-cache/dev-python/cryptography-1.3.4 b/metadata/md5-cache/dev-python/cryptography-1.3.4
index ef38e7894fe4..21208da92920 100644
--- a/metadata/md5-cache/dev-python/cryptography-1.3.4
+++ b/metadata/md5-cache/dev-python/cryptography-1.3.4
@@ -4,7 +4,7 @@ DESCRIPTION=Library providing cryptographic recipes and primitives
 EAPI=5
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/
 IUSE=libressl test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyasn1-0.1.8[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-1.3.4.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=68d15d252eb35cb65775c85f3dd25bd2
+_md5_=ea2ba897732d92c9c18254163309fa60
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-1.3.4 b/metadata/md5-cache/dev-python/cryptography-vectors-1.3.4
index 93b44f94fbeb..fd9ca074aa75 100644
--- a/metadata/md5-cache/dev-python/cryptography-vectors-1.3.4
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-1.3.4
@@ -4,7 +4,7 @@ DESCRIPTION=Test vectors for the cryptography package
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/cryptography-vectors/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-1.3.4.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6cb63be3d444e90cf6246af4d2c3359f
+_md5_=f4b88e082c626554f0ee22de11c2b879
diff --git a/metadata/md5-cache/dev-python/mysql-python-1.2.5-r1 b/metadata/md5-cache/dev-python/mysql-python-1.2.5-r1
index 601c9a12a2cd..5cef0d0aca54 100644
--- a/metadata/md5-cache/dev-python/mysql-python-1.2.5-r1
+++ b/metadata/md5-cache/dev-python/mysql-python-1.2.5-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Python interface to MySQL
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/mysql-python/ https://pypi.python.org/pypi/MySQL-python
 IUSE=doc python_targets_pypy python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=virtual/mysql python_targets_pypy? ( virtual/pypy:0= ) python_targets_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_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/M/MySQL-python/MySQL-python-1.2.5.zip
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=43c268d40d4e5bd8afadfe409ed61fa6
+_md5_=6b9df3bf474f5e549b1810f72a1054ad
diff --git a/metadata/md5-cache/dev-python/paho-mqtt-1.1 b/metadata/md5-cache/dev-python/paho-mqtt-1.1
index f8e92d6073fe..85a2c6a36a96 100644
--- a/metadata/md5-cache/dev-python/paho-mqtt-1.1
+++ b/metadata/md5-cache/dev-python/paho-mqtt-1.1
@@ -4,7 +4,7 @@ DESCRIPTION=A client class with support for both MQTT v3.1 and v3.1.1 on Python
 EAPI=6
 HOMEPAGE=https://www.eclipse.org/paho/clients/python/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=EPL-1.0
 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/eclipse/paho.mqtt.python/archive/1.1.zip -> paho-mqtt-1.1.zip
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8d638a46f3cf216b41d4180fc1b2d841
+_md5_=ea2bc0583f53ba19e1f0f72da552434b
diff --git a/metadata/md5-cache/dev-python/py-smbpasswd-1.0.2 b/metadata/md5-cache/dev-python/py-smbpasswd-1.0.2
index 541e244a57f6..513f89c676a3 100644
--- a/metadata/md5-cache/dev-python/py-smbpasswd-1.0.2
+++ b/metadata/md5-cache/dev-python/py-smbpasswd-1.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=Module capable of generating both LANMAN and NT password hashes, for
 EAPI=6
 HOMEPAGE=https://barryp.org/software/py-smbpasswd/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ia64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://barryp.org/static/media/software/download/py-smbpasswd/1.0.2/smbpasswd-1.0.2.tgz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2f97d885a84ca51e1ef2f5f294611522
+_md5_=6b1579ed8f7fcdcf41c9f60492caf310
diff --git a/metadata/md5-cache/dev-python/pylibmc-1.5.0 b/metadata/md5-cache/dev-python/pylibmc-1.5.0
index d0c503876061..13af76e664d3 100644
--- a/metadata/md5-cache/dev-python/pylibmc-1.5.0
+++ b/metadata/md5-cache/dev-python/pylibmc-1.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=Libmemcached wrapper written as a Python extension
 EAPI=5
 HOMEPAGE=http://sendapatch.se/projects/pylibmc/ https://pypi.python.org/pypi/pylibmc
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/libmemcached-0.32 python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/p/pylibmc/pylibmc-1.5.0.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=33f4d20aff1ffb8eaf6195ddb03d1dc4
+_md5_=732fc0b9b3575f055c1603a28a31518b
diff --git a/metadata/md5-cache/dev-python/pymetar-0.21 b/metadata/md5-cache/dev-python/pymetar-0.21
index bf86c89e156d..0b82fd79f55f 100644
--- a/metadata/md5-cache/dev-python/pymetar-0.21
+++ b/metadata/md5-cache/dev-python/pymetar-0.21
@@ -4,7 +4,7 @@ DESCRIPTION=Downloads, decodes and provides access to the weather report for a g
 EAPI=5
 HOMEPAGE=http://www.schwarzvogel.de/software-pymetar.shtml
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ia64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://www.schwarzvogel.de/pkgs/pymetar-0.21.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=39d44e746780d78bb7a7f2d97497f140
+_md5_=24cd6821ab87f0bf79b56b4b7815e858
diff --git a/metadata/md5-cache/dev-python/python-discid-1.1.0 b/metadata/md5-cache/dev-python/python-discid-1.1.0
index 748fb4af683a..fcad01f7aa24 100644
--- a/metadata/md5-cache/dev-python/python-discid-1.1.0
+++ b/metadata/md5-cache/dev-python/python-discid-1.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings for libdiscid
 EAPI=5
 HOMEPAGE=https://github.com/JonnyJD/python-discid
 IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-3
 RDEPEND=>=media-libs/libdiscid-0.2.2 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(-)] 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=https://github.com/JonnyJD/python-discid/archive/v1.1.0.tar.gz -> python-discid-1.1.0.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=72aeee519cbe34d9bb4b7c19d85e995f
+_md5_=0ece95dcc4d8abd503ff8a0a096264e5
diff --git a/metadata/md5-cache/dev-python/pytz-2016.3 b/metadata/md5-cache/dev-python/pytz-2016.3
index 6d920fe5c8e5..4dfb6ee41134 100644
--- a/metadata/md5-cache/dev-python/pytz-2016.3
+++ b/metadata/md5-cache/dev-python/pytz-2016.3
@@ -4,7 +4,7 @@ DESCRIPTION=World timezone definitions for Python
 EAPI=5
 HOMEPAGE=http://pythonhosted.org/pytz/ https://pypi.python.org/pypi/pytz/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~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/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] || ( >=sys-libs/timezone-data-2015g sys-libs/glibc[vanilla] ) python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) python_targets_pypy3? ( virtual/pypy3:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/p/pytz/pytz-2016.3.tar.bz2
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c579dd9916e6ff8480c62434f285bdaf
+_md5_=a399c002a9a0355096a840d6a642db62
diff --git a/metadata/md5-cache/dev-python/setuptools-20.6.7 b/metadata/md5-cache/dev-python/setuptools-20.6.7
index 58c9f5ebdd7d..85d6dc29e9a8 100644
--- a/metadata/md5-cache/dev-python/setuptools-20.6.7
+++ b/metadata/md5-cache/dev-python/setuptools-20.6.7
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of extensions to Distutils
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/setuptools
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~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
 PDEPEND=>=dev-python/certifi-2015.11.20[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-20.6.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	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9e2833183e090ef08f49592f52aaffa2
+_md5_=3c86018005dc0b9d71048a2026f39a9d
diff --git a/metadata/md5-cache/dev-python/socketio-client-0.6.6 b/metadata/md5-cache/dev-python/socketio-client-0.6.6
index 8d8b3bcf8808..0bfe625af989 100644
--- a/metadata/md5-cache/dev-python/socketio-client-0.6.6
+++ b/metadata/md5-cache/dev-python/socketio-client-0.6.6
@@ -4,7 +4,7 @@ DESCRIPTION=A socket.io client library for Python
 EAPI=5
 HOMEPAGE=https://github.com/invisibleroads/socketIO-client/ https://pypi.python.org/pypi/socketIO-client
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/websocket-client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/s/socketIO-client/socketIO_client-0.6.6.tar.gz -> socketio-client-0.6.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	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c28fb17a354d16d1cdd55194f72a6e0c
+_md5_=8cf8ac944ea38ec262f779b7d808e4b7
diff --git a/metadata/md5-cache/dev-python/tzlocal-1.2 b/metadata/md5-cache/dev-python/tzlocal-1.2
index b3c142b23dee..9cbd04530240 100644
--- a/metadata/md5-cache/dev-python/tzlocal-1.2
+++ b/metadata/md5-cache/dev-python/tzlocal-1.2
@@ -4,7 +4,7 @@ DESCRIPTION=tzinfo object for the local timezone
 EAPI=5
 HOMEPAGE=https://github.com/regebro/tzlocal
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=CC0-1.0
 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=mirror://pypi/t/tzlocal/tzlocal-1.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	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ce3a5bf04e0b7a30176c68c6baeafc66
+_md5_=d9aa1ca999af2ab01dbdee7080fa40a7
diff --git a/metadata/md5-cache/dev-ruby/facter-2.4.6 b/metadata/md5-cache/dev-ruby/facter-2.4.6
index fbde3aeed807..9b43bc5f8cdc 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.4.6
+++ b/metadata/md5-cache/dev-ruby/facter-2.4.6
@@ -4,7 +4,7 @@ DESCRIPTION=A cross-platform Ruby library for retrieving facts from operating sy
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
 IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=amd64 hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) 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/facter-2.4.6.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=786602a6b3fde0326e83525a57a9ad9f
+_md5_=fc168a701a6a304db558cbe94b6f8813
diff --git a/metadata/md5-cache/dev-tex/cjk-latex-4.8.4 b/metadata/md5-cache/dev-tex/cjk-latex-4.8.4
index d8f7024e3f38..8bc674ff7214 100644
--- a/metadata/md5-cache/dev-tex/cjk-latex-4.8.4
+++ b/metadata/md5-cache/dev-tex/cjk-latex-4.8.4
@@ -4,11 +4,11 @@ DESCRIPTION=A LaTeX 2e macro package which enables the use of CJK scripts in var
 EAPI=4
 HOMEPAGE=http://cjk.ffii.org/
 IUSE=doc emacs
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-libs/kpathsea emacs? ( virtual/emacs ) virtual/latex-base
 SLOT=0
 SRC_URI=ftp://ftp.ffii.org/pub/cjk/cjk-4.8.4.tar.gz mirror://gentoo/cjk-4.8.4-fonts.zip doc? ( ftp://ftp.ffii.org/pub/cjk/cjk-4.8.4-doc.tar.gz )
 _eclass_exported_funcs=pkg_postrm:latex-package pkg_postinst:latex-package src_unpack:base src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	latex-package	58e25573cc86e53dddea91261009b301	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=023fddbc6c7bbfbf257a5a2e927d6761
+_md5_=3aaf6c88f809d40983065e81025cbddd
diff --git a/metadata/md5-cache/dev-tex/cpp2latex-2.3-r2 b/metadata/md5-cache/dev-tex/cpp2latex-2.3-r2
index 983cf43f667c..31f8c59c0cad 100644
--- a/metadata/md5-cache/dev-tex/cpp2latex-2.3-r2
+++ b/metadata/md5-cache/dev-tex/cpp2latex-2.3-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=A program to convert C++ code to LaTeX source
 EAPI=6
 HOMEPAGE=http://www.arnoldarts.de/cpp2latex/
-KEYWORDS=amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.arnoldarts.de/files/cpp2latex/cpp2latex-2.3.tar.gz
 _eclass_exported_funcs=-
-_md5_=55a826705fe225785327a5e754ed8993
+_md5_=719440944ca2396321e9e197abf86b85
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20160828 b/metadata/md5-cache/dev-util/dialog-1.3.20160828
index fe347acda9ae..02ec3d6ef351 100644
--- a/metadata/md5-cache/dev-util/dialog-1.3.20160828
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20160828
@@ -4,11 +4,11 @@ DESCRIPTION=tool to display dialog boxes from a shell
 EAPI=6
 HOMEPAGE=http://invisible-island.net/dialog/dialog.html
 IUSE=examples minimal nls static-libs unicode
-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=>=sys-libs/ncurses-5.2-r5:=[unicode?]
 SLOT=0
 SRC_URI=ftp://invisible-island.net/dialog/dialog-1.3-20160828.tgz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=90e2c2caf29d09f12a168f212ed803f3
+_md5_=33ea6825034002701e6884520d3016a3
diff --git a/metadata/md5-cache/dev-util/dput-ng-1.10 b/metadata/md5-cache/dev-util/dput-ng-1.10
index 1fa19dd63d16..9d8eea80ab3b 100644
--- a/metadata/md5-cache/dev-util/dput-ng-1.10
+++ b/metadata/md5-cache/dev-util/dput-ng-1.10
@@ -4,7 +4,7 @@ DESCRIPTION=Next generation Debian package upload tool
 EAPI=6
 HOMEPAGE=https://people.debian.org/~paultag/dput-ng/
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-python/python-debian[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-util/distro-info[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dput-ng/dput-ng_1.10.tar.xz
 _eclass_exported_funcs=pkg_setup:python-single-r1 src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:- src_test:distutils-r1 src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	583a05d30524485fda6869c772682ecd	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=28ff8d9d791bb85e3c5a1bd041ef9279
+_md5_=247fd9adabd52b09040b00662f1ca7b5
diff --git a/metadata/md5-cache/dev-util/scons-2.4.1 b/metadata/md5-cache/dev-util/scons-2.4.1
index ef711f83d41b..32cfceb35c04 100644
--- a/metadata/md5-cache/dev-util/scons-2.4.1
+++ b/metadata/md5-cache/dev-util/scons-2.4.1
@@ -4,7 +4,7 @@ DESCRIPTION=Extensible Python-based build utility
 EAPI=5
 HOMEPAGE=http://www.scons.org/
 IUSE=doc python_targets_pypy python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/scons/scons-2.4.1.tar.gz doc? ( http://www.scons.org/doc/2.4.1/PDF/scons-user.pdf -> scons-2.4.1-user.pdf http://www.scons.org/doc/2.4.1/HTML/scons-user.html -> scons-2.4.1-user.html )
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:-
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=28d07d9c4c51e5497d613bf0f25acf91
+_md5_=4f7a4f1a9f5e158103c180b0e2f69df2
diff --git a/metadata/md5-cache/dev-util/yacc-1.9.1-r6 b/metadata/md5-cache/dev-util/yacc-1.9.1-r6
index ae4464372d30..e3d8c7057474 100644
--- a/metadata/md5-cache/dev-util/yacc-1.9.1-r6
+++ b/metadata/md5-cache/dev-util/yacc-1.9.1-r6
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postrm preinst prepare
 DESCRIPTION=Yacc: Yet Another Compiler-Compiler
 EAPI=6
 HOMEPAGE=http://dinosaur.compilertools.net/#yacc
-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=public-domain
 SLOT=0
 SRC_URI=ftp://metalab.unc.edu/pub/Linux/devel/compiler-tools/yacc-1.9.1.tar.Z
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ec75d4f6a5dd6d7695afa78c38979736
+_md5_=eab9541fb895d19882a4ede4645ebf58
diff --git a/metadata/md5-cache/dev-vcs/fossil-1.35 b/metadata/md5-cache/dev-vcs/fossil-1.35
index 2ed3717ebca2..7ebfe4dab8ec 100644
--- a/metadata/md5-cache/dev-vcs/fossil-1.35
+++ b/metadata/md5-cache/dev-vcs/fossil-1.35
@@ -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.35.tar.gz
 _eclass_exported_funcs=src_configure:- src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=99db4675a57d9fb4971d1b6062faed86
+_md5_=469713408f66c57225f20e01ab9b20c7
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-3.8.4 b/metadata/md5-cache/dev-vcs/tortoisehg-3.8.4
index 9cea3a36f47f..44b7c5ccdc4d 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-3.8.4
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-3.8.4
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-3.8.4.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1e43e38033aed8378c44a8ce9d4aa7a7
+_md5_=ed0e98aa28a0d901d835f93051983119
diff --git a/metadata/md5-cache/games-action/bzflag-2.4.4 b/metadata/md5-cache/games-action/bzflag-2.4.4
index c81061b42d92..77b224fcee9e 100644
--- a/metadata/md5-cache/games-action/bzflag-2.4.4
+++ b/metadata/md5-cache/games-action/bzflag-2.4.4
@@ -4,11 +4,11 @@ DESCRIPTION=3D tank combat simulator game
 EAPI=5
 HOMEPAGE=http://www.bzflag.org/
 IUSE=dedicated upnp
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=net-misc/curl-7.15.0 sys-libs/ncurses:0 net-dns/c-ares sys-libs/zlib upnp? ( net-libs/miniupnpc ) !dedicated? ( virtual/opengl virtual/glu media-libs/libsdl[sound,joystick,video] ) games-misc/games-envd
 SLOT=0
 SRC_URI=https://download.bzflag.org/bzflag/source/2.4.4/bzflag-2.4.4.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_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	games	2cf0d67d765e6358b435ccda30c13ad8	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=d0fcdeb235b3f02cda795ee4cbbe6b60
+_md5_=98a93d72da8ed042ab1a5297d6479172
diff --git a/metadata/md5-cache/games-action/openlierox-0.58_rc3-r1 b/metadata/md5-cache/games-action/openlierox-0.58_rc3-r1
index e00b5cc4ba34..d5956d03b233 100644
--- a/metadata/md5-cache/games-action/openlierox-0.58_rc3-r1
+++ b/metadata/md5-cache/games-action/openlierox-0.58_rc3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Real-time excessive Worms-clone
 EAPI=6
 HOMEPAGE=http://openlierox.sourceforge.net/
 IUSE=X breakpad debug joystick
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2
 RDEPEND=media-libs/sdl-mixer media-libs/sdl-image media-libs/gd[jpeg,png] dev-libs/libxml2 dev-libs/libzip net-misc/curl joystick? ( media-libs/libsdl[joystick] ) !joystick? ( media-libs/libsdl ) X? ( x11-libs/libX11 media-libs/libsdl[X] ) !X? ( media-libs/libsdl )
 SLOT=0
 SRC_URI=mirror://sourceforge/openlierox/OpenLieroX_0.58_rc3.src.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e5ee3d09dec49080091988699580696c
+_md5_=f51cfce36e7f167eca19003a904d01a8
diff --git a/metadata/md5-cache/games-arcade/ceferino-0.97.8-r1 b/metadata/md5-cache/games-arcade/ceferino-0.97.8-r1
index 81ee71e657eb..d37fa19c89cb 100644
--- a/metadata/md5-cache/games-arcade/ceferino-0.97.8-r1
+++ b/metadata/md5-cache/games-arcade/ceferino-0.97.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Super-Pang clone (destroy bouncing balloons with your grapnel)
 EAPI=5
 HOMEPAGE=http://www.loosersjuegos.com.ar/juegos/ceferino
 IUSE=nls
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=media-libs/libsdl-1.2[video] >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2 nls? ( virtual/libintl ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/ceferino/ceferino_0.97.8+svn37.orig.tar.gz
 _eclass_exported_funcs=pkg_preinst:games pkg_postinst:- pkg_setup:games src_unpack:base src_prepare:- src_configure:- src_compile:games src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	games	2cf0d67d765e6358b435ccda30c13ad8	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=195d2d5f0902e8256c82c5b187ff5d9f
+_md5_=875a5b39e7168421b2be83fd4e8abfca
diff --git a/metadata/md5-cache/games-roguelike/angband-4.0.5 b/metadata/md5-cache/games-roguelike/angband-4.0.5
index 3365b9d63f6f..9d802a6f5022 100644
--- a/metadata/md5-cache/games-roguelike/angband-4.0.5
+++ b/metadata/md5-cache/games-roguelike/angband-4.0.5
@@ -4,11 +4,11 @@ DESCRIPTION=A roguelike dungeon exploration game based on the books of J.R.R. To
 EAPI=5
 HOMEPAGE=http://rephial.org/
 IUSE=ncurses sdl +sound X
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libX11 ) !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses:0=[unicode] ) ) ) ncurses? ( sys-libs/ncurses:0=[unicode] ) sdl? ( media-libs/libsdl[video,X] media-libs/sdl-ttf media-libs/sdl-image sound? ( media-libs/sdl-mixer[mp3] media-libs/libsdl[sound] ) ) games-misc/games-envd
 SLOT=0
 SRC_URI=http://rephial.org/downloads/4.0/angband-4.0.5.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- pkg_setup:games src_unpack:base src_prepare:- src_configure:- src_compile:games src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fc7b899a7ea785c1962fa978038454a0
+_md5_=364963ef66c5770f1b98faebfcef6cd0
diff --git a/metadata/md5-cache/games-simulation/flightgear-2016.3.1 b/metadata/md5-cache/games-simulation/flightgear-2016.3.1
index aa089f55d7c7..499e39eeb646 100644
--- a/metadata/md5-cache/games-simulation/flightgear-2016.3.1
+++ b/metadata/md5-cache/games-simulation/flightgear-2016.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Open Source Flight Simulator
 EAPI=6
 HOMEPAGE=http://www.flightgear.org/
 IUSE=dbus debug examples qt5 test +udev +utils vim-syntax
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[png] ~dev-games/simgear-2016.3.1 media-libs/openal media-libs/speex media-sound/gsm sys-libs/zlib x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) qt5? ( >=dev-qt/qtcore-5.4.1:5 >=dev-qt/qtgui-5.4.1:5 >=dev-qt/qtwidgets-5.4.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/libpng:0 virtual/opengl ) ~games-simulation/flightgear-data-2016.3.1
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/flightgear-2016.3.1.tar.bz2
 _eclass_exported_funcs=pkg_postinst:- src_prepare:cmake-utils src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9fe3282b90e9c2582db5802f68636aa7
+_md5_=1ab8650a0165612f4330f02e6c375523
diff --git a/metadata/md5-cache/games-simulation/flightgear-data-2016.3.1 b/metadata/md5-cache/games-simulation/flightgear-data-2016.3.1
index b54f13be0699..fb5b7d57aef4 100644
--- a/metadata/md5-cache/games-simulation/flightgear-data-2016.3.1
+++ b/metadata/md5-cache/games-simulation/flightgear-data-2016.3.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=FlightGear data files
 EAPI=6
 HOMEPAGE=http://www.flightgear.org/
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=!<games-simulation/flightgear-2.10.0
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/FlightGear-2016.3.1-data.tar.bz2
 _eclass_exported_funcs=src_install:-
-_md5_=d2eb8edee3c00ae414aeacea6e0154fe
+_md5_=838d995edd1f291b77050b4f97f716fc
diff --git a/metadata/md5-cache/games-strategy/0ad-data-0.0.20_alpha b/metadata/md5-cache/games-strategy/0ad-data-0.0.20_alpha
index 8a08782e1cc8..7ddae0ad9262 100644
--- a/metadata/md5-cache/games-strategy/0ad-data-0.0.20_alpha
+++ b/metadata/md5-cache/games-strategy/0ad-data-0.0.20_alpha
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DESCRIPTION=Data files for 0ad
 EAPI=5
 HOMEPAGE=https://play0ad.com/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/zero-ad/0ad-0.0.20-alpha-unix-data.tar.xz
 _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	b83a2420b796f7c6eff682679d08fe25	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=8488ffeb33ce3bba26d54db925a2d006
+_md5_=4c6b77b6715023e50f9d7a966950029f
diff --git a/metadata/md5-cache/games-strategy/freeciv-2.5.4 b/metadata/md5-cache/games-strategy/freeciv-2.5.4
index c0ecbedf9290..9803074b6c16 100644
--- a/metadata/md5-cache/games-strategy/freeciv-2.5.4
+++ b/metadata/md5-cache/games-strategy/freeciv-2.5.4
@@ -4,11 +4,11 @@ DESCRIPTION=multiplayer strategy game (Civilization Clone)
 EAPI=5
 HOMEPAGE=http://www.freeciv.org/
 IUSE=auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !mysql? ( ( !sqlite? ( virtual/mysql ) ) ) ) readline? ( sys-libs/readline:0= ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:2 ) mapimg? ( media-gfx/imagemagick ) modpack? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl[video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) system-lua? ( >=dev-lang/lua-5.2 ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/freeciv/freeciv-2.5.4.tar.bz2
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:- src_unpack:base src_prepare:- src_configure:- src_compile:games src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f036f4586b3d413e869ce1e4fed9d24c
+_md5_=514e6a177642004679972ab2633bfaad
diff --git a/metadata/md5-cache/games-strategy/freecol-0.11.6 b/metadata/md5-cache/games-strategy/freecol-0.11.6
index 41262061c206..9cf6a9396dbc 100644
--- a/metadata/md5-cache/games-strategy/freecol-0.11.6
+++ b/metadata/md5-cache/games-strategy/freecol-0.11.6
@@ -4,11 +4,11 @@ DESCRIPTION=An open source clone of the game Colonization
 EAPI=5
 HOMEPAGE=http://www.freecol.org/
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=virtual/jre-1.8 dev-java/jsr173 dev-java/wstx:3.2 dev-java/commons-cli:1 dev-java/cortado dev-java/miglayout >=dev-java/java-config-2.2.0-r3 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/freecol/freecol-0.11.6-src.zip
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:games pkg_setup:- src_unpack:base src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	games	2cf0d67d765e6358b435ccda30c13ad8	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=91b4439b3b8ded0e0ba7fc554a57c475
+_md5_=0ab844f134f8a6a5814b5055a2617598
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.12.6 b/metadata/md5-cache/games-strategy/wesnoth-1.12.6
index eef3e998b3c5..dc9c142a6695 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.12.6
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.12.6
@@ -4,11 +4,11 @@ DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
 EAPI=5
 HOMEPAGE=http://www.wesnoth.org/
 IUSE=dbus dedicated doc fribidi nls server
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libsdl-1.2.7:0[joystick,video,X] media-libs/sdl-net !dedicated? ( >=media-libs/sdl-ttf-2.0.8 >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[jpeg,png] fribidi? ( dev-libs/fribidi ) dbus? ( sys-apps/dbus ) sys-libs/zlib x11-libs/pango dev-lang/lua:0 media-libs/fontconfig ) >=dev-libs/boost-1.48:=[nls,threads] virtual/libintl games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/wesnoth/wesnoth-1.12.6.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	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e77fc37bb7e79557f11376d4ef0e2521
+_md5_=b1498ed3fb831ae5af6a9d4c52a0b3e0
diff --git a/metadata/md5-cache/media-gfx/darktable-2.0.7 b/metadata/md5-cache/media-gfx/darktable-2.0.7
index decc7ef10c59..4172d916b507 100644
--- a/metadata/md5-cache/media-gfx/darktable-2.0.7
+++ b/metadata/md5-cache/media-gfx/darktable-2.0.7
@@ -4,7 +4,7 @@ DESCRIPTION=A virtual lighttable and darkroom for photographers
 EAPI=5
 HOMEPAGE=http://www.darktable.org/
 IUSE=colord cups cpu_flags_x86_sse3 doc flickr gphoto2 graphicsmagick jpeg2k kde libsecret nls opencl openmp openexr pax_kernel +slideshow webp l10n_ca l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fr l10n_he l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ru l10n_sk l10n_sl l10n_sq l10n_sv l10n_uk
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3 CC-BY-3.0
 RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-misc/curl virtual/jpeg:0 x11-libs/cairo x11-libs/gtk+:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) slideshow? ( media-libs/libsdl virtual/glu virtual/opengl ) webp? ( media-libs/libwebp:0= ) kde? ( kde-apps/kwalletd:4 )
 REQUIRED_USE=cpu_flags_x86_sse3
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.0.7/darktable-2.0.7.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.0.0/darktable-usermanual.pdf -> darktable-usermanual-2.0.0.pdf )
 _eclass_exported_funcs=pkg_pretend:- pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7cbd6e9610e3bc4d780b82c78f9fac90
+_md5_=80f98a1b797dde2c43df87b65e3adbf6
diff --git a/metadata/md5-cache/media-gfx/fbida-2.12 b/metadata/md5-cache/media-gfx/fbida-2.12
index 590d8773294c..fb454a1905a0 100644
--- a/metadata/md5-cache/media-gfx/fbida-2.12
+++ b/metadata/md5-cache/media-gfx/fbida-2.12
@@ -4,7 +4,7 @@ DESCRIPTION=Image viewers for the framebuffer console (fbi) and X11 (ida)
 EAPI=5
 HOMEPAGE=http://www.kraxel.org/blog/linux/fbida/
 IUSE=curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp
-KEYWORDS=alpha amd64 arm hppa ~ppc ppc64 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 arm hppa ~ppc ppc64 ~sh ~sparc x86
 LICENSE=GPL-2 IJG
 RDEPEND=!media-gfx/fbi app-text/poppler >=media-libs/fontconfig-2.2 >=media-libs/freetype-2.0 media-libs/libepoxy media-libs/libexif media-libs/mesa virtual/jpeg:* virtual/ttf-fonts x11-libs/cairo[opengl] x11-libs/libdrm curl? ( net-misc/curl ) gif? ( media-libs/giflib:= ) lirc? ( app-misc/lirc ) png? ( media-libs/libpng:* ) scanner? ( media-gfx/sane-backends ) tiff? ( media-libs/tiff:* ) webp? ( media-libs/libwebp ) X? ( >=x11-libs/motif-2.3:0 x11-libs/libX11 x11-libs/libXpm x11-libs/libXt ) ghostscript? ( app-text/ghostscript-gpl )
 REQUIRED_USE=ghostscript? ( tiff )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://www.kraxel.org/releases/fbida/fbida-2.12.tar.gz mirror://gentoo/ida.png.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=a793823b1f3cd0368c62604560f436e5
+_md5_=2fa11d57adecf226e44ac9a6f868e292
diff --git a/metadata/md5-cache/media-gfx/mcomix-1.2.1 b/metadata/md5-cache/media-gfx/mcomix-1.2.1
index 72c7205e8e7e..c9c730a1fa20 100644
--- a/metadata/md5-cache/media-gfx/mcomix-1.2.1
+++ b/metadata/md5-cache/media-gfx/mcomix-1.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=A fork of comix, a GTK image viewer for comic book archives
 EAPI=5
 HOMEPAGE=http://mcomix.sourceforge.net
 IUSE=python_targets_python2_7 linguas_ca linguas_cs linguas_de linguas_el linguas_es linguas_fa linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/jpeg dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gdk-pixbuf !media-gfx/comix 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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/mcomix/mcomix-1.2.1.tar.bz2
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	l10n	e26ea0642846685782f1813642e7ff0f	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=343a0a772f7cbc46650d8d3171d6d65a
+_md5_=f39d216f4bb50baa0b0a7d1d29324a62
diff --git a/metadata/md5-cache/media-gfx/ufraw-0.22 b/metadata/md5-cache/media-gfx/ufraw-0.22
index 7ea9e6d18ab7..7a114811ef47 100644
--- a/metadata/md5-cache/media-gfx/ufraw-0.22
+++ b/metadata/md5-cache/media-gfx/ufraw-0.22
@@ -4,7 +4,7 @@ DESCRIPTION=RAW Image format viewer and GIMP plugin
 EAPI=5
 HOMEPAGE=http://ufraw.sourceforge.net/
 IUSE=contrast fits gimp gnome gtk openmp timezone
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2= >=media-gfx/exiv2-0.11:0= media-libs/lcms:2= >=media-libs/lensfun-0.2.5:= media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= fits? ( sci-libs/cfitsio:0= ) gnome? ( >=gnome-base/gconf-2 ) gtk? ( >=x11-libs/gtk+-2.6:2 >=media-gfx/gtkimageview-1.5 ) gimp? ( >=media-gfx/gimp-2 )
 REQUIRED_USE=gimp? ( gtk )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/ufraw/ufraw-0.22.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=71d8f94569cd024eb18cf8e48f119f16
+_md5_=99700255131adb2d74ea15da812661b0
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.3.8 b/metadata/md5-cache/media-libs/libmikmod-3.3.8
index d423c5e022fa..ae44e7eb7b4b 100644
--- a/metadata/md5-cache/media-libs/libmikmod-3.3.8
+++ b/metadata/md5-cache/media-libs/libmikmod-3.3.8
@@ -4,7 +4,7 @@ DESCRIPTION=A library to play a wide range of module formats
 EAPI=5
 HOMEPAGE=http://mikmod.sourceforge.net/
 IUSE=+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads 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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=LGPL-2+ LGPL-2.1
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) nas? ( >=media-libs/nas-1.9.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(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-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(-)?] ) !media-libs/libmikmod:2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 REQUIRED_USE=|| ( alsa coreaudio nas openal oss pulseaudio )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/mikmod/libmikmod-3.3.8.tar.gz
 _eclass_exported_funcs=src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=96a4b180b99166ce518f166f5099989b
+_md5_=f2146e7f4485746d763efeb4d91fa173
diff --git a/metadata/md5-cache/media-libs/mutagen-1.35.1 b/metadata/md5-cache/media-libs/mutagen-1.35.1
index 069389b7cf38..4f14d7bf51f5 100644
--- a/metadata/md5-cache/media-libs/mutagen-1.35.1
+++ b/metadata/md5-cache/media-libs/mutagen-1.35.1
@@ -4,7 +4,7 @@ DESCRIPTION=Audio metadata tag reader and writer implemented in pure Python
 EAPI=6
 HOMEPAGE=https://bitbucket.org/lazka/mutagen https://pypi.python.org/pypi/mutagen
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-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=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://bitbucket.org/lazka/mutagen/downloads/mutagen-1.35.1.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	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2b6b714cf41bab685faeb09e292d59c4
+_md5_=1b155c5aeb180fe94a78dd68f73000ee
diff --git a/metadata/md5-cache/media-libs/opencollada-1.6.25 b/metadata/md5-cache/media-libs/opencollada-1.6.25
index b38623d53d5b..5632d9a74bdc 100644
--- a/metadata/md5-cache/media-libs/opencollada-1.6.25
+++ b/metadata/md5-cache/media-libs/opencollada-1.6.25
@@ -4,11 +4,11 @@ DESCRIPTION=Stream based read/write library for COLLADA files
 EAPI=6
 HOMEPAGE=http://www.opencollada.org/
 IUSE=expat static-libs
-KEYWORDS=amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/libpcre dev-libs/zziplib media-libs/lib3ds sys-libs/zlib expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2 )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCOLLADA/archive/v1.6.25.tar.gz -> opencollada-1.6.25.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a96a6524235f532499b93a322ece1ff9
+_md5_=9985b584d0b066ffa665e032583fc95c
diff --git a/metadata/md5-cache/media-libs/taglib-1.10 b/metadata/md5-cache/media-libs/taglib-1.10
index 9cb94560fe95..22b6539b6ab8 100644
--- a/metadata/md5-cache/media-libs/taglib-1.10
+++ b/metadata/md5-cache/media-libs/taglib-1.10
@@ -4,11 +4,11 @@ DESCRIPTION=A library for reading and editing audio meta data
 EAPI=5
 HOMEPAGE=https://taglib.github.io/
 IUSE=+asf debug examples +mp4 test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1 MPL-1.1
 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(-)?]
 SLOT=0
 SRC_URI=https://github.com/taglib/taglib/archive/v1.10.tar.gz -> taglib-1.10.tar.gz
 _eclass_exported_funcs=pkg_postinst:- 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	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=483f199ca1b685ce25fb761a80cb8268
+_md5_=a0d97ebc3fd63f1fe1b45afe36bc83be
diff --git a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-0.10.2 b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-0.10.2
index 9612f8ebdbe2..1bc1eb629422 100644
--- a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-0.10.2
+++ b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-0.10.2
@@ -3,11 +3,11 @@ DEPEND=media-libs/taglib media-sound/mpg123 =media-sound/qmmp-0.10* dev-qt/qtgui
 DESCRIPTION=A set of extra plugins for Qmmp
 EAPI=6
 HOMEPAGE=http://qmmp.ylsoftware.com/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/taglib media-sound/mpg123 =media-sound/qmmp-0.10* dev-qt/qtgui:4
 SLOT=0
 SRC_URI=http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-0.10.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	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b93f0fe2faff57b94cdd8e2a41209414
+_md5_=d282604538dff1ad9186524a1a2b88de
diff --git a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.0.4 b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.0.4
index 8f74ed28595a..b575c61195d4 100644
--- a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.0.4
+++ b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.0.4
@@ -3,11 +3,11 @@ DEPEND=>=media-libs/taglib-1.10 media-sound/mpg123 >=media-sound/qmmp-1.0.0 dev-
 DESCRIPTION=A set of extra plugins for Qmmp
 EAPI=6
 HOMEPAGE=http://qmmp.ylsoftware.com/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/taglib-1.10 media-sound/mpg123 >=media-sound/qmmp-1.0.0 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-1.0.4.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	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c8268282c51ef8d9328621d378ace6b6
+_md5_=0a40909d55fbc420618f5efac635dd1b
diff --git a/metadata/md5-cache/media-sound/ams-2.1.2 b/metadata/md5-cache/media-sound/ams-2.1.2
index a8910693d439..379d047f334b 100644
--- a/metadata/md5-cache/media-sound/ams-2.1.2
+++ b/metadata/md5-cache/media-sound/ams-2.1.2
@@ -3,11 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 media
 DESCRIPTION=Alsa Modular Software Synthesizer
 EAPI=6
 HOMEPAGE=http://alsamodular.sourceforge.net
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 media-libs/ladspa-sdk media-libs/libclalsadrv media-libs/alsa-lib media-sound/jack-audio-connection-kit sci-libs/fftw:3.0= !dev-ruby/amrita
 SLOT=0
 SRC_URI=mirror://sourceforge/alsamodular/ams-2.1.2.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d2ff6090c961f0b66523e9492fef66d8
+_md5_=27247e14288d82de8262e3e95fe9c645
diff --git a/metadata/md5-cache/media-sound/bpmdetect-0.6.1-r1 b/metadata/md5-cache/media-sound/bpmdetect-0.6.1-r1
index 8bb0a72b3837..12e85bc5d5a2 100644
--- a/metadata/md5-cache/media-sound/bpmdetect-0.6.1-r1
+++ b/metadata/md5-cache/media-sound/bpmdetect-0.6.1-r1
@@ -3,11 +3,11 @@ DEPEND=media-libs/taglib media-libs/id3lib >=media-libs/fmod-4.25.07-r1:1 dev-qt
 DESCRIPTION=Automatic BPM detection utility
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/bpmdetect
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/taglib media-libs/id3lib >=media-libs/fmod-4.25.07-r1:1 dev-qt/qtgui:4
 SLOT=0
 SRC_URI=mirror://sourceforge/bpmdetect/bpmdetect-0.6.1-src.tar.bz2
 _eclass_exported_funcs=src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	scons-utils	d42c1726f481bb5812cc2ce1f236db1d	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f1dafaca1a02d95ad6cf081d3afae34b
+_md5_=d0f1f5d6847e971316c8c145be52d4be
diff --git a/metadata/md5-cache/media-sound/clementine-1.2.3 b/metadata/md5-cache/media-sound/clementine-1.2.3
deleted file mode 100644
index 980486730cc4..000000000000
--- a/metadata/md5-cache/media-sound/clementine-1.2.3
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-crypt/qca:2[qt4(+)] >=dev-qt/qtcore-4.5:4[ssl] >=dev-qt/qtgui-4.5:4 dbus? ( >=dev-qt/qtdbus-4.5:4 ) >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] system-sqlite? ( dev-db/sqlite:3[fts3(+)] ) >=media-libs/taglib-1.8[mp4(+)] >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson media-libs/libechonest:=[qt4(+)] >=media-libs/libmygpo-qt-1.0.7[qt4(+)] >=media-libs/chromaprint-0.6 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 ayatana? ( dev-libs/libindicate-qt ) cdda? ( dev-libs/libcdio ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) >=dev-libs/boost-1.39 virtual/pkgconfig sys-devel/gettext dev-qt/qttest:4 dev-cpp/gmock box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) ubuntu-one? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-3.5.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A modern music player and library organizer based on Amarok 1.4 and Qt4
-EAPI=5
-HOMEPAGE=http://www.clementine-player.org https://github.com/clementine-player/Clementine
-IUSE=ayatana box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive system-sqlite test ubuntu-one +udisks wiimote linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_es_AR linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_mr linguas_ms linguas_nb linguas_nl linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_te linguas_tr linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW test
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/qca:2[qt4(+)] >=dev-qt/qtcore-4.5:4[ssl] >=dev-qt/qtgui-4.5:4 dbus? ( >=dev-qt/qtdbus-4.5:4 ) >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] system-sqlite? ( dev-db/sqlite:3[fts3(+)] ) >=media-libs/taglib-1.8[mp4(+)] >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson media-libs/libechonest:=[qt4(+)] >=media-libs/libmygpo-qt-1.0.7[qt4(+)] >=media-libs/chromaprint-0.6 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 ayatana? ( dev-libs/libindicate-qt ) cdda? ( dev-libs/libcdio ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) dbus? ( udisks? ( sys-fs/udisks:2 ) ) mms? ( media-plugins/gst-plugins-libmms:0.10 ) mtp? ( gnome-base/gvfs ) projectm? ( >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-gio:0.10 media-plugins/gst-plugins-soup:0.10 media-plugins/gst-plugins-taglib:0.10
-REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz -> clementine-1.2.3.tar.gz
-_eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:cmake-utils src_test:- src_install:cmake-utils
-_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=dc1cada4d7e13aa079e155025811d674
diff --git a/metadata/md5-cache/media-sound/clementine-1.2.3-r2 b/metadata/md5-cache/media-sound/clementine-1.2.3-r2
deleted file mode 100644
index 9abcc391918a..000000000000
--- a/metadata/md5-cache/media-sound/clementine-1.2.3-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-crypt/qca:2[qt4(+)] >=dev-qt/qtcore-4.5:4[ssl] >=dev-qt/qtgui-4.5:4 dbus? ( >=dev-qt/qtdbus-4.5:4 ) >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] system-sqlite? ( dev-db/sqlite:3[fts3(+)] ) >=media-libs/taglib-1.8[mp4(+)] >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson media-libs/libechonest:=[qt4(+)] >=media-libs/libmygpo-qt-1.0.7[qt4(+)] >=media-libs/chromaprint-0.6 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 ayatana? ( dev-libs/libindicate-qt ) cdda? ( dev-libs/libcdio ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) >=dev-libs/boost-1.39:= virtual/pkgconfig sys-devel/gettext dev-qt/qttest:4 dev-cpp/gmock box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) ubuntu-one? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-3.5.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A modern music player and library organizer based on Amarok 1.4 and Qt4
-EAPI=5
-HOMEPAGE=http://www.clementine-player.org https://github.com/clementine-player/Clementine
-IUSE=ayatana box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive system-sqlite test ubuntu-one +udisks wiimote linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_es_AR linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_mr linguas_ms linguas_nb linguas_nl linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_te linguas_tr linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW test
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/qca:2[qt4(+)] >=dev-qt/qtcore-4.5:4[ssl] >=dev-qt/qtgui-4.5:4 dbus? ( >=dev-qt/qtdbus-4.5:4 ) >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] system-sqlite? ( dev-db/sqlite:3[fts3(+)] ) >=media-libs/taglib-1.8[mp4(+)] >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson media-libs/libechonest:=[qt4(+)] >=media-libs/libmygpo-qt-1.0.7[qt4(+)] >=media-libs/chromaprint-0.6 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 ayatana? ( dev-libs/libindicate-qt ) cdda? ( dev-libs/libcdio ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) dbus? ( udisks? ( sys-fs/udisks:0 ) ) mms? ( media-plugins/gst-plugins-libmms:0.10 ) mtp? ( gnome-base/gvfs[mtp] ) projectm? ( >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-gio:0.10 media-plugins/gst-plugins-soup:0.10 media-plugins/gst-plugins-taglib:0.10
-REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz -> clementine-1.2.3.tar.gz
-_eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:cmake-utils src_test:- src_install:cmake-utils
-_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=eb5e38dabf3242fb7bf3580e8cae63fe
diff --git a/metadata/md5-cache/media-sound/mpd-0.19.19 b/metadata/md5-cache/media-sound/mpd-0.19.19
index f8fb6ae56930..6d9101d58a2c 100644
--- a/metadata/md5-cache/media-sound/mpd-0.19.19
+++ b/metadata/md5-cache/media-sound/mpd-0.19.19
@@ -4,7 +4,7 @@ DESCRIPTION=The Music Player Daemon (mpd)
 EAPI=6
 HOMEPAGE=https://www.musicpd.org
 IUSE=adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad +fifo +ffmpeg flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack wildmidi zeroconf zip zlib
-KEYWORDS=alpha amd64 arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos
+KEYWORDS=alpha amd64 arm ~hppa ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~x64-macos
 LICENSE=GPL-2
 RDEPEND=!<sys-cluster/mpich2-1.4_rc2 adplug? ( media-libs/adplug ) alsa? ( media-sound/alsa-utils media-libs/alsa-lib ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) glib? ( dev-libs/glib:2 ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) nfs? ( net-fs/libnfs ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) samba? ( || ( <net-fs/samba-4.0.25[smbclient] >=net-fs/samba-4.0.25 ) ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2 ) libsoxr? ( media-libs/soxr ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) upnp? ( net-libs/libupnp ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-mpd )
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( adplug audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) ao? ( glib ) gme? ( glib ) jack? ( glib ) network? ( || ( audiofile flac lame twolame vorbis ) glib ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) sid? ( glib ) soundcloud? ( glib ) sqlite? ( glib ) opus? ( ogg ) upnp? ( expat ) vorbis? ( glib ) wavpack? ( glib )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.19/mpd-0.19.19.tar.xz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=60f41014680a68567e1b25d45ba5544a
+_md5_=a183579c1dcbb94365fcd3ec52a258ea
diff --git a/metadata/md5-cache/media-sound/picard-1.3.2-r1 b/metadata/md5-cache/media-sound/picard-1.3.2-r1
index 9791597a2dfd..2c20b5416893 100644
--- a/metadata/md5-cache/media-sound/picard-1.3.2-r1
+++ b/metadata/md5-cache/media-sound/picard-1.3.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A cross-platform music tagger
 EAPI=5
 HOMEPAGE=http://picard.musicbrainz.org/
 IUSE=+acoustid +cdda nls python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-qt/qtgui:4[accessibility] media-libs/mutagen acoustid? ( >=media-libs/chromaprint-1.0[tools] ) cdda? ( dev-python/python-discid ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-1.3.2.tar.gz
 _eclass_exported_funcs=pkg_postinst:readme.gentoo pkg_setup:python-single-r1 src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:- src_test:distutils-r1 src_install:-
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c2699788c7dd919ae3310c8aee209c52
+_md5_=d28dc30b45adbc1d30835041fe5c3db9
diff --git a/metadata/md5-cache/media-sound/qmmp-0.10.5 b/metadata/md5-cache/media-sound/qmmp-0.10.5
index 84c2229e6d2b..36daf9f04576 100644
--- a/metadata/md5-cache/media-sound/qmmp-0.10.5
+++ b/metadata/md5-cache/media-sound/qmmp-0.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=Qt4-based audio player with winamp/xmms skins support
 EAPI=6
 HOMEPAGE=http://qmmp.ylsoftware.com
 IUSE=analyzer aac +alsa bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss projectm pulseaudio qsui scrobbler sndfile soxr stereo tray udisks +vorbis wavpack
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/taglib dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtmultimedia:4 alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) aac? ( media-libs/faad2 ) enca? ( app-i18n/enca ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) ladspa? ( media-libs/ladspa-cmt ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( >=media-libs/libmodplug-0.8.4 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsamplerate ) ffmpeg? ( virtual/ffmpeg ) opus? ( media-libs/opusfile ) projectm? ( media-libs/libprojectm dev-qt/qtopengl:4 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) wavpack? ( media-sound/wavpack ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 )
 SLOT=0
 SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-0.10.5.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9a8ccd63e31e2477e70f10f72aede3af
+_md5_=d20ab8f07db101eec5e35dbdb28a2b06
diff --git a/metadata/md5-cache/media-sound/qmmp-1.0.10-r1 b/metadata/md5-cache/media-sound/qmmp-1.0.10-r1
index c9fa18aa4a79..a82d1beb6c91 100644
--- a/metadata/md5-cache/media-sound/qmmp-1.0.10-r1
+++ b/metadata/md5-cache/media-sound/qmmp-1.0.10-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Qt5-based audio player with winamp/xmms skins support
 EAPI=6
 HOMEPAGE=http://qmmp.ylsoftware.com
 IUSE=analyzer aac +alsa +dbus bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/taglib dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) aac? ( media-libs/faad2 ) enca? ( app-i18n/enca ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) ladspa? ( media-libs/ladspa-cmt ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) mplayer? ( media-video/mplayer ) mpris? ( dev-qt/qtdbus:5 ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( >=media-libs/libmodplug-0.8.4 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsamplerate ) ffmpeg? ( virtual/ffmpeg ) opus? ( media-libs/opusfile ) projectm? ( media-libs/libprojectm dev-qt/qtopengl:5 dev-qt/qtgui:5[-gles2] ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) wavpack? ( media-sound/wavpack ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=kde? ( dbus )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.0.10.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cf2fddb658d91ab5341f2f045a4a5867
+_md5_=5ff64a6a5ff0a931382ea1ceef4f2261
diff --git a/metadata/md5-cache/media-sound/quodlibet-3.7.1 b/metadata/md5-cache/media-sound/quodlibet-3.7.1
index ac548730dff4..ef3d84ccdd81 100644
--- a/metadata/md5-cache/media-sound/quodlibet-3.7.1
+++ b/metadata/md5-cache/media-sound/quodlibet-3.7.1
@@ -4,7 +4,7 @@ DESCRIPTION=audio library tagger, manager, and player for GTK+
 EAPI=5
 HOMEPAGE=http://quodlibet.readthedocs.org
 IUSE=+dbus gstreamer ipod +udev python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/keybinder:3[introspection] dev-python/feedparser[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-libs/mutagen-1.32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+[introspection] gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( media-libs/xine-lib ) dbus? ( app-misc/media-player-info dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ipod? ( media-libs/libgpod[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) udev? ( virtual/udev ) !media-plugins/quodlibet-plugins 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=ipod? ( dbus ) || ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/quodlibet/quodlibet/archive/release-3.7.1.tar.gz -> quodlibet-3.7.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:-
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c2bf1d978827192ac0fbe1a9c3135415
+_md5_=bfa09cef9f8f4266e9e1784cb5fdb8b0
diff --git a/metadata/md5-cache/media-video/bino-1.6.1-r2 b/metadata/md5-cache/media-video/bino-1.6.1-r2
index b69f9d1f408a..06a2d2b326c7 100644
--- a/metadata/md5-cache/media-video/bino-1.6.1-r2
+++ b/metadata/md5-cache/media-video/bino-1.6.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Stereoscopic and multi-display media player
 EAPI=5
 HOMEPAGE=http://bino3d.org/
 IUSE=debug doc libav lirc video_cards_nvidia linguas_en linguas_bg linguas_de linguas_fr linguas_ru linguas_zh_CN
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=media-libs/glew-1.6.0:0= >=media-libs/openal-1.15.1 dev-qt/qtgui:4 dev-qt/qtcore:4 dev-qt/qtopengl:4 >=media-libs/libass-0.9.9 libav? ( >=media-video/libav-0.7:0= ) !libav? ( >=media-video/ffmpeg-0.7:0= ) lirc? ( app-misc/lirc ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) virtual/libintl
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/bino/bino-1.6.1.tar.xz
 _eclass_exported_funcs=src_prepare:autotools-utils src_configure:- src_compile:autotools-utils src_test:autotools-utils src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=4ee30c776274dbcb24b1d4407c8801d5
+_md5_=6322ac08812a2cc33ce01e38727a5054
diff --git a/metadata/md5-cache/media-video/ffmpeg2theora-0.30 b/metadata/md5-cache/media-video/ffmpeg2theora-0.30
index f06f922affd5..b504710bd8c0 100644
--- a/metadata/md5-cache/media-video/ffmpeg2theora-0.30
+++ b/metadata/md5-cache/media-video/ffmpeg2theora-0.30
@@ -4,11 +4,11 @@ DESCRIPTION=A simple converter to create Ogg Theora files
 EAPI=5
 HOMEPAGE=http://www.v2v.cc/~j/ffmpeg2theora/
 IUSE=kate libav
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=!libav? ( media-video/ffmpeg:0= ) libav? ( media-libs/libpostproc:0= media-video/libav:0= ) >=media-libs/libvorbis-1.1 >=media-libs/libogg-1.1 >=media-libs/libtheora-1.1[encode] kate? ( >=media-libs/libkate-0.3.7 )
 SLOT=0
 SRC_URI=http://www.v2v.cc/~j/ffmpeg2theora/downloads/ffmpeg2theora-0.30.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	scons-utils	d42c1726f481bb5812cc2ce1f236db1d	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f00b51c6735f567cfbea9ee3a31f02fa
+_md5_=e34687b2a06e611f99916c619dcdaee2
diff --git a/metadata/md5-cache/net-analyzer/lft-3.77 b/metadata/md5-cache/net-analyzer/lft-3.77
index 5d5987f4c086..3df39ed4b2d7 100644
--- a/metadata/md5-cache/net-analyzer/lft-3.77
+++ b/metadata/md5-cache/net-analyzer/lft-3.77
@@ -3,10 +3,10 @@ DEPEND=net-libs/libpcap
 DESCRIPTION=Layer Four Traceroute (LFT) and WhoB
 EAPI=6
 HOMEPAGE=http://pwhois.org/lft/
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=VOSTROM
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=http://pwhois.org/get/lft-3.77.tar.gz
 _eclass_exported_funcs=src_prepare:-
-_md5_=c3fe47eae618111330048c4fbf33d10d
+_md5_=74b5952e733300dd8bde32de133441be
diff --git a/metadata/md5-cache/net-analyzer/nmap-7.31 b/metadata/md5-cache/net-analyzer/nmap-7.31
index e81d06f89d4a..306bacbcd3c8 100644
--- a/metadata/md5-cache/net-analyzer/nmap-7.31
+++ b/metadata/md5-cache/net-analyzer/nmap-7.31
@@ -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-1.8.0 <net-libs/libpcap-1.8.0[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_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_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_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.31.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_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=716b4ffaddcc9b27a93be0edaeb3569f
+_md5_=d343b7e42e53523e3c9a351a7f7d9564
diff --git a/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.2 b/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.2
index c2c36ff65768..a897223b146f 100644
--- a/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.2
+++ b/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.2
@@ -4,7 +4,7 @@ DESCRIPTION=The official command-line client for RIPE Atlas
 EAPI=5
 HOMEPAGE=https://atlas.ripe.net/
 IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=net-libs/ripe-atlas-sagan-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=www-client/ripe-atlas-cousteau-1.0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/tzlocal[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/ujson[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/r/ripe.atlas.tools/ripe.atlas.tools-1.2.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	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d29a04e5ad1bddfea65bd035f69aca41
+_md5_=1c1b754cd7368233cdb3fe543ffc64a4
diff --git a/metadata/md5-cache/net-dns/djbdns-1.05-r29 b/metadata/md5-cache/net-dns/djbdns-1.05-r29
deleted file mode 100644
index 2b750f55f954..000000000000
--- a/metadata/md5-cache/net-dns/djbdns-1.05-r29
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare
-DEPEND=!app-doc/djbdns-man
-DESCRIPTION=Collection of DNS client/server software
-EAPI=5
-HOMEPAGE=http://cr.yp.to/djbdns.html
-IUSE=ipv6 selinux
-KEYWORDS=alpha amd64 hppa ~mips ppc ppc64 sparc x86
-LICENSE=public-domain
-RDEPEND=!app-doc/djbdns-man sys-apps/ucspi-tcp virtual/daemontools selinux? ( sec-policy/selinux-djbdns )
-SLOT=0
-SRC_URI=http://cr.yp.to/djbdns/djbdns-1.05.tar.gz http://smarden.org/pape/djb/manpages/djbdns-1.05-man.tar.gz ipv6? ( http://www.fefe.de/dns/djbdns-1.05-test25.diff.bz2 )
-_eclass_exported_funcs=pkg_preinst:- pkg_postinst:readme.gentoo src_prepare:- src_compile:- src_install:-
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=d4502ca0b84c143fb9d1f0fe2b10659b
diff --git a/metadata/md5-cache/net-dns/djbdns-1.05-r31 b/metadata/md5-cache/net-dns/djbdns-1.05-r31
deleted file mode 100644
index 44050db2ebaa..000000000000
--- a/metadata/md5-cache/net-dns/djbdns-1.05-r31
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare unpack
-DESCRIPTION=Collection of DNS client/server software
-EAPI=6
-HOMEPAGE=http://cr.yp.to/djbdns.html
-IUSE=ipv6 selinux
-KEYWORDS=alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=public-domain
-RDEPEND=sys-apps/ucspi-tcp virtual/daemontools selinux? ( sec-policy/selinux-djbdns )
-SLOT=0
-SRC_URI=http://cr.yp.to/djbdns/djbdns-1.05.tar.gz http://smarden.org/pape/djb/manpages/djbdns-1.05-man.tar.gz ipv6? ( http://www.fefe.de/dns/djbdns-1.05-test27.diff.bz2 )
-_eclass_exported_funcs=pkg_preinst:- src_unpack:- src_prepare:- src_compile:- src_install:-
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=19c7b94b808300427645397b9933f18a
diff --git a/metadata/md5-cache/net-dns/nsd-4.1.14 b/metadata/md5-cache/net-dns/nsd-4.1.14
index ca0c9f4e24c3..27edbd533cc3 100644
--- a/metadata/md5-cache/net-dns/nsd-4.1.14
+++ b/metadata/md5-cache/net-dns/nsd-4.1.14
@@ -4,11 +4,11 @@ DESCRIPTION=An authoritative only, high performance, open source name server
 EAPI=6
 HOMEPAGE=http://www.nlnetlabs.nl/projects/nsd
 IUSE=bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl libressl
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=virtual/yacc libevent? ( dev-libs/libevent ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) munin? ( net-analyzer/munin )
 SLOT=0
 SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-4.1.14.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=32a75d8023fe4b3801e3291c39d3227c
+_md5_=b211ef421e1dd5c7d7c41357fbaa058a
diff --git a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.42-r1 b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.42-r1
index 830c6657ff4e..0135a0e320f6 100644
--- a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.42-r1
+++ b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.42-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Fast, production-quality, standard-conformant FTP server
 EAPI=5
 HOMEPAGE=http://www.pureftpd.org/
 IUSE=anondel anonperm anonren anonres caps charconv implicittls ldap libressl mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=caps? ( sys-libs/libcap ) charconv? ( virtual/libiconv ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] ) libressl? ( dev-libs/libressl:= ) ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) dev-libs/libsodium:= net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
 REQUIRED_USE=implicittls? ( ssl )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.42.tar.bz2 http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.42.tar.bz2
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=confutils	18995f74ac4ffafb7ad853dfe133f209	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=db1630b92b82070c716af33d97d64625
+_md5_=84529124020f1f123c24f8263675da82
diff --git a/metadata/md5-cache/net-im/bitlbee-3.4.2-r1 b/metadata/md5-cache/net-im/bitlbee-3.4.2-r1
index 5a092ad4870e..d7d3296bfa04 100644
--- a/metadata/md5-cache/net-im/bitlbee-3.4.2-r1
+++ b/metadata/md5-cache/net-im/bitlbee-3.4.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=irc to IM gateway that support multiple IM protocols
 EAPI=6
 HOMEPAGE=http://www.bitlbee.org/
 IUSE=debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd msn oscar purple twitter +xmpp yahoo
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) ) ) virtual/logger xinetd? ( sys-apps/xinetd )
 REQUIRED_USE=|| ( purple xmpp msn oscar yahoo ) xmpp? ( !nss )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://get.bitlbee.org/src/bitlbee-3.4.2.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=cfd4a100e20d54ec314633ceb200e25a
+_md5_=eb20d6470181e3a73659eb3b4276eb37
diff --git a/metadata/md5-cache/net-irc/znc-9999 b/metadata/md5-cache/net-irc/znc-9999
index 1de5bbc00f7b..8580ce17aa44 100644
--- a/metadata/md5-cache/net-irc/znc-9999
+++ b/metadata/md5-cache/net-irc/znc-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( 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_4(+)?,python_single_target_python3_5(+)?] ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib ) nls? ( sys-devel/gettext ) virtual/pkgconfig perl? ( >=dev-lang/swig-3.0.0 ) python? ( >=dev-lang/swig-3.0.0 ) test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( 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_4(+)?,python_single_target_python3_5(+)?] ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib ) nls? ( sys-devel/gettext ) virtual/pkgconfig perl? ( >=dev-lang/swig-3.0.0 ) python? ( >=dev-lang/swig-3.0.0 ) sys-devel/make >=dev-util/cmake-3.5.2 virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=An advanced IRC Bouncer
 EAPI=6
 HOMEPAGE=http://znc.in
@@ -10,4 +10,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_
 SLOT=0
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_unpack:git-r3 src_prepare:- src_configure:- src_compile:cmake-utils src_test:- src_install:-
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=25f07c76cac8c2bb0c1febe2a448e875
+_md5_=e59c1ddff09478857a8b1c6069708d35
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.51 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.51
index 6a497ae28729..2163b2619118 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.51
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.51
@@ -4,10 +4,10 @@ DESCRIPTION=Small C library to run an HTTP server as part of another application
 EAPI=6
 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.51.tar.gz
 _eclass_exported_funcs=src_configure:- src_test:- src_install:-
-_md5_=4e169256807297fcd7a26fb5fd75875b
+_md5_=b0c2bde3261619f540fd00ccd61b0c9e
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.0.6 b/metadata/md5-cache/net-libs/libnftnl-1.0.6
index 9489e7d67879..a086d89e11cd 100644
--- a/metadata/md5-cache/net-libs/libnftnl-1.0.6
+++ b/metadata/md5-cache/net-libs/libnftnl-1.0.6
@@ -4,7 +4,7 @@ DESCRIPTION=Netlink API to the in-kernel nf_tables subsystem
 EAPI=6
 HOMEPAGE=http://netfilter.org/projects/nftables/
 IUSE=examples json static-libs test threads xml
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.0 xml? ( >=dev-libs/mini-xml-2.6[threads=] ) json? ( >=dev-libs/jansson-2.3 )
 REQUIRED_USE=test? ( json xml )
@@ -12,4 +12,4 @@ SLOT=0/4
 SRC_URI=http://netfilter.org/projects/libnftnl/files/libnftnl-1.0.6.tar.bz2
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_configure:- src_test:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=11153dbbf2a47dc84cd43e52d62868b2
+_md5_=24472635cfc1386165db3590464c4792
diff --git a/metadata/md5-cache/net-libs/libtrace-4.0.0_beta b/metadata/md5-cache/net-libs/libtrace-4.0.0
index 7b12ba9c5ff6..54a154ae2efd 100644
--- a/metadata/md5-cache/net-libs/libtrace-4.0.0_beta
+++ b/metadata/md5-cache/net-libs/libtrace-4.0.0
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libpcap-0.8 dev-libs/openssl:0= ncurses? ( sys-libs/ncurses:0= ) net-libs/wandio numa? ( sys-process/numactl )
 SLOT=0
-SRC_URI=http://research.wand.net.nz/software/libtrace/libtrace-4.0.0-beta.tar.gz
+SRC_URI=http://research.wand.net.nz/software/libtrace/libtrace-4.0.0.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=35ffe857e94cf96715a38a8cd4a49c65
+_md5_=77e94fefafe615d0ca19d7e28b12e5f9
diff --git a/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.8 b/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.8
index 74af8203782e..43a9c7e87030 100644
--- a/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.8
+++ b/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.8
@@ -4,7 +4,7 @@ DESCRIPTION=A parsing library for RIPE Atlas result strings
 EAPI=6
 HOMEPAGE=https://atlas.ripe.net/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/r/ripe.atlas.sagan/ripe.atlas.sagan-1.1.8.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c8db59df828e8f075f8872a633221d10
+_md5_=65169138b6b52c8fce51250b89fc01aa
diff --git a/metadata/md5-cache/net-misc/clipgrab-3.5.6 b/metadata/md5-cache/net-misc/clipgrab-3.5.6
index 122e85b2826e..0b913bcdd50d 100644
--- a/metadata/md5-cache/net-misc/clipgrab-3.5.6
+++ b/metadata/md5-cache/net-misc/clipgrab-3.5.6
@@ -3,11 +3,11 @@ DEPEND=dev-qt/qtwebkit:4
 DESCRIPTION=Download from various internet video services like Youtube etc.
 EAPI=5
 HOMEPAGE=http://clipgrab.de/en
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtwebkit:4 || ( media-video/libav media-video/ffmpeg )
 SLOT=0
 SRC_URI=http://download.clipgrab.de/clipgrab-3.5.6.tar.gz
 _eclass_exported_funcs=src_unpack:qt4-r2 src_prepare:qt4-r2 src_configure:qt4-r2 src_compile:qt4-r2 src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=278ae25a485440b508e48e278581fac9
+_md5_=1117ec3fe7bbbbbc140c2b69359b602a
diff --git a/metadata/md5-cache/net-misc/lldpd-0.9.3-r1 b/metadata/md5-cache/net-misc/lldpd-0.9.3-r1
index 719683191a6f..a54489c8eb70 100644
--- a/metadata/md5-cache/net-misc/lldpd-0.9.3-r1
+++ b/metadata/md5-cache/net-misc/lldpd-0.9.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=6
 HOMEPAGE=https://vincentbernat.github.com/lldpd/
 IUSE=cdp doc +dot1 +dot3 edp fdp graph jansson +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs readline xml zsh-completion
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ISC
 RDEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5 snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) jansson? ( dev-libs/jansson ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh )
 REQUIRED_USE=graph? ( doc )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-0.9.3.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=21a462b8e23a681d4964149c3e42581f
+_md5_=e95647a2b640e81f8a37a8a828489e04
diff --git a/metadata/md5-cache/net-misc/tokyotyrant-1.1.41-r1 b/metadata/md5-cache/net-misc/tokyotyrant-1.1.41-r1
index e0d8afb92717..7dc101159c2d 100644
--- a/metadata/md5-cache/net-misc/tokyotyrant-1.1.41-r1
+++ b/metadata/md5-cache/net-misc/tokyotyrant-1.1.41-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A network interface to Tokyo Cabinet
 EAPI=2
 HOMEPAGE=http://fallabs.com/tokyotyrant/
 IUSE=debug examples lua
-KEYWORDS=~amd64 ~x86 ~ppc-macos ~x86-macos
+KEYWORDS=amd64 x86 ~ppc-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-db/tokyocabinet sys-libs/zlib app-arch/bzip2 lua? ( dev-lang/lua )
 SLOT=0
 SRC_URI=http://fallabs.com/tokyotyrant/tokyotyrant-1.1.41.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_configure:- src_test:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=aeebee0ac68f04aa11199107fee0d987
+_md5_=d9cf8f5008805608ab210b3960a975ae
diff --git a/metadata/md5-cache/net-misc/tor-0.2.8.12 b/metadata/md5-cache/net-misc/tor-0.2.8.12
index ddaf97e258cb..db9466d086fe 100644
--- a/metadata/md5-cache/net-misc/tor-0.2.8.12
+++ b/metadata/md5-cache/net-misc/tor-0.2.8.12
@@ -4,11 +4,11 @@ DESCRIPTION=Anonymizing overlay network for TCP
 EAPI=5
 HOMEPAGE=http://www.torproject.org/
 IUSE=-bufferevents libressl scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test web
-KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
+KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-macos
 LICENSE=BSD GPL-2
 RDEPEND=app-text/asciidoc dev-libs/libevent sys-libs/zlib bufferevents? ( dev-libs/libevent[ssl] ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-tor )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.2.8.12.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.2.8.12.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=acf76558ff6a37f2331e9c45f3172ea5
+_md5_=05bf33879a6b0bf4d43776ef1810af81
diff --git a/metadata/md5-cache/net-misc/whois-5.2.12 b/metadata/md5-cache/net-misc/whois-5.2.12
index 7bbf25f3b24a..7b96ec170ec6 100644
--- a/metadata/md5-cache/net-misc/whois-5.2.12
+++ b/metadata/md5-cache/net-misc/whois-5.2.12
@@ -4,7 +4,7 @@ DESCRIPTION=improved Whois Client
 EAPI=5
 HOMEPAGE=http://www.linux.it/~md/software/
 IUSE=iconv idn nls
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn ) nls? ( virtual/libintl )
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://debian/pool/main/w/whois/whois_5.2.12.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=41dcf6f7b902dbe2d1f120a362e49d9b
+_md5_=191533406435a1b190b35cef1a0d6d5d
diff --git a/metadata/md5-cache/sci-astronomy/predict-2.2.3-r2 b/metadata/md5-cache/sci-astronomy/predict-2.2.3-r2
index 6be253e1ecd4..084e222b82e7 100644
--- a/metadata/md5-cache/sci-astronomy/predict-2.2.3-r2
+++ b/metadata/md5-cache/sci-astronomy/predict-2.2.3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Satellite tracking and orbital prediction
 EAPI=6
 HOMEPAGE=http://www.qsl.net/kd2bd/predict.html
 IUSE=doc gtk nls xforms xplanet
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= gtk? ( x11-libs/gtk+:2 ) xforms? ( x11-libs/xforms ) xplanet? ( x11-misc/xplanet[truetype] )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/predict/predict_2.2.3.orig.tar.gz mirror://debian/pool/main/p/predict/predict_2.2.3-3.1.diff.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=c1a7f7583e4ce197aa51ad19087f3540
+_md5_=af519dd9d2fde3b9198f762f1e6b4e34
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-0.14.3 b/metadata/md5-cache/sci-astronomy/stellarium-0.14.3
index e0666bf3a71a..a8dfe57a60d1 100644
--- a/metadata/md5-cache/sci-astronomy/stellarium-0.14.3
+++ b/metadata/md5-cache/sci-astronomy/stellarium-0.14.3
@@ -4,7 +4,7 @@ DESCRIPTION=3D photo-realistic skies in real time
 EAPI=5
 HOMEPAGE=http://www.stellarium.org/
 IUSE=debug nls sound stars linguas_af linguas_ak linguas_am linguas_ar linguas_as linguas_ast linguas_az linguas_be linguas_bg linguas_bn linguas_bo linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en linguas_en_CA linguas_en_GB linguas_en_US linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fil linguas_fr linguas_ga linguas_gd linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_kn linguas_ko linguas_ky linguas_la linguas_lb linguas_lo linguas_lt linguas_lv linguas_mk linguas_ml linguas_mn linguas_mr linguas_ms linguas_mt linguas_nan linguas_nb linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sq linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_tg linguas_th linguas_tl linguas_tr linguas_tt linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu
-KEYWORDS=amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=media-fonts/dejavu dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 virtual/opengl sys-libs/zlib sound? ( dev-qt/qtmultimedia:5[widgets] )
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/stellarium/stellarium-0.14.3.tar.gz stars? ( mirror://sourceforge/stellarium/stars_4_1v0_1.cat mirror://sourceforge/stellarium/stars_5_2v0_1.cat mirror://sourceforge/stellarium/stars_6_2v0_1.cat mirror://sourceforge/stellarium/stars_7_2v0_1.cat mirror://sourceforge/stellarium/stars_8_2v0_1.cat )
 _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	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=082372095baa4bc95be451553827f61f
+_md5_=e2a253a294f55ed135b8d4af429dae8a
diff --git a/metadata/md5-cache/sci-astronomy/xephem-3.7.7 b/metadata/md5-cache/sci-astronomy/xephem-3.7.7
index b756810538d0..202a92ebb987 100644
--- a/metadata/md5-cache/sci-astronomy/xephem-3.7.7
+++ b/metadata/md5-cache/sci-astronomy/xephem-3.7.7
@@ -3,11 +3,11 @@ DEPEND=>=x11-libs/motif-2.3:0 virtual/jpeg:0= media-libs/libpng:0= sys-apps/grof
 DESCRIPTION=Interactive tool for astronomical ephemeris and sky simulation
 EAPI=6
 HOMEPAGE=http://www.clearskyinstitute.com/xephem
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=XEphem
 RDEPEND=>=x11-libs/motif-2.3:0 virtual/jpeg:0= media-libs/libpng:0=
 SLOT=0
 SRC_URI=http://97.74.56.125/free/xephem-3.7.7.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1c0df87cd11bfc0e1cd4c19d07cfaa92
+_md5_=51ca5ae4418aba43d344018fdd33c811
diff --git a/metadata/md5-cache/sci-biology/rebase-1612 b/metadata/md5-cache/sci-biology/rebase-1612
index 563dc96c0940..d1796aa77b70 100644
--- a/metadata/md5-cache/sci-biology/rebase-1612
+++ b/metadata/md5-cache/sci-biology/rebase-1612
@@ -4,11 +4,11 @@ DESCRIPTION=A restriction enzyme database
 EAPI=6
 HOMEPAGE=http://rebase.neb.com
 IUSE=emboss minimal
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=emboss? ( >=sci-biology/emboss-5.0.0 )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/rebase-1612.tar.xz
 _eclass_exported_funcs=src_compile:- src_install:-
-_md5_=3ef363b2e2336edb20236893d366da28
+_md5_=649fac01093b7accad8bce9a62cd9926
diff --git a/metadata/md5-cache/sci-geosciences/josm-10327 b/metadata/md5-cache/sci-geosciences/josm-10327
index e59e3f7f24b0..484864efb882 100644
--- a/metadata/md5-cache/sci-geosciences/josm-10327
+++ b/metadata/md5-cache/sci-geosciences/josm-10327
@@ -4,11 +4,11 @@ DESCRIPTION=Java-based editor for the OpenStreetMap project
 EAPI=5
 HOMEPAGE=http://josm.openstreetmap.de/
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/josm-10327.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-2 pkg_setup:java-pkg-2 src_prepare:- src_configure:java-ant-2 src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=18ba95c6aa292218062cbb9175a2776a
+_md5_=24fa7ae5fc4bea5c4b5aa471c0b621ad
diff --git a/metadata/md5-cache/sys-apps/hwloc-1.11.2 b/metadata/md5-cache/sys-apps/hwloc-1.11.2
index ce32c1a91083..809be0aeca29 100644
--- a/metadata/md5-cache/sys-apps/hwloc-1.11.2
+++ b/metadata/md5-cache/sys-apps/hwloc-1.11.2
@@ -4,11 +4,11 @@ DESCRIPTION=displays the hardware topology in convenient formats
 EAPI=5
 HOMEPAGE=http://www.open-mpi.org/projects/hwloc/
 IUSE=cairo cuda debug gl +numa opencl +pci plugins svg static-libs xml 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=alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.9-r3: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(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,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(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) ) opencl? ( x11-drivers/ati-drivers:* ) pci? ( >=sys-apps/pciutils-3.3.0-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(-)?] >=x11-libs/libpciaccess-0.13.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(-)?] ) plugins? ( dev-libs/libltdl: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(-)?] ) numa? ( >=sys-process/numactl-2.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-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(-)?] )
 SLOT=0/5
 SRC_URI=http://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.2.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:autotools-multilib src_compile:autotools-multilib src_test:autotools-multilib src_install:autotools-multilib
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	cuda	f150e667cc5826799d86be0fff518252	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=37c1362a576fc1465e24c0ec42ebe923
+_md5_=35a76d569e9c7ac03b18941f28ce0dd0
diff --git a/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r2 b/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r2
index 2a6665f820b9..955fad86a422 100644
--- a/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r2
+++ b/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Brings up/down ethernet ports automatically with cable detection
 EAPI=6
 HOMEPAGE=http://www.red-bean.com/~bos/
 IUSE=debug doc
-KEYWORDS=amd64 ~arm ~mips ~ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~mips ~ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.red-bean.com/~bos/netplug/netplug-1.2.9.2.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=a25796c38c47256f6ed8a75981f3f09b
+_md5_=f6e3616650ba214a42a769def1fa125d
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.20 b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.20
index e88a818413d9..da5f44dc9e7e 100644
--- a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.20
+++ b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.20
@@ -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_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/4203/pcsc-lite-1.8.20.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	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	73058269b3e70e34e084fa3981282338	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=e1d7994da88e1cac1ac3e60285161db6
+_md5_=7e52efbc79d68be6e9ddcc392c35469a
diff --git a/metadata/md5-cache/sys-apps/pyrenamer-0.6.0-r2 b/metadata/md5-cache/sys-apps/pyrenamer-0.6.0-r2
index 1f0f6eeab796..1997c62c5889 100644
--- a/metadata/md5-cache/sys-apps/pyrenamer-0.6.0-r2
+++ b/metadata/md5-cache/sys-apps/pyrenamer-0.6.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Mass rename files
 EAPI=5
 HOMEPAGE=http://www.infinicode.org/code/pyrenamer/
 IUSE=music python_targets_python2_7 debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=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_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/gconf-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] music? ( app-misc/hachoir-metadata[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] )
 SLOT=0
 SRC_URI=http://www.infinicode.org/code/pyrenamer/files/pyrenamer-0.6.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 pkg_setup:- src_unpack:gnome2 src_prepare:- src_configure:gnome2 src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=bc7fd2b564ea79e5080941f04b17e8ae
+_md5_=595ca6cc2f36242555b640c1ef0497e5
diff --git a/metadata/md5-cache/sys-apps/sed-4.2.1-r1 b/metadata/md5-cache/sys-apps/sed-4.2.1-r1
deleted file mode 100644
index fae037065fa1..000000000000
--- a/metadata/md5-cache/sys-apps/sed-4.2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
-DESCRIPTION=Super-useful stream editor
-EAPI=0
-HOMEPAGE=http://sed.sourceforge.net/
-IUSE=acl nls selinux static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnu/sed/sed-4.2.1.tar.bz2
-_eclass_exported_funcs=src_unpack:- src_compile:- src_install:-
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=8ccdec82ae26d0b8bdcbbffd34554c17
diff --git a/metadata/md5-cache/sys-apps/sed-4.3 b/metadata/md5-cache/sys-apps/sed-4.3
new file mode 100644
index 000000000000..0cbe4e8770ca
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/sed-4.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare
+DEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) nls? ( sys-devel/gettext )
+DESCRIPTION=Super-useful stream editor
+EAPI=5
+HOMEPAGE=http://sed.sourceforge.net/
+IUSE=acl nls selinux static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux )
+SLOT=0
+SRC_URI=mirror://gnu/sed/sed-4.3.tar.xz
+_eclass_exported_funcs=src_prepare:- src_configure:-
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=533fc3bf547716c69ea58f7cf32f6c40
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20160620 b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20160620
index 443f80550bdd..1e87d4f5b490 100644
--- a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20160620
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20160620
@@ -4,10 +4,10 @@ DESCRIPTION=Open source network boot (PXE) firmware
 EAPI=5
 HOMEPAGE=http://ipxe.org/
 IUSE=efi ipv6 iso lkrn +qemu undi usb vmware savedconfig
-KEYWORDS=-* amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://git.ipxe.org/ipxe.git/snapshot/694c18addc0dfdf51369f6d598dd0c8ca4bf2861.tar.bz2 -> ipxe-1.0.0_p20160620-694c18a.tar.bz2
 _eclass_exported_funcs=pkg_postinst:savedconfig src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	portability	bb1a0ed8ea152b957d17339f01d4d7f5	savedconfig	7de7daa586f6bf361639e77d6f2299db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=7417d73f5f569a361ec02614d175ad3c
+_md5_=f062dc79cce1e58b040b98498992f45f
diff --git a/metadata/md5-cache/sys-fs/ddrescue-1.21 b/metadata/md5-cache/sys-fs/ddrescue-1.21
index fcdc9f1caa45..d4f2963dde78 100644
--- a/metadata/md5-cache/sys-fs/ddrescue-1.21
+++ b/metadata/md5-cache/sys-fs/ddrescue-1.21
@@ -4,10 +4,10 @@ DESCRIPTION=Copy data from one file or block device to another with read-error r
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/ddrescue/ddrescue.html
 IUSE=static
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86 ~amd64-linux
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/ddrescue/ddrescue-1.21.tar.lz
 _eclass_exported_funcs=src_unpack:unpacker src_configure:- src_test:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=f7a59b119fa27b06fd07474a80079428
+_md5_=c87b92f7c16e7df2670e62d3db3ab64a
diff --git a/metadata/md5-cache/sys-fs/f2fs-tools-1.6.1 b/metadata/md5-cache/sys-fs/f2fs-tools-1.6.1
index 6893a4b0afcf..cc0ae012de15 100644
--- a/metadata/md5-cache/sys-fs/f2fs-tools-1.6.1
+++ b/metadata/md5-cache/sys-fs/f2fs-tools-1.6.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=Tools for Flash-Friendly File System (F2FS)
 EAPI=5
 HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/jaegeuk/f2fs-tools.git;a=summary
-KEYWORDS=amd64 arm ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2
 SLOT=0/0
 SRC_URI=https://dev.gentoo.org/~blueness/f2fs-tools/f2fs-tools-1.6.1.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f7e8f7dd251a9a920874426237063889
+_md5_=9a502adb306419d30eca6874bcfa6682
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.7 b/metadata/md5-cache/sys-fs/fuse-2.9.7
index dfeb733b750b..883078e971cd 100644
--- a/metadata/md5-cache/sys-fs/fuse-2.9.7
+++ b/metadata/md5-cache/sys-fs/fuse-2.9.7
@@ -4,11 +4,11 @@ DESCRIPTION=An interface for filesystems implemented in userspace
 EAPI=6
 HOMEPAGE=https://github.com/libfuse/libfuse
 IUSE=examples kernel_linux kernel_FreeBSD static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd )
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-2.9.7/fuse-2.9.7.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e1c17ff67db21e0ebe747cc717a35bef
+_md5_=b562ba8cf9e8c83f57d38f41a3663edd
diff --git a/metadata/md5-cache/sys-fs/mtd-utils-1.5.2 b/metadata/md5-cache/sys-fs/mtd-utils-1.5.2
index 27e0efd4f332..a492e6889570 100644
--- a/metadata/md5-cache/sys-fs/mtd-utils-1.5.2
+++ b/metadata/md5-cache/sys-fs/mtd-utils-1.5.2
@@ -4,11 +4,11 @@ DESCRIPTION=MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)
 EAPI=5
 HOMEPAGE=http://git.infradead.org/?p=mtd-utils.git;a=summary
 IUSE=xattr
-KEYWORDS=amd64 arm ~mips ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=amd64 arm ~mips ~ppc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!sys-fs/mtd dev-libs/lzo sys-libs/zlib >=sys-apps/util-linux-2.16
 SLOT=0
 SRC_URI=http://git.infradead.org/mtd-utils.git/snapshot/v1.5.2.tar.gz -> mtd-utils-1.5.2.tar.gz
 _eclass_exported_funcs=src_unpack:vcs-snapshot src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd
-_md5_=76b43a4ccf431886b71cb7ad00406d31
+_md5_=1a64e92ffaa62ab2bc6d42989691c713
diff --git a/metadata/md5-cache/sys-fs/reiser4progs-1.1.0 b/metadata/md5-cache/sys-fs/reiser4progs-1.1.0
index 50cd29987b93..0b8663116c6a 100644
--- a/metadata/md5-cache/sys-fs/reiser4progs-1.1.0
+++ b/metadata/md5-cache/sys-fs/reiser4progs-1.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=reiser4progs: mkfs, fsck, etc...
 EAPI=4
 HOMEPAGE=https://sourceforge.net/projects/reiser4/
 IUSE=debug readline static static-libs
-KEYWORDS=amd64 arm ~ppc ~ppc64 -sparc ~x86
+KEYWORDS=amd64 arm ~ppc ~ppc64 -sparc x86
 LICENSE=GPL-2
 RDEPEND=!static? ( ~sys-libs/libaal-1.0.6 readline? ( sys-libs/readline ) ) static-libs? ( ~sys-libs/libaal-1.0.6[static-libs(+)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/reiser4/reiser4progs-1.1.0.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d2bd0941f93709deff441e7eb7919b49
+_md5_=aa649f9a11fb9a457a32492f29426bb0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.104 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.104
index d3d6e2a5e0a4..9df2fb64dbc1 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.104
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.104
@@ -4,7 +4,7 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 3.10 kernel tree
 EAPI=5
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-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 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=3.10.104
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-109.base.tar.xz mirror://gentoo/genpatches-3.10-109.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-109.experimental.tar.xz )
 _eclass_exported_funcs=pkg_preinst:kernel-2 pkg_postrm:- pkg_postinst:- pkg_setup:kernel-2 src_unpack:kernel-2 src_prepare:kernel-2 src_compile:kernel-2 src_test:kernel-2 src_install:kernel-2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	d6e1dc6b6c76281d9b644966393069ef	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2678669e31f27b421d7d2de0a09c0abc
+_md5_=c5e016f3347b25b1b65c2b5b1a3cb697
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.66 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.66
index ce1ce0200636..7c068e2bc666 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.66
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.66
@@ -4,7 +4,7 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 3.12 kernel tree
 EAPI=5
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-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 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=3.12.66
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-63.base.tar.xz mirror://gentoo/genpatches-3.12-63.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-63.experimental.tar.xz )
 _eclass_exported_funcs=pkg_preinst:kernel-2 pkg_postrm:- pkg_postinst:- pkg_setup:kernel-2 src_unpack:kernel-2 src_prepare:kernel-2 src_compile:kernel-2 src_test:kernel-2 src_install:kernel-2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	d6e1dc6b6c76281d9b644966393069ef	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=65874a7c2014931b5f40019e304336af
+_md5_=e3bedbb4ad862777540cab3710bbcf79
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.44 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.44
index 9d367ce988b6..91748216e98e 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.44
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.44
@@ -4,7 +4,7 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 3.18 kernel tree
 EAPI=5
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-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 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=3.18.44
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz mirror://gentoo/genpatches-3.18-43.base.tar.xz mirror://gentoo/genpatches-3.18-43.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-43.experimental.tar.xz )
 _eclass_exported_funcs=pkg_preinst:kernel-2 pkg_postrm:- pkg_postinst:- pkg_setup:kernel-2 src_unpack:kernel-2 src_prepare:kernel-2 src_compile:kernel-2 src_test:kernel-2 src_install:kernel-2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	d6e1dc6b6c76281d9b644966393069ef	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=29eb5e070a4be5024543e25af3c358fa
+_md5_=7069c471ff3212f05853fb8278dcfb79
diff --git a/metadata/md5-cache/sys-libs/libsmbios-2.3.0-r1 b/metadata/md5-cache/sys-libs/libsmbios-2.3.0-r1
index 4e1c10485bc4..830366fbbe7e 100644
--- a/metadata/md5-cache/sys-libs/libsmbios-2.3.0-r1
+++ b/metadata/md5-cache/sys-libs/libsmbios-2.3.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Provide access to (SM)BIOS information
 EAPI=6
 HOMEPAGE=http://linux.dell.com/libsmbios/main/index.html
 IUSE=doc graphviz nls python static-libs test python_targets_python2_7
-KEYWORDS=~amd64 ~ia64 ~x86
+KEYWORDS=amd64 ~ia64 x86
 LICENSE=GPL-2 OSL-2.0
 RDEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] )
 SLOT=0
 SRC_URI=http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-2.3.0/libsmbios-2.3.0.tar.xz http://linux.dell.com/libsmbios/download/libsmbios/old/libsmbios-2.3.0/libsmbios-2.3.0.tar.xz
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=e53991988ea9acc6801f01aeb7bd1b4b
+_md5_=98ff452cb18132ad0ea2a6861bd5224a
diff --git a/metadata/md5-cache/sys-libs/slang-2.3.0 b/metadata/md5-cache/sys-libs/slang-2.3.0
index ed7fa593e4bc..c76de7c2afa7 100644
--- a/metadata/md5-cache/sys-libs/slang-2.3.0
+++ b/metadata/md5-cache/sys-libs/slang-2.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=A multi-platform programmer's library designed to allow a developer
 EAPI=5
 HOMEPAGE=http://www.jedsoft.org/slang/
 IUSE=cjk pcre png readline static-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
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= pcre? ( >=dev-libs/libpcre-8.33-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(-)?] ) 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(-)?] ) cjk? ( >=dev-libs/oniguruma-5.9.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(-)?] ) readline? ( >=sys-libs/readline-6.2_p5-r1: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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20140406-r1 )
 SLOT=0
 SRC_URI=http://www.jedsoft.org/releases/slang/slang-2.3.0.tar.bz2 http://www.jedsoft.org/releases/slang/old/slang-2.3.0.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=09e5b3113468f2126b3107574f635f10
+_md5_=ca390347392a0d3ce6cb1d4178078a85
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.28 b/metadata/md5-cache/sys-power/acpid-2.0.28
index 81ac31394494..022874abb0e8 100644
--- a/metadata/md5-cache/sys-power/acpid-2.0.28
+++ b/metadata/md5-cache/sys-power/acpid-2.0.28
@@ -4,11 +4,11 @@ DESCRIPTION=Daemon for Advanced Configuration and Power Interface
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/acpid2
 IUSE=selinux
-KEYWORDS=~amd64 ~ia64 ~x86
+KEYWORDS=amd64 ~ia64 x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-apm )
 SLOT=0
 SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.28.tar.xz
 _eclass_exported_funcs=pkg_pretend:- pkg_postinst:- pkg_setup:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b754f3851f21583792f018484eac9e28
+_md5_=c6b44004cb7ea97299b7fc5ba71e3c37
diff --git a/metadata/md5-cache/sys-power/iasl-20160729 b/metadata/md5-cache/sys-power/iasl-20160729
index 3214bd0b329c..2f19849d601f 100644
--- a/metadata/md5-cache/sys-power/iasl-20160729
+++ b/metadata/md5-cache/sys-power/iasl-20160729
@@ -4,10 +4,10 @@ DESCRIPTION=Intel ACPI Source Language (ASL) compiler
 EAPI=6
 HOMEPAGE=https://www.acpica.org/downloads/
 IUSE=test
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ~ppc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=iASL
 SLOT=0
 SRC_URI=http://www.acpica.org/sites/acpica/files/acpica-unix-20160729.tar.gz test? ( http://www.acpica.org/sites/acpica/files/acpitests-unix-20160729.tar.gz )
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=8213be8bd7485a585df00c4f17999705
+_md5_=dddb465bcdca05e02e6a288b36b93006
diff --git a/metadata/md5-cache/sys-process/at-3.1.18-r1 b/metadata/md5-cache/sys-process/at-3.1.18-r1
index c593d67f3889..4b7688ea5476 100644
--- a/metadata/md5-cache/sys-process/at-3.1.18-r1
+++ b/metadata/md5-cache/sys-process/at-3.1.18-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Queues jobs for later execution
 EAPI=6
 HOMEPAGE=http://packages.qa.debian.org/a/at.html
 IUSE=pam selinux
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/mta virtual/logger selinux? ( sec-policy/selinux-at )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/at/at_3.1.18.orig.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=08f8d5d7a93d588eef9e00d043f5547c
+_md5_=04eba43afed12050b5ecd244e1a4e871
diff --git a/metadata/md5-cache/sys-process/cronie-1.5.0-r1 b/metadata/md5-cache/sys-process/cronie-1.5.0-r1
index fb65776c92a7..6beaf22d3a0f 100644
--- a/metadata/md5-cache/sys-process/cronie-1.5.0-r1
+++ b/metadata/md5-cache/sys-process/cronie-1.5.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Cronie is a standard UNIX daemon cron based on the original vixie-cr
 EAPI=5
 HOMEPAGE=https://fedorahosted.org/cronie/wiki
 IUSE=anacron +inotify pam selinux
-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=ISC BSD BSD-2 GPL-2
 RDEPEND=pam? ( virtual/pam ) anacron? ( !sys-process/anacron ) >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/dcron !sys-process/fcron
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/c/r/cronie/cronie-1.5.0.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=cron	3d3a6a85df42b2dbf24b5f9b97b0f55c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=2debdddc55616c88a47a5438bf2671b3
+_md5_=b4ba1232cbc1abb3b55f679ed6f45e79
diff --git a/metadata/md5-cache/www-apache/passenger-5.0.30 b/metadata/md5-cache/www-apache/passenger-5.0.30
index e9888cc666fc..cb954f13b2af 100644
--- a/metadata/md5-cache/www-apache/passenger-5.0.30
+++ b/metadata/md5-cache/www-apache/passenger-5.0.30
@@ -4,7 +4,7 @@ DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
 EAPI=5
 HOMEPAGE=https://www.phusionpassenger.com/
 IUSE=debug test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] >=dev-ruby/rake-0.8.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rake-0.8.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://s3.amazonaws.com/phusion-passenger/releases/passenger-5.0.30.tar.gz
 _eclass_exported_funcs=pkg_postinst:apache-module pkg_setup:- src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	depend.apache	7aeacf4ba074b9aa0047e2ba05c1010f	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bce08c084fbf2f0994ee1cca8ce3ab3c
+_md5_=e6978ec04b7a9e7d73cee7a1d4b200ea
diff --git a/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.7 b/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.7
index 67c407130e1b..3dc8abe83ebe 100644
--- a/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.7
+++ b/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.7
@@ -4,7 +4,7 @@ DESCRIPTION=A Python wrapper around the RIPE Atlas API
 EAPI=5
 HOMEPAGE=https://atlas.ripe.net/
 IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-python/socketio-client-0.6.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/python-dateutil[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/r/ripe.atlas.cousteau/ripe.atlas.cousteau-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	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=30e3f74aed8d2a0042fa69a1b865aeed
+_md5_=8581dc60c6fd38f2ffd058afa8a08f0a
diff --git a/metadata/md5-cache/www-misc/awstats-7.4 b/metadata/md5-cache/www-misc/awstats-7.4
index 206b4037ffca..cc98063e0fd7 100644
--- a/metadata/md5-cache/www-misc/awstats-7.4
+++ b/metadata/md5-cache/www-misc/awstats-7.4
@@ -3,11 +3,11 @@ DESCRIPTION=AWStats is short for Advanced Web Statistics
 EAPI=4
 HOMEPAGE=http://www.awstats.org/
 IUSE=geoip ipv6
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~sparc x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=>=dev-lang/perl-5.6.1 virtual/perl-Time-Local dev-perl/URI geoip? ( dev-perl/Geo-IP ) ipv6? ( dev-perl/Net-IP dev-perl/Net-DNS )
 SLOT=0
 SRC_URI=http://www.awstats.org/files/awstats-7.4.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=800e8c2c5fffe08380dc90c38467458b
+_md5_=c1b0fdc185a630ab2bfb1db12dec66e4
diff --git a/metadata/md5-cache/x11-libs/libva-1.7.3 b/metadata/md5-cache/x11-libs/libva-1.7.3
index 4694acaa6589..c42a2d2e8c77 100644
--- a/metadata/md5-cache/x11-libs/libva-1.7.3
+++ b/metadata/md5-cache/x11-libs/libva-1.7.3
@@ -4,7 +4,7 @@ DESCRIPTION=Video Acceleration (VA) API for Linux
 EAPI=5
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/vaapi
 IUSE=+drm egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_i965 video_cards_fglrx video_cards_nouveau 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 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-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(-)?] ) video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[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(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-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(-)?] ) video_cards_fglrx? ( || ( >=x11-drivers/ati-drivers-14.12-r3[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/xvba-video-0.8.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(-)?] ) ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-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(-)?] ) video_cards_i965? ( >=x11-libs/libva-intel-driver-1.2.2-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(-)?] )
 RDEPEND=>=x11-libs/libdrm-2.4.46[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/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/libXfixes-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(-)?] ) egl? ( >=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(-)?] ) opengl? ( >=virtual/opengl-7.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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=https://www.freedesktop.org/software/vaapi/releases/libva/libva-1.7.3.tar.bz2
 _eclass_exported_funcs=src_prepare:autotools-multilib src_configure:autotools-multilib src_compile:autotools-multilib src_test:autotools-multilib src_install:autotools-multilib
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d1af6022664ffd2236928c23dcc435e1
+_md5_=58238ef6e5c72b22c1a1663985c40b60
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.7.3 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.7.3
index e43935352144..f73052cfa38f 100644
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.7.3
+++ b/metadata/md5-cache/x11-libs/libva-intel-driver-1.7.3
@@ -4,11 +4,11 @@ DESCRIPTION=HW video decode support for Intel integrated graphics
 EAPI=5
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/vaapi
 IUSE=+drm wayland 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 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=x11-libs/libva-1.7.2[X?,wayland?,drm?,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/libdrm-2.4.46[video_cards_intel,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(-)?] wayland? ( >=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(-)?] >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.7.3.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:autotools-multilib src_compile:autotools-multilib src_test:autotools-multilib src_install:autotools-multilib
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=6283100420248a186cf8f3729273c8a9
+_md5_=15763ca4f62d0b68ba26d88a535ba58e
diff --git a/metadata/md5-cache/x11-misc/arandr-0.1.9 b/metadata/md5-cache/x11-misc/arandr-0.1.9
index 3a1722d2a5fe..02127204abb6 100644
--- a/metadata/md5-cache/x11-misc/arandr-0.1.9
+++ b/metadata/md5-cache/x11-misc/arandr-0.1.9
@@ -4,7 +4,7 @@ DESCRIPTION=Another XRandR GUI
 EAPI=5
 HOMEPAGE=http://christian.amsuess.com/tools/arandr/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-apps/xrandr 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=http://christian.amsuess.com/tools/arandr/files/arandr_0.1.9.orig.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fb4906eabbb6bafcefb1355ea030b682
+_md5_=4f0d5f9c351a8b7bd5a91de9c79598a5
diff --git a/metadata/md5-cache/x11-misc/gtkdialog-0.8.3-r2 b/metadata/md5-cache/x11-misc/gtkdialog-0.8.3-r2
index a011f6925c84..2fff7ecdc55c 100644
--- a/metadata/md5-cache/x11-misc/gtkdialog-0.8.3-r2
+++ b/metadata/md5-cache/x11-misc/gtkdialog-0.8.3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A small utility for fast and easy GUI building
 EAPI=6
 HOMEPAGE=https://code.google.com/p/gtkdialog/
 IUSE=glade vte
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 glade? ( gnome-base/libglade ) vte? ( x11-libs/vte:0= )
 SLOT=0
 SRC_URI=https://gtkdialog.googlecode.com/files/gtkdialog-0.8.3.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=46770afaa3460db1eae5e1e73c929d56
+_md5_=f3b033d140a41c44111ea4bd4fc5eb60
diff --git a/metadata/md5-cache/x11-misc/slock-1.4 b/metadata/md5-cache/x11-misc/slock-1.4
index a3913a41af94..87609e8b4b1e 100644
--- a/metadata/md5-cache/x11-misc/slock-1.4
+++ b/metadata/md5-cache/x11-misc/slock-1.4
@@ -4,11 +4,11 @@ DESCRIPTION=simple X screen locker
 EAPI=6
 HOMEPAGE=http://tools.suckless.org/slock
 IUSE=+filecaps savedconfig
-KEYWORDS=~amd64 ~hppa ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~hppa x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr
 SLOT=0
 SRC_URI=http://dl.suckless.org/tools/slock-1.4.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_compile:- src_install:-
 _eclasses_=fcaps	6a1091a98b1dde01cc26ab3252da1a9b	multilib	165fc17c38d1b11dac2008280dab6e80	portability	bb1a0ed8ea152b957d17339f01d4d7f5	savedconfig	7de7daa586f6bf361639e77d6f2299db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=9b51fe1fa3bd6169170d2d63e591ade1
+_md5_=a30f9c0ed0e51a547323b9be91dd4d47
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.47 b/metadata/md5-cache/x11-misc/xlockmore-5.47
index 01749446aec2..ae038b4235c9 100644
--- a/metadata/md5-cache/x11-misc/xlockmore-5.47
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.47
@@ -4,7 +4,7 @@ DESCRIPTION=Just another screensaver application for X
 EAPI=6
 HOMEPAGE=http://www.tux.org/~bagleyd/xlockmore.html
 IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
 REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://www.tux.org/~bagleyd/xlock/xlockmore-5.47.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1d639b7adfca02533c25ff3de349c380
+_md5_=834391871e7400db0a3cc7733bce1889
diff --git a/metadata/md5-cache/x11-plugins/fsviewer-0.2.6-r2 b/metadata/md5-cache/x11-plugins/fsviewer-0.2.6-r2
index d9c4bb55afd1..8e37037e58c3 100644
--- a/metadata/md5-cache/x11-plugins/fsviewer-0.2.6-r2
+++ b/metadata/md5-cache/x11-plugins/fsviewer-0.2.6-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A file system viewer for Window Maker
 EAPI=6
 HOMEPAGE=http://www.bayernline.de/~gscholz/linux/fsviewer/
 IUSE=nls
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-wm/windowmaker-0.95.2 x11-libs/libXft x11-libs/libXpm x11-libs/libX11
 SLOT=0
 SRC_URI=http://www.bayernline.de/~gscholz/linux/fsviewer/fsviewer-app-0.2.6.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=a315c0b432fc6a04672ca7831f38af7f
+_md5_=4f0a119009f46a094bce47a41ec1874f
diff --git a/metadata/md5-cache/x11-terms/roxterm-3.1.5 b/metadata/md5-cache/x11-terms/roxterm-3.1.5
index 59dee06df01a..df2829db95aa 100644
--- a/metadata/md5-cache/x11-terms/roxterm-3.1.5
+++ b/metadata/md5-cache/x11-terms/roxterm-3.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=A terminal emulator designed to integrate with the ROX environment
 EAPI=5
 HOMEPAGE=http://roxterm.sourceforge.net/
 IUSE=nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-3
 RDEPEND=>=dev-libs/dbus-glib-0.100 dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/libICE x11-libs/libSM x11-libs/vte:2.91 !x11-terms/roxterm:0
 SLOT=1
 SRC_URI=mirror://sourceforge/roxterm/roxterm-3.1.5.tar.xz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:python-any-r1 src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0bb87cfa7b62057b8ee0bd26a304728e
+_md5_=e23cdd88a2026eb298e9b0af954ff065
diff --git a/metadata/md5-cache/x11-wm/ratpoison-1.4.8-r1 b/metadata/md5-cache/x11-wm/ratpoison-1.4.8-r1
index 95afe9f48336..29adaf529592 100644
--- a/metadata/md5-cache/x11-wm/ratpoison-1.4.8-r1
+++ b/metadata/md5-cache/x11-wm/ratpoison-1.4.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=window manager without mouse dependency
 EAPI=5
 HOMEPAGE=http://www.nongnu.org/ratpoison/
 IUSE=debug emacs +history sloppy +xft
-KEYWORDS=amd64 hppa ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 hppa ~ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=emacs? ( virtual/emacs ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) virtual/perl-Pod-Parser x11-libs/libXinerama x11-libs/libXtst
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/ratpoison/ratpoison-1.4.8.tar.xz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ddb9c23220ae4b9537ff5694621c314e
+_md5_=68b2d31d2010ef1977992ed8e2213775
author	Repository QA checks <repo-qa-checks@gentoo.org>	2017-01-04 17:16:42 +0000
committer	Repository QA checks <repo-qa-checks@gentoo.org>	2017-01-04 17:16:42 +0000
commit	f9a9136a435130161b847e3af4f556c0d00dc7c2 (patch)
tree	bdfa155be49a278335bb4b5d11ac48292d8e1f45 /metadata/md5-cache
parent	Merge commit '082d2e572755d30ba7143486447cd92b21352f36' (diff)
download	gentoo-f9a9136a435130161b847e3af4f556c0d00dc7c2.tar.gz gentoo-f9a9136a435130161b847e3af4f556c0d00dc7c2.tar.bz2 gentoo-f9a9136a435130161b847e3af4f556c0d00dc7c2.zip