2017-01-02 10:01:08 UTC

author: Repository QA checks <repo-qa-checks@gentoo.org> 2017-01-02 10:01:10 +0000
committer: Repository QA checks <repo-qa-checks@gentoo.org> 2017-01-02 10:01:10 +0000
commit: dfb49ea3937d510299beaf6470c202fb1abdd2fc (patch)
tree: e6d95e0ee1e0ab9414d41122f8313b6891be334a /metadata/md5-cache
parent: Merge updates from master (diff)
download: gentoo-dfb49ea3937d510299beaf6470c202fb1abdd2fc.tar.gz
gentoo-dfb49ea3937d510299beaf6470c202fb1abdd2fc.tar.bz2
gentoo-dfb49ea3937d510299beaf6470c202fb1abdd2fc.zip
239 files changed, 476 insertions, 476 deletions
diff --git a/metadata/md5-cache/app-admin/denyhosts-3.0-r1 b/metadata/md5-cache/app-admin/denyhosts-3.0-r1
index 88fd00faae9a..d821aa1f465a 100644
--- a/metadata/md5-cache/app-admin/denyhosts-3.0-r1
+++ b/metadata/md5-cache/app-admin/denyhosts-3.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=DenyHosts is a utility to help sys admins thwart ssh hackers
 EAPI=6
 HOMEPAGE=https://github.com/denyhosts/denyhosts
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm hppa ppc ~sparc ~x86
+KEYWORDS=alpha amd64 arm hppa ppc ~sparc x86
 LICENSE=GPL-2
 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/denyhosts/denyhosts/archive/v3.0.tar.gz -> denyhosts-3.0.tar.gz
 _eclass_exported_funcs=src_prepare:- 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	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=92ca035ba361ca5fa6164ed7de3f1210
+_md5_=db62e3b2b00c618bd52584506de48124
diff --git a/metadata/md5-cache/app-arch/alien-8.95 b/metadata/md5-cache/app-arch/alien-8.95
index 57b9a1f1b80d..f7291cc9a644 100644
--- a/metadata/md5-cache/app-arch/alien-8.95
+++ b/metadata/md5-cache/app-arch/alien-8.95
@@ -4,11 +4,11 @@ DESCRIPTION=Converts between the rpm, dpkg, stampede slp, and slackware tgz file
 EAPI=5
 HOMEPAGE=http://kitenet.net/programs/alien
 IUSE=+bzip2
-KEYWORDS=alpha amd64 hppa ppc ppc64 ~x86
+KEYWORDS=alpha amd64 hppa ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=app-arch/rpm app-arch/dpkg dev-util/debhelper >=app-arch/tar-1.14.91 bzip2? ( app-arch/bzip2 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/alien/alien_8.95.tar.xz -> alien-8.95.tar.xz
 _eclass_exported_funcs=src_unpack:perl-module src_prepare:- src_configure:perl-module src_compile:perl-module src_test:perl-module src_install:perl-module
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=83273494234186b8b0f41b12f9c1a9ff
+_md5_=ea7a906679f94972bee394e4dd7b539b
diff --git a/metadata/md5-cache/app-backup/amanda-3.3.9 b/metadata/md5-cache/app-backup/amanda-3.3.9
index e3664464fd61..6dd2308a834f 100644
--- a/metadata/md5-cache/app-backup/amanda-3.3.9
+++ b/metadata/md5-cache/app-backup/amanda-3.3.9
@@ -4,11 +4,11 @@ DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
 EAPI=5
 HOMEPAGE=http://www.amanda.org/
 IUSE=curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs
-KEYWORDS=amd64 ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ppc ~ppc64 ~sparc x86
 LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
 RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.3.9.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_unpack:- src_prepare:- src_configure:- src_compile:- src_test:perl-module src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=13bcc46bfd453b86ad01a4ba27a5a48b
+_md5_=90242ebcf04911c9b44e0d2170e0ddf2
diff --git a/metadata/md5-cache/app-backup/cdbkup-1.0-r2 b/metadata/md5-cache/app-backup/cdbkup-1.0-r2
index be2757973276..800d38adf3fd 100644
--- a/metadata/md5-cache/app-backup/cdbkup-1.0-r2
+++ b/metadata/md5-cache/app-backup/cdbkup-1.0-r2
@@ -3,10 +3,10 @@ DEPEND=net-misc/openssh virtual/cdrtools virtual/eject
 DESCRIPTION=performs full/incremental backups of local/remote filesystems onto CD-R(W)s
 EAPI=6
 HOMEPAGE=http://cdbkup.sourceforge.net/
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=net-misc/openssh virtual/cdrtools virtual/eject !app-misc/cdcat
 SLOT=0
 SRC_URI=mirror://sourceforge/cdbkup/cdbkup-1.0.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
-_md5_=ee5a5cda91600e397c760fbb2e509acf
+_md5_=b7caf3cf7dc1b802bef56602ed96401e
diff --git a/metadata/md5-cache/app-crypt/libmd-0.0.0 b/metadata/md5-cache/app-crypt/libmd-0.0.0
index f956986de2c7..17e61d893374 100644
--- a/metadata/md5-cache/app-crypt/libmd-0.0.0
+++ b/metadata/md5-cache/app-crypt/libmd-0.0.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=Message Digest functions from BSD systems
 EAPI=6
 HOMEPAGE=https://www.hadrons.org/software/libmd/
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
 SLOT=0
 SRC_URI=https://archive.hadrons.org/software/libmd/libmd-0.0.0.tar.xz
 _eclass_exported_funcs=-
-_md5_=4699a980e75fe457e2871babc6e94a4a
+_md5_=727d81f387a0ce6eac36eaf5447e6ea9
diff --git a/metadata/md5-cache/app-crypt/p11-kit-0.23.2 b/metadata/md5-cache/app-crypt/p11-kit-0.23.2
index 14e9cbb13646..f5aa1030df05 100644
--- a/metadata/md5-cache/app-crypt/p11-kit-0.23.2
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.23.2
@@ -4,7 +4,7 @@ DESCRIPTION=Provides a standard configuration setup for installing PKCS#11
 EAPI=5
 HOMEPAGE=https://p11-glue.freedesktop.org/p11-kit.html
 IUSE=+asn1 debug +libffi +trust 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=asn1? ( >=dev-libs/libtasn1-3.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(-)?] ) libffi? ( >=dev-libs/libffi-3.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) trust? ( app-misc/ca-certificates )
 REQUIRED_USE=trust? ( asn1 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://p11-glue.freedesktop.org/releases/p11-kit-0.23.2.tar.gz
 _eclass_exported_funcs=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	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=7d9e98c77f0702a0a31204b455243361
+_md5_=21fcd7d94919a0eababce0a080a50ed8
diff --git a/metadata/md5-cache/app-crypt/pinentry-0.9.7-r1 b/metadata/md5-cache/app-crypt/pinentry-0.9.7-r1
index c6bd6a4b8cc4..b5c4250d49b1 100644
--- a/metadata/md5-cache/app-crypt/pinentry-0.9.7-r1
+++ b/metadata/md5-cache/app-crypt/pinentry-0.9.7-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol
 EAPI=5
 HOMEPAGE=http://gnupg.org/aegypten2/index.html
 IUSE=emacs gtk ncurses qt4 qt5 caps gnome-keyring static
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libgpg-error-1.17 >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2 ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) caps? ( sys-libs/libcap ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) app-eselect/eselect-pinentry gnome-keyring? ( app-crypt/libsecret ) gnome-keyring? ( app-crypt/gcr )
 REQUIRED_USE=|| ( ncurses gtk qt4 qt5 ) gtk? ( !static ) qt4? ( !static ) qt5? ( !static ) static? ( ncurses ) ?? ( qt4 qt5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-0.9.7.tar.bz2
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1a38d59bb88d8a73557f8bc092ea5fba
+_md5_=873f5d843dbbea9e33986161c0b2b3fd
diff --git a/metadata/md5-cache/app-crypt/signing-party-2.4 b/metadata/md5-cache/app-crypt/signing-party-2.4
index 7e15e6940dba..5ee7bc7b9925 100644
--- a/metadata/md5-cache/app-crypt/signing-party-2.4
+++ b/metadata/md5-cache/app-crypt/signing-party-2.4
@@ -3,11 +3,11 @@ DEPEND=dev-lang/perl !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1
 DESCRIPTION=A collection of several tools related to OpenPGP
 EAPI=5
 HOMEPAGE=http://pgp-tools.alioth.debian.org/
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=app-crypt/gnupg-1.3.92 app-crypt/libmd dev-perl/GnuPG-Interface dev-perl/Text-Template dev-perl/MIME-tools net-mail/qprint >=dev-perl/MailTools-1.62 dev-perl/Net-IDN-Encode virtual/mailx virtual/mta || ( dev-perl/libintl-perl dev-perl/Text-Iconv app-text/recode )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/signing-party/signing-party_2.4.orig.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1d858e3c271f3bbe0cd42b37e0ca4aeb
+_md5_=992743a18157d296eb768b4e5aa47ba7
diff --git a/metadata/md5-cache/app-dicts/aspell-hu-0.99.4.2 b/metadata/md5-cache/app-dicts/aspell-hu-0.99.4.2
index f0538f527e60..888944f42f38 100644
--- a/metadata/md5-cache/app-dicts/aspell-hu-0.99.4.2
+++ b/metadata/md5-cache/app-dicts/aspell-hu-0.99.4.2
@@ -3,11 +3,11 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Hungarian language dictionary for aspell
 EAPI=0
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/hu/aspell6-hu-0.99.4.2-0.tar.bz2
 _eclass_exported_funcs=src_compile:aspell-dict src_install:aspell-dict
 _eclasses_=aspell-dict	5e1fcef2869735a5ddd48c0d8fb4f48a
-_md5_=c2626e1e8f40e95e57ff9159de20ba3f
+_md5_=350c67b758558af067e3ff04648c55ec
diff --git a/metadata/md5-cache/app-dicts/aspell-hy-0.10.0 b/metadata/md5-cache/app-dicts/aspell-hy-0.10.0
index 715450f0656f..2b7f50dbedb2 100644
--- a/metadata/md5-cache/app-dicts/aspell-hy-0.10.0
+++ b/metadata/md5-cache/app-dicts/aspell-hy-0.10.0
@@ -3,11 +3,11 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=Armenian language dictionary for aspell
 EAPI=0
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/hy/aspell6-hy-0.10.0-0.tar.bz2
 _eclass_exported_funcs=src_compile:aspell-dict src_install:aspell-dict
 _eclasses_=aspell-dict	5e1fcef2869735a5ddd48c0d8fb4f48a
-_md5_=f651245a2f65e741d8d61a23d6085d18
+_md5_=d6d71e85958293758cd0256993d3b8b4
diff --git a/metadata/md5-cache/app-editors/kakoune-0_pre20160620 b/metadata/md5-cache/app-editors/kakoune-0_pre20160620
index ec46be1a13e4..80bdfe60079e 100644
--- a/metadata/md5-cache/app-editors/kakoune-0_pre20160620
+++ b/metadata/md5-cache/app-editors/kakoune-0_pre20160620
@@ -4,11 +4,11 @@ DESCRIPTION=Selection-oriented code editor inspired by vim
 EAPI=6
 HOMEPAGE=https://github.com/mawww/kakoune
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Unlicense
 RDEPEND=sys-libs/ncurses:=[unicode] dev-libs/boost
 SLOT=0
 SRC_URI=https://github.com/mawww/kakoune/tarball/34c8e6a9cf15410a433c8a8c3901703708b85611 -> kakoune-0_pre20160620.tar.gz
 _eclass_exported_funcs=src_unpack:vcs-snapshot src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd
-_md5_=86370845056d0a66c00963e8eabb8582
+_md5_=896a3223cb4638ce6d59e4de5edc4645
diff --git a/metadata/md5-cache/app-i18n/poedit-1.8.5 b/metadata/md5-cache/app-i18n/poedit-1.8.5
index 77782ca410b4..81ae612e1a27 100644
--- a/metadata/md5-cache/app-i18n/poedit-1.8.5
+++ b/metadata/md5-cache/app-i18n/poedit-1.8.5
@@ -4,11 +4,11 @@ DESCRIPTION=GUI editor for gettext translations files
 EAPI=5
 HOMEPAGE=https://poedit.net
 IUSE=linguas_af linguas_am linguas_an linguas_ar linguas_ast linguas_az linguas_be@latin linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_ca@valencia linguas_ckb linguas_co linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_fur linguas_fy_NL linguas_ga linguas_gl linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_id linguas_is linguas_it linguas_ja linguas_kab linguas_ka linguas_kk linguas_ko linguas_ku linguas_ky linguas_lt linguas_lv linguas_mk linguas_mn linguas_mr linguas_ms linguas_nb linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_sk linguas_sl linguas_sq linguas_sr linguas_sv linguas_ta linguas_tg linguas_th linguas_tr linguas_tt linguas_ug linguas_uk linguas_ur linguas_uz linguas_vi linguas_wa linguas_zh_CN linguas_zh_TW
-KEYWORDS=amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=app-text/gtkspell:2 dev-cpp/lucene++ dev-libs/boost:=[nls] dev-libs/expat dev-libs/icu:= || ( =sys-libs/db-5*[cxx] =sys-libs/db-4*[cxx] ) <sys-libs/db-6:=[cxx] x11-libs/gtk+:2 x11-libs/wxGTK:3.0[X]
 SLOT=0
 SRC_URI=https://github.com/vslavik/poedit/releases/download/v1.8.5-oss/poedit-1.8.5.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=62e9e58b8b447c5e28a095b8c6dcc323
+_md5_=0f81abf83fd079bf17d04e1d69d582e8
diff --git a/metadata/md5-cache/app-i18n/scim-pinyin-0.5.92 b/metadata/md5-cache/app-i18n/scim-pinyin-0.5.92
index f829124eebca..ab5a6df7b8be 100644
--- a/metadata/md5-cache/app-i18n/scim-pinyin-0.5.92
+++ b/metadata/md5-cache/app-i18n/scim-pinyin-0.5.92
@@ -4,11 +4,11 @@ DESCRIPTION=Smart Common Input Method (SCIM) Smart Pinyin Input Method
 EAPI=4
 HOMEPAGE=http://www.scim-im.org/
 IUSE=nls
-KEYWORDS=amd64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXt || ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-pinyin-0.5.92.tar.gz
 _eclass_exported_funcs=src_prepare:autotools-utils src_configure:- src_compile:autotools-utils src_test:autotools-utils src_install:autotools-utils
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ee58364ba05739c1f968a0dfc055791a
+_md5_=4dc28ed1c21835a600d53e5078dac344
diff --git a/metadata/md5-cache/app-leechcraft/lc-advancednotifications-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-advancednotifications-0.6.70
index 0b17093cd92a..07522bc52cde 100644
--- a/metadata/md5-cache/app-leechcraft/lc-advancednotifications-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-advancednotifications-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Flexible and customizable notifications framework for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 dev-qt/qtdeclarative:4
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft pkg_postinst:- 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f4da356999209fc7709f670da168c31c
+_md5_=85093ecaabf57591ff37e3703fa84e34
diff --git a/metadata/md5-cache/app-leechcraft/lc-aggregator-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-aggregator-0.6.70
index a3f1a0fa13c2..dadcef9e0860 100644
--- a/metadata/md5-cache/app-leechcraft/lc-aggregator-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-aggregator-0.6.70
@@ -4,7 +4,7 @@ DESCRIPTION=Full-featured RSS/Atom feed reader for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug mysql +sqlite postgres webaccess
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70[postgres?,sqlite?] dev-qt/qtwebkit:4 virtual/leechcraft-downloader-http
 REQUIRED_USE=|| ( mysql sqlite postgres )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft pkg_setup:- 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=37b6bc3a6bca2bde390a608485fb16e7
+_md5_=17caee16fbaf1be6f50d83962cfc9d97
diff --git a/metadata/md5-cache/app-leechcraft/lc-anhero-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-anhero-0.6.70
index 047c5561833c..7569c4f585ac 100644
--- a/metadata/md5-cache/app-leechcraft/lc-anhero-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-anhero-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=AnHero, crash handler for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 sys-devel/gdb
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=53b573a4acac57738b32b290ab8f9cea
+_md5_=f261da3e75e10ce9c7a6b934bdd0f5e5
diff --git a/metadata/md5-cache/app-leechcraft/lc-auscrie-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-auscrie-0.6.70
index b5cea98b3ac5..150b26b481de 100644
--- a/metadata/md5-cache/app-leechcraft/lc-auscrie-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-auscrie-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Auscrie, LeechCraft auto screenshooter
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e9c34ae60ddbd3aea4fe24ce36dd2ea2
+_md5_=09d820be255427a62bf243bf87e3b956
diff --git a/metadata/md5-cache/app-leechcraft/lc-azoth-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-azoth-0.6.70
index cdf7e05dd210..891bc2ead705 100644
--- a/metadata/md5-cache/app-leechcraft/lc-azoth-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-azoth-0.6.70
@@ -4,7 +4,7 @@ DESCRIPTION=Azoth, the modular IM client for LeechCraft
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug doc astrality +acetamide +adiumstyles +autoidler +autopaste +birthdaynotifier +chathistory +crypt +depester +embedmedia +herbicide +hili +isterique +juick +keeso +lastseen +metacontacts media +murm +latex +nativeemoticons +otroid +spell shx +standardstyles +vader velvetbird +woodpecker +xmpp +xtazy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 dev-libs/qjson dev-qt/qtwebkit:4 autoidler? ( x11-libs/libXScrnSaver ) astrality? ( net-libs/telepathy-qt ) otroid? ( net-libs/libotr ) media? ( dev-qt/qt-mobility[multimedia] ) woodpecker? ( dev-libs/kqoauth ) xmpp? ( >=net-libs/qxmpp-0.8.0 media? ( >=net-libs/qxmpp-0.8.0[speex] ) ) xtazy? ( ~app-leechcraft/lc-xtazy-0.6.70 dev-qt/qtdbus:4 ) crypt? ( app-crypt/qca:2[qt4(+)] ) astrality? ( net-im/telepathy-mission-control net-voip/telepathy-haze ) crypt? ( app-crypt/qca:2[gpg] ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) spell? ( app-leechcraft/lc-rosenthal )
 REQUIRED_USE=|| ( standardstyles adiumstyles )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft pkg_postinst:- 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5e8f7011a6c4d664ddc4ebbf6a170867
+_md5_=4dc23fdaf33024cb3b3e4e1bd1f43031
diff --git a/metadata/md5-cache/app-leechcraft/lc-bittorrent-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-bittorrent-0.6.70
index 39d1a6546d1f..d1b480582bd1 100644
--- a/metadata/md5-cache/app-leechcraft/lc-bittorrent-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-bittorrent-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Full-featured BitTorrent client plugin for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug geoip
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 net-libs/rb_libtorrent virtual/leechcraft-task-show geoip? ( dev-libs/geoip )
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b04913d3f70f1641085b129e28bfe223
+_md5_=0267411a86d089d34eaa96196e32d756
diff --git a/metadata/md5-cache/app-leechcraft/lc-blasq-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-blasq-0.6.70
index 125497b39fb6..e4d968ed413e 100644
--- a/metadata/md5-cache/app-leechcraft/lc-blasq-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-blasq-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Cloud image storage services client (like Flickr or Picasa)
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug +deathnote +rappor +spegnersi +vangog
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 deathnote? ( dev-qt/qtxmlpatterns:4 ) spegnersi? ( dev-libs/kqoauth ) vangog? ( dev-libs/qjson )
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5e44b5822addcc74211acbc2aa239bdf
+_md5_=d4710940a458b3b453721b97afc4f778
diff --git a/metadata/md5-cache/app-leechcraft/lc-blogique-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-blogique-0.6.70
index 848c81cb9d7f..b2515597ef22 100644
--- a/metadata/md5-cache/app-leechcraft/lc-blogique-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-blogique-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Blogging client for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug +metida +hestia
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 dev-qt/qtsql:4[sqlite] metida? ( dev-qt/qtxmlpatterns:4 ) virtual/leechcraft-wysiwyg-editor
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=161f21c0457f8508bd44c446f3fc075c
+_md5_=2e520f05d677a7a8e6a6ba9b044b38ef
diff --git a/metadata/md5-cache/app-leechcraft/lc-certmgr-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-certmgr-0.6.70
index d7b73c9c7948..44f84e6aec89 100644
--- a/metadata/md5-cache/app-leechcraft/lc-certmgr-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-certmgr-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=SSL certificates manager for LeechCraft
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9e58c161d3db0e7aa91055acf8322436
+_md5_=684c4db84e5f06da6dabab75d8e146ae
diff --git a/metadata/md5-cache/app-leechcraft/lc-core-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-core-0.6.70
index 8519056db0aa..ddf21192f288 100644
--- a/metadata/md5-cache/app-leechcraft/lc-core-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-core-0.6.70
@@ -4,7 +4,7 @@ DESCRIPTION=Core of LeechCraft, the modular network client
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug doc +sqlite postgres +qwt
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=>=dev-libs/boost-1.46:=[threads] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtdeclarative:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsql:4[postgres?,sqlite?] dev-qt/qtwebkit:4 dev-qt/qtdbus:4 qwt? ( x11-libs/qwt:6 ) dev-qt/qtsvg:4 || ( kde-frameworks/oxygen-icons x11-themes/kfaenza )
 REQUIRED_USE=|| ( postgres sqlite )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft src_prepare:cmake-utils src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	confutils	18995f74ac4ffafb7ad853dfe133f209	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8982eb44100b25f22ac30a6563de4d20
+_md5_=4a306f586f68d894ec3f641f9db87c80
diff --git a/metadata/md5-cache/app-leechcraft/lc-cpuload-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-cpuload-0.6.70
index 55be1fe6bfd3..12c810072f32 100644
--- a/metadata/md5-cache/app-leechcraft/lc-cpuload-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-cpuload-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=CPU load graph quark
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 virtual/leechcraft-quark-sideprovider
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6beafc39bcf76cd2cc93b52eb65eeddf
+_md5_=54b160c27a46a638d2c05ddf525de36a
diff --git a/metadata/md5-cache/app-leechcraft/lc-cstp-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-cstp-0.6.70
index dc976e5facd3..ad4078660757 100644
--- a/metadata/md5-cache/app-leechcraft/lc-cstp-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-cstp-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=CSTP, the clean & stupid HTTP implementation for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 virtual/leechcraft-task-show
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bf195f7a1336b190f2758934a351459a
+_md5_=b7f0788c82f5035289a93bd671786dae
diff --git a/metadata/md5-cache/app-leechcraft/lc-dbusmanager-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-dbusmanager-0.6.70
index 19b7c899743f..0c46c2c5979c 100644
--- a/metadata/md5-cache/app-leechcraft/lc-dbusmanager-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-dbusmanager-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=DBusManager provides some basic D-Bus interoperability for LeechCraf
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 dev-qt/qtdbus:4
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cb064f655193e0aa5624a6110a2fe28c
+_md5_=4e02ed585c09850a8afa89042195584d
diff --git a/metadata/md5-cache/app-leechcraft/lc-deadlyrics-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-deadlyrics-0.6.70
index bcb86e29b8eb..a7a19e721ed6 100644
--- a/metadata/md5-cache/app-leechcraft/lc-deadlyrics-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-deadlyrics-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Searches for song lyrics and displays them in LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3f995a44a8360c28a6781f82813dcfdb
+_md5_=c55bc609bc299bb7b39472f52096b2c4
diff --git a/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.70
index 9dcc4a4cee25..39ccefff25b3 100644
--- a/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Non-storage USB devices manager for LeechCraft
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 virtual/udev
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a2c8796451cdb49225b93e3e499fb498
+_md5_=89738a8f8a240d9f7b229aa3c5a4b0dd
diff --git a/metadata/md5-cache/app-leechcraft/lc-dolozhee-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-dolozhee-0.6.70
index 9f39115af541..5a67f76c4c8c 100644
--- a/metadata/md5-cache/app-leechcraft/lc-dolozhee-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-dolozhee-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=An issue reporting client for LeechCraft's issue tracker
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=968e8c141fa68268f113fe1639dd752b
+_md5_=40a6a96a59e8defba664e6c015587c02
diff --git a/metadata/md5-cache/app-leechcraft/lc-eleeminator-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-eleeminator-0.6.70
index bfd91bfb6e8c..1771af8568fa 100644
--- a/metadata/md5-cache/app-leechcraft/lc-eleeminator-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-eleeminator-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Embedded LeechCraft Terminal Emulator
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 x11-libs/qtermwidget
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5d5f6db126bf76a3c2282d78001c2df3
+_md5_=941a747917426ab6ff52d6018417e974
diff --git a/metadata/md5-cache/app-leechcraft/lc-fenet-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-fenet-0.6.70
index b3eebac33e4b..cbcdd0b91a73 100644
--- a/metadata/md5-cache/app-leechcraft/lc-fenet-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-fenet-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=LeechCraft WM and compositor manager
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 dev-libs/qjson
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d13256225399c1b0eb20e8ff0a8f769a
+_md5_=308457338605cc9505de8aee2f30da18
diff --git a/metadata/md5-cache/app-leechcraft/lc-gacts-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-gacts-0.6.70
index bc9256033da2..2d6f52d94d14 100644
--- a/metadata/md5-cache/app-leechcraft/lc-gacts-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-gacts-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Allows other LeechCraft modules to register global shortcuts
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 x11-libs/libqxt
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=111b7e8504c054837175204bb4c610d8
+_md5_=fdb82c41196a66ca13adffa7d3f76ba2
diff --git a/metadata/md5-cache/app-leechcraft/lc-glance-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-glance-0.6.70
index 4cd436cf54dd..37544170e93e 100644
--- a/metadata/md5-cache/app-leechcraft/lc-glance-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-glance-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Glance, quick thumbnailed overview of opened tabs in LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=de6562a83716446b19a3df0a7cbd8a03
+_md5_=670cd0b1708a7dd29947679db9a963ce
diff --git a/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-0.6.70
index d93cc321362e..37ed3035a617 100644
--- a/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Notifier about new mail in a GMail inbox for LeechCraft
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug notify quark
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 dev-qt/qtdeclarative:4 quark? ( ~virtual/leechcraft-quark-sideprovider-0.6.70 ) notify? ( ~virtual/leechcraft-notifier-0.6.70 )
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5a4bf85a90a4578d90c5aecfede8667f
+_md5_=1d21bc8b549e355ee909be9b316d0796
diff --git a/metadata/md5-cache/app-leechcraft/lc-historyholder-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-historyholder-0.6.70
index 3030a1009283..a132828c4911 100644
--- a/metadata/md5-cache/app-leechcraft/lc-historyholder-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-historyholder-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=HistoryHolder keeps track of stuff downloaded in LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 virtual/leechcraft-search-show
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d7b40d0c39d66ea68db41ff782892448
+_md5_=61c8cae04b9cb4bb800b870e7cb3d289
diff --git a/metadata/md5-cache/app-leechcraft/lc-hotsensors-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-hotsensors-0.6.70
index 165ccaf0df48..140434c0813e 100644
--- a/metadata/md5-cache/app-leechcraft/lc-hotsensors-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-hotsensors-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Temperature sensors monitor plugin for LeechCraft
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=~app-leechcraft/lc-core-0.6.70[qwt] ~virtual/leechcraft-quark-sideprovider-0.6.70 dev-qt/qtdeclarative:4 sys-apps/lm_sensors
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ee1c406dae5a6572ebc1c287451bcd51
+_md5_=34ac10da360cfd394167903c3c4ae4e9
diff --git a/metadata/md5-cache/app-leechcraft/lc-hotstreams-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-hotstreams-0.6.70
index 939e80f0c4c8..548058615112 100644
--- a/metadata/md5-cache/app-leechcraft/lc-hotstreams-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-hotstreams-0.6.70
@@ -3,11 +3,11 @@ DEPEND=~app-leechcraft/lc-core-0.6.70 dev-libs/qjson sys-devel/make >=dev-util/c
 DESCRIPTION=Provides some cool radio streams to music players like LMP
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 dev-libs/qjson
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=43e2b36405f09247d0f68aa39d8b1e5a
+_md5_=d72176c5348ed51b803e50e7b561e7d4
diff --git a/metadata/md5-cache/app-leechcraft/lc-htthare-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-htthare-0.6.70
index fe037b71e3f1..90e0515e855a 100644
--- a/metadata/md5-cache/app-leechcraft/lc-htthare-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-htthare-0.6.70
@@ -3,11 +3,11 @@ DEPEND=~app-leechcraft/lc-core-0.6.70 sys-devel/make >=dev-util/cmake-3.5.2 app-
 DESCRIPTION=Simple HTTP server for Leechcraft
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=acd3d73a735a247a24bc998058196de4
+_md5_=bf483317f6b12680a253c1b3f06eca15
diff --git a/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.70
index 22899db9aec0..d5b97e9f1713 100644
--- a/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=The simple image uploader data filter for LeechCraft
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2b9b8b461641efd138f46ab05c9f74cd
+_md5_=2baf41b3d3c484033327560df66970e8
diff --git a/metadata/md5-cache/app-leechcraft/lc-kbswitch-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-kbswitch-0.6.70
index 8cc7642411d3..5fb448e77b2d 100644
--- a/metadata/md5-cache/app-leechcraft/lc-kbswitch-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-kbswitch-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Provides plugin- or tab-grained keyboard layout control
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 x11-apps/setxkbmap
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b28b802f46ee5750ed94b04492527379
+_md5_=af31321f592d9760513901f7070256cd
diff --git a/metadata/md5-cache/app-leechcraft/lc-kinotify-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-kinotify-0.6.70
index bd6370401242..6e6566489fc0 100644
--- a/metadata/md5-cache/app-leechcraft/lc-kinotify-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-kinotify-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Fancy visual notifications for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 >=dev-qt/qtwebkit-4.6:4
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a0b5224995b9d4580f6d21024e807e83
+_md5_=a1dff743daa68fa9b2579c9ea19f4937
diff --git a/metadata/md5-cache/app-leechcraft/lc-knowhow-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-knowhow-0.6.70
index 6948511cdf3a..bfbd4c48c4d3 100644
--- a/metadata/md5-cache/app-leechcraft/lc-knowhow-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-knowhow-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=KnowHow, plugin for showing Tips of the Day in LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=51a206a91301a8dd7f224c6143774de7
+_md5_=fb7a58e93b0812df7b69ce0bba635b0f
diff --git a/metadata/md5-cache/app-leechcraft/lc-krigstask-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-krigstask-0.6.70
index 02f118539c55..b8dded095f99 100644
--- a/metadata/md5-cache/app-leechcraft/lc-krigstask-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-krigstask-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=The taskbar quark for LeechCraft
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 dev-qt/qtdeclarative:4 x11-libs/libXcomposite ~virtual/leechcraft-quark-sideprovider-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7d56c1fe83358806fefe637a0df9705f
+_md5_=b18b6fcf0ccab3c44ae6134d2872983c
diff --git a/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.70
index 9bde95d8b67a..05f1771aed01 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=LeechCraft Package Manager for extensions, scripts, themes etc
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 >=dev-qt/qtwebkit-4.6:4 virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=690867fb2c9d911a68bfd62a60c9fb30
+_md5_=727d11d1a9fe34e6fbea753df016a760
diff --git a/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-0.6.70
index 388c66e43654..374d97024994 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Last.FM scrobbler plugin for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 media-libs/liblastfm[qt4(+)]
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=63afa6c2c906ce34adaacba995860070
+_md5_=2923913c46d59080f72a7a7ca2f3811e
diff --git a/metadata/md5-cache/app-leechcraft/lc-laughty-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-laughty-0.6.70
index 299080fed206..4a5f9029229f 100644
--- a/metadata/md5-cache/app-leechcraft/lc-laughty-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-laughty-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=The LeechCraft notification daemon
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 dev-qt/qtdbus:4 virtual/leechcraft-notifier
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8f1e2ae3f5061d717c521dbdb127454c
+_md5_=0c8c61a0d65aa26a29ea57d4ea21634f
diff --git a/metadata/md5-cache/app-leechcraft/lc-launchy-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-launchy-0.6.70
index 39beb33e042b..de0967005ed0 100644
--- a/metadata/md5-cache/app-leechcraft/lc-launchy-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-launchy-0.6.70
@@ -3,11 +3,11 @@ DEPEND=~app-leechcraft/lc-core-0.6.70 dev-qt/qtdeclarative:4 sys-devel/make >=de
 DESCRIPTION=Allows one to launch third-party applications (as well as LeechCraft plugins) from LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 dev-qt/qtdeclarative:4 ~virtual/leechcraft-trayarea-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dc46cab2ca7d8740607ac2ac81d19c9f
+_md5_=0f7c482e3e383b9a29d5609dbfbdd6f4
diff --git a/metadata/md5-cache/app-leechcraft/lc-lemon-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-lemon-0.6.70
index 94f9401d7771..1efd092a834d 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lemon-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-lemon-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Network monitor plugin for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 ~virtual/leechcraft-quark-sideprovider-0.6.70 dev-qt/qtbearer:4 dev-qt/qtdeclarative:4 dev-libs/libnl:3 x11-libs/qwt:6
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9be2c34574ca1e2a8c36824fd026865f
+_md5_=54a1d0ef7f700fb6017b8cae6e21de85
diff --git a/metadata/md5-cache/app-leechcraft/lc-lhtr-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-lhtr-0.6.70
index aaa0142aa4a2..4b1f76f4704f 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lhtr-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-lhtr-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=LeechCraft HTML Text editoR component
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 app-text/htmltidy dev-qt/qtwebkit:4
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6b25c3be2442eb6c4e1bba3546e4e565
+_md5_=396c4037eef5a1914c6fd241310fc7e2
diff --git a/metadata/md5-cache/app-leechcraft/lc-liznoo-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-liznoo-0.6.70
index 81996253cb31..ba87d922b5e4 100644
--- a/metadata/md5-cache/app-leechcraft/lc-liznoo-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-liznoo-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=UPower-based power manager for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug systemd
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 x11-libs/qwt:6 dev-qt/qtdbus:4 virtual/leechcraft-trayarea !systemd? ( || ( >=sys-power/upower-0.99 sys-power/upower-pm-utils ) ) systemd? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft pkg_postinst:- 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=296480abed7da367bc4bb2b0f9207f46
+_md5_=db979d8453f03268e6c6db80a7b8b80b
diff --git a/metadata/md5-cache/app-leechcraft/lc-lmp-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-lmp-0.6.70
index 3f53229517be..010fdba34c24 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lmp-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-lmp-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=LeechCraft Media Player, Phonon-based audio/video player
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug +fradj +graffiti +guess +mpris +mp3tunes potorchu
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 graffiti? ( media-libs/flac ) guess? ( app-i18n/libguess ) media-libs/gstreamer:0.10 media-libs/taglib mpris? ( dev-qt/qtdbus:4 ) potorchu? ( media-libs/libprojectm ) dev-qt/qtdeclarative:4
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5dffef0c64bcb01409d6f39815d8cde3
+_md5_=9ed528be645f02698ed74d206852f3f3
diff --git a/metadata/md5-cache/app-leechcraft/lc-mellonetray-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-mellonetray-0.6.70
index ba36b55ca4a9..f25d0bc71201 100644
--- a/metadata/md5-cache/app-leechcraft/lc-mellonetray-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-mellonetray-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=System tray quark for LeechCraft
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 dev-qt/qtdeclarative:4 x11-libs/libXdamage x11-libs/libXrender ~virtual/leechcraft-quark-sideprovider-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d9a1ea2f3096862616bcd8d70aa979d8
+_md5_=c52c1cd0545ddd99c479adbb1ef5c8e6
diff --git a/metadata/md5-cache/app-leechcraft/lc-monocle-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-monocle-0.6.70
index 3b6cc76bb56b..3650790b6b8d 100644
--- a/metadata/md5-cache/app-leechcraft/lc-monocle-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-monocle-0.6.70
@@ -4,7 +4,7 @@ DESCRIPTION=Monocle, the modular document viewer for LeechCraft
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug +djvu doc +fb2 +mobi +pdf +postscript
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 pdf? ( app-text/poppler[qt4] ) djvu? ( app-text/djvu ) postscript? ( app-text/ghostscript-gpl )
 REQUIRED_USE=postscript? ( pdf )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c858a7bf260dd41ab944121dac810c8d
+_md5_=df49cd71d00f14d2cad684cfdbf36316
diff --git a/metadata/md5-cache/app-leechcraft/lc-musiczombie-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-musiczombie-0.6.70
index 0565dfe3501f..c540f8663673 100644
--- a/metadata/md5-cache/app-leechcraft/lc-musiczombie-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-musiczombie-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=MusicBrainz client plugin for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug acoustid
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 acoustid? ( media-libs/chromaprint )
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ba65a12ad77a246b7d02f9fc15ac8463
+_md5_=47f24dd0782f3265d3fd0256d89f06e6
diff --git a/metadata/md5-cache/app-leechcraft/lc-nacheku-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-nacheku-0.6.70
index 9ca2458f1bab..6b64900b5c54 100644
--- a/metadata/md5-cache/app-leechcraft/lc-nacheku-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-nacheku-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Monitors selected directory and clipboard for downloadable entities
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5c82f98da42a856e052ba9975a737587
+_md5_=d66d6a4f804722025265487af88ad32e
diff --git a/metadata/md5-cache/app-leechcraft/lc-netstoremanager-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-netstoremanager-0.6.70
index 1e75a6e6abda..f9704114f083 100644
--- a/metadata/md5-cache/app-leechcraft/lc-netstoremanager-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-netstoremanager-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=LeechCraft plugin for supporting and managing Internet data storages
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=+googledrive +yandexdisk
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 googledrive? ( dev-libs/qjson sys-apps/file )
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bf0d6f8a603d99ee751e722732cc8e93
+_md5_=669d52f6eda697d03a98e8b88d209b8f
diff --git a/metadata/md5-cache/app-leechcraft/lc-networkmonitor-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-networkmonitor-0.6.70
index d9951b137402..a6aa15230dec 100644
--- a/metadata/md5-cache/app-leechcraft/lc-networkmonitor-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-networkmonitor-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=NetworkMonitor watches HTTP requests in for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ac403d326d2bba4b82d3dbaf701c9d63
+_md5_=933090f78da8f10e53a67557c8b12860
diff --git a/metadata/md5-cache/app-leechcraft/lc-newlife-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-newlife-0.6.70
index 3abce2db0367..64332e2fa612 100644
--- a/metadata/md5-cache/app-leechcraft/lc-newlife-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-newlife-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=New Life imports settings from various other applications into Leech
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bdae76b00446cf2d8cae0f4701f7525f
+_md5_=42641aa833a826596610896ef9115af2
diff --git a/metadata/md5-cache/app-leechcraft/lc-ooronee-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-ooronee-0.6.70
index 910c54310fd8..01c0cc62f593 100644
--- a/metadata/md5-cache/app-leechcraft/lc-ooronee-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-ooronee-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Quark handling text and images droppend onto it
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 virtual/leechcraft-quark-sideprovider
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft pkg_postinst:- 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d93351f230147de4e35092a1b87f9685
+_md5_=c9b6a4ba69e985d2714c919ec78b15f2
diff --git a/metadata/md5-cache/app-leechcraft/lc-otlozhu-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-otlozhu-0.6.70
index 73fc060069a1..3ebc3def0c8e 100644
--- a/metadata/md5-cache/app-leechcraft/lc-otlozhu-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-otlozhu-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Otlozhu, a GTD-inspired ToDo manager plugin for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 app-leechcraft/liblaretz >=dev-qt/qtgui-4.8:4
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=61bb06e42fe5b09491a2eeaeda5b8099
+_md5_=c0ea2f902661e6058c29c9d6d30833e1
diff --git a/metadata/md5-cache/app-leechcraft/lc-pintab-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-pintab-0.6.70
index 64a1f1fced6b..57672aae6e84 100644
--- a/metadata/md5-cache/app-leechcraft/lc-pintab-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-pintab-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Provides support for pinning tabs for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=263c0b3c1fd4e649b9d39e2a41fe02d6
+_md5_=1f2db4f0f3da6e354b9d1ba4f42a0c9d
diff --git a/metadata/md5-cache/app-leechcraft/lc-pogooglue-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-pogooglue-0.6.70
index 3de343a7a584..fed3ded2f8e4 100644
--- a/metadata/md5-cache/app-leechcraft/lc-pogooglue-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-pogooglue-0.6.70
@@ -3,11 +3,11 @@ DEPEND=~app-leechcraft/lc-core-0.6.70 sys-devel/make >=dev-util/cmake-3.5.2 app-
 DESCRIPTION=Provides searching with Google to other LeechCraft plugins
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cd81ad6844b8fcdd66bfa9a8ee36df7b
+_md5_=f11e0b2aa9acb8e2b2a1d5755fb0a23c
diff --git a/metadata/md5-cache/app-leechcraft/lc-popishu-0.6.70-r1 b/metadata/md5-cache/app-leechcraft/lc-popishu-0.6.70-r1
index 6ea991e35e3c..4d568d50c4cb 100644
--- a/metadata/md5-cache/app-leechcraft/lc-popishu-0.6.70-r1
+++ b/metadata/md5-cache/app-leechcraft/lc-popishu-0.6.70-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Popishu, the text editor with IDE features for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 x11-libs/qscintilla[qt4(-)]
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5cc9f64a0b766c5cc3c3c60e9ad45257
+_md5_=540d5c15f9788ef426bcc9ea14198685
diff --git a/metadata/md5-cache/app-leechcraft/lc-poshuku-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-poshuku-0.6.70
index 8543c1796927..e4c8e6de78cf 100644
--- a/metadata/md5-cache/app-leechcraft/lc-poshuku-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-poshuku-0.6.70
@@ -4,7 +4,7 @@ DESCRIPTION=Poshuku, the full-featured web browser plugin for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=+autosearch debug +dcac +cleanweb +fatape +filescheme +fua +idn +keywords +onlinebookmarks +pcre postgres qrd +sqlite wyfv
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70[postgres?,sqlite?] dev-qt/qtwebkit:4 idn? ( net-dns/libidn ) onlinebookmarks? ( >=dev-libs/qjson-0.7.1-r1 ) pcre? ( >=dev-libs/libpcre-8.12 ) qrd? ( media-gfx/qrencode ) virtual/leechcraft-downloader-http
 REQUIRED_USE=pcre? ( cleanweb )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft pkg_setup:- src_prepare:cmake-utils src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	confutils	18995f74ac4ffafb7ad853dfe133f209	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=42f62b6b86b73ae63e263ef5b0802612
+_md5_=3dbcefec7cd718ff8169f00e3532475d
diff --git a/metadata/md5-cache/app-leechcraft/lc-qrosp-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-qrosp-0.6.70
index 70024e3fb8f6..74431e7ebf79 100644
--- a/metadata/md5-cache/app-leechcraft/lc-qrosp-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-qrosp-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Qrosp, scrpting support for LeechCraft via Qross
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 dev-libs/qjson dev-libs/qrosscore
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=95798c10a568de2a766e856e9f275a15
+_md5_=6e1255f33a93abfd3e2b4af40ff2d73a
diff --git a/metadata/md5-cache/app-leechcraft/lc-rosenthal-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-rosenthal-0.6.70
index b64bb001a61c..644dae8bc552 100644
--- a/metadata/md5-cache/app-leechcraft/lc-rosenthal-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-rosenthal-0.6.70
@@ -3,11 +3,11 @@ DEPEND=~app-leechcraft/lc-core-0.6.70 app-text/hunspell sys-devel/make >=dev-uti
 DESCRIPTION=Spellchecking support for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 app-text/hunspell
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a7de2954e7ff6909e4782ab9650b59c5
+_md5_=e5ae8ba2e2b814c521e73905f3733e51
diff --git a/metadata/md5-cache/app-leechcraft/lc-sb2-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-sb2-0.6.70
index 2d8f5bb3808d..67856d1280c0 100644
--- a/metadata/md5-cache/app-leechcraft/lc-sb2-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-sb2-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Next-generation sidebar for LeechCraft with combined launcher and ta
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 dev-qt/qtdeclarative:4 dev-libs/qjson
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fa6027a0bcee5cae014dc90664ef9a2a
+_md5_=70ac296b96b640c964075caa580b78cb
diff --git a/metadata/md5-cache/app-leechcraft/lc-scroblibre-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-scroblibre-0.6.70
index 25b62c75b257..a0e5dc68bc9b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-scroblibre-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-scroblibre-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Submissions API 1.2-compliant scrobbler for services like libre.fm
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6848d28ef59f5de3a71909f88bd98429
+_md5_=e699ab8ac9ab7fac1d854389466f5356
diff --git a/metadata/md5-cache/app-leechcraft/lc-secman-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-secman-0.6.70
index 92906604e590..d1c7c621dabf 100644
--- a/metadata/md5-cache/app-leechcraft/lc-secman-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-secman-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Security and personal data manager for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f276b6b3e83e8f7612622eb0f35649e5
+_md5_=df3fda20675519f372cfbb1e2522cba1
diff --git a/metadata/md5-cache/app-leechcraft/lc-seekthru-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-seekthru-0.6.70
index d222f2f782b3..45baedefbe1c 100644
--- a/metadata/md5-cache/app-leechcraft/lc-seekthru-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-seekthru-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=OpenSearch support for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8e0d2b5d4f3ccd04b5532d0d51140460
+_md5_=0560706f877c9c22dc12532ca2871315
diff --git a/metadata/md5-cache/app-leechcraft/lc-summary-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-summary-0.6.70
index 486acd608232..a385eae399c4 100644
--- a/metadata/md5-cache/app-leechcraft/lc-summary-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-summary-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Summary plugin for Leechcraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7e7b5c700886319a2727e8c1d115306d
+_md5_=358a6cc528aee3451f769e96a1440bad
diff --git a/metadata/md5-cache/app-leechcraft/lc-sysnotify-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-sysnotify-0.6.70
index f0353ebdb8c0..bb61617abc94 100644
--- a/metadata/md5-cache/app-leechcraft/lc-sysnotify-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-sysnotify-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Notifications via system libnotify daemon for LeechCraft
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 dev-qt/qtdbus:4
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e53adb1f3bb22617189442dfc217b1a0
+_md5_=451d73501992dff0bc05f22b6184e124
diff --git a/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-0.6.70
index ce7e3b9347fc..56fb005bfcfe 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Provides session restore between LeechCraft runs as well as manual s
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6ec6a3b3e6af92bf61fb5142f18a2313
+_md5_=3982a64020a50dbedc6028ae0e49af3c
diff --git a/metadata/md5-cache/app-leechcraft/lc-tabslist-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-tabslist-0.6.70
index 759c027029b7..504b0a02f640 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tabslist-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-tabslist-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Quick navigation between tabs in LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6764b37c3bdf9b8df590db50d182ae23
+_md5_=07f15aa87ac25ccec43ffad840342f0a
diff --git a/metadata/md5-cache/app-leechcraft/lc-touchstreams-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-touchstreams-0.6.70
index a1ee2fdc5757..4cd69030ad45 100644
--- a/metadata/md5-cache/app-leechcraft/lc-touchstreams-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-touchstreams-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=VKontakte music source plugin for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 >=dev-libs/boost-1.52.0 dev-libs/qjson dev-qt/qtwebkit:4
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=480095b4a3c1e504e0eebacb4402e2ab
+_md5_=7b761dd750f6a9eda3c66754094d655b
diff --git a/metadata/md5-cache/app-leechcraft/lc-tpi-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-tpi-0.6.70
index 4556bb407bbc..b89ca0b4a7c4 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tpi-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-tpi-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Task progress indicator quark for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 dev-qt/qtdeclarative:4 ~virtual/leechcraft-quark-sideprovider-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6bcc9df6cf6657f6bd29400889ded26c
+_md5_=8c1392976234ffd99705b3b308763d39
diff --git a/metadata/md5-cache/app-leechcraft/lc-vgrabber-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-vgrabber-0.6.70
index ab0d3ca1ebd0..88f4df8919fe 100644
--- a/metadata/md5-cache/app-leechcraft/lc-vgrabber-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-vgrabber-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Allows to find, stream and save audio and video from VKontakte in Le
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft pkg_postinst:- 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fb00487a0635e0b78317ef72c850c45c
+_md5_=f03229668697d6daf4db7821475dc9cb
diff --git a/metadata/md5-cache/app-leechcraft/lc-vrooby-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-vrooby-0.6.70
index 73fa3369f88e..aed0d7b690c1 100644
--- a/metadata/md5-cache/app-leechcraft/lc-vrooby-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-vrooby-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Vrooby, removable device manager for LeechCraft
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 dev-qt/qtdbus:4 sys-fs/udisks:2
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=620c78cfe4bdfafb2c6421eff573a34c
+_md5_=807978eb85f35890cb85495cfeb5becd
diff --git a/metadata/md5-cache/app-leechcraft/lc-xproxy-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-xproxy-0.6.70
index 57a4c263b1e1..00bbc08c8bf7 100644
--- a/metadata/md5-cache/app-leechcraft/lc-xproxy-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-xproxy-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Provides advanced proxy support features for LeechCraft
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cf43a12ebe8f9c045f3b19bd28e779a0
+_md5_=f3283576c9d69a6847dd01c7781348d2
diff --git a/metadata/md5-cache/app-leechcraft/lc-xtazy-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-xtazy-0.6.70
index eb900e049b88..6c06a391b494 100644
--- a/metadata/md5-cache/app-leechcraft/lc-xtazy-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-xtazy-0.6.70
@@ -4,11 +4,11 @@ DESCRIPTION=Fetches info about current tune and provides it to other plugins
 EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-0.6.70 dev-qt/qtdbus:4
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclass_exported_funcs=pkg_pretend:leechcraft 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	leechcraft	31c814e6a5231038f3abd13d747fefaf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ce858076c62b1403c3d3b270b41138a2
+_md5_=872175718e1817f256c1ffad5e875ae7
diff --git a/metadata/md5-cache/app-misc/ignuit-2.24.2 b/metadata/md5-cache/app-misc/ignuit-2.24.2
index b8c13a26dc5b..68ead7dc43df 100644
--- a/metadata/md5-cache/app-misc/ignuit-2.24.2
+++ b/metadata/md5-cache/app-misc/ignuit-2.24.2
@@ -4,11 +4,11 @@ DESCRIPTION=Memorization aid based on the Leitner flashcard system
 EAPI=6
 HOMEPAGE=http://homepages.ihug.co.nz/~trmusson/programs.html#ignuit
 IUSE=examples
-KEYWORDS=amd64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=app-text/dvipng >=app-text/gnome-doc-utils-0.3.2 dev-libs/glib:2 dev-libs/libxml2:2 >=dev-libs/libxslt-1.1.28 >=gnome-base/libgnomeui-2.24.5 >=gnome-base/gconf-3.2.6:2 gnome-base/libglade:2.0 >=media-libs/gstreamer-0.10.36:0.10 x11-libs/gtk+:2 x11-libs/pango virtual/latex-base
 SLOT=0
 SRC_URI=http://homepages.ihug.co.nz/~trmusson/stuff/ignuit-2.24.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:gnome2 src_compile:gnome2 src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=953bc447cc4ae2346966e5ed0219017a
+_md5_=16bf99c848981b3cf4a7ff8965bef38f
diff --git a/metadata/md5-cache/app-misc/uptimed-0.4.0 b/metadata/md5-cache/app-misc/uptimed-0.4.0
index 079355b2435a..6b6c886027da 100644
--- a/metadata/md5-cache/app-misc/uptimed-0.4.0
+++ b/metadata/md5-cache/app-misc/uptimed-0.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=System uptime record daemon that keeps track of your highest uptimes
 EAPI=6
 HOMEPAGE=https://github.com/rpodgorny/uptimed/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/rpodgorny/uptimed/archive/v0.4.0.tar.gz -> uptimed-0.4.0.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=e38185030aa5581ce3a61ade7057fa73
+_md5_=6615f305a9a0c49d16d37e24a10435c8
diff --git a/metadata/md5-cache/app-office/lyx-2.1.5 b/metadata/md5-cache/app-office/lyx-2.1.5
index 7be4a35cc06c..32e4b457453b 100644
--- a/metadata/md5-cache/app-office/lyx-2.1.5
+++ b/metadata/md5-cache/app-office/lyx-2.1.5
@@ -4,7 +4,7 @@ DESCRIPTION=WYSIWYM frontend for LaTeX, DocBook, etc.
 EAPI=5
 HOMEPAGE=http://www.lyx.org/
 IUSE=cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant linguas_ar linguas_ca linguas_cs linguas_de linguas_da linguas_el linguas_en linguas_es linguas_eu linguas_fi linguas_fr linguas_gl linguas_he linguas_hu linguas_ia linguas_id linguas_it linguas_ja linguas_nb linguas_nn linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW X python_targets_python2_7
-KEYWORDS=alpha amd64 hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:4 dev-qt/qtcore:4 >=dev-libs/boost-1.34:= >=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(+)] dev-texlive/texlive-fontsextra || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) cups? ( net-print/cups ) latex? ( app-text/texlive app-text/ghostscript-gpl app-text/noweb app-text/dvipng dev-tex/dvipost dev-tex/chktex app-text/ps2eps dev-texlive/texlive-latexextra dev-texlive/texlive-pictures dev-texlive/texlive-science dev-texlive/texlive-genericextra dev-texlive/texlive-fontsrecommended || ( dev-tex/latex2html dev-tex/tth dev-tex/hevea dev-tex/tex4ht[java] ) ) html? ( dev-tex/html2latex ) rtf? ( dev-tex/latex2rtf app-text/unrtf dev-tex/html2latex ) linguas_he? ( dev-tex/culmus-latex ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) dia? ( app-office/dia ) subversion? ( dev-vcs/subversion ) rcs? ( dev-vcs/rcs ) svg? ( || ( media-gfx/imagemagick[svg] media-gfx/graphicsmagick[svg] ) || ( gnome-base/librsvg media-gfx/inkscape ) ) gnumeric? ( app-office/gnumeric ) hunspell? ( app-text/hunspell ) aspell? ( app-text/aspell ) enchant? ( app-text/enchant )
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/lyx-2.1.5.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.1/lyx-2.1.5/lyx-2.1.5.tar.xz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	font	cd7790315ca5b8c505e1e0513df6acce	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b59ae947e0f452147e97f94856597f93
+_md5_=841648006502c544947fcd125255b3a0
diff --git a/metadata/md5-cache/app-officeext/languagetool-3.4 b/metadata/md5-cache/app-officeext/languagetool-3.4
index af00d1eb7feb..1959d718f284 100644
--- a/metadata/md5-cache/app-officeext/languagetool-3.4
+++ b/metadata/md5-cache/app-officeext/languagetool-3.4
@@ -4,7 +4,7 @@ DESCRIPTION=Style and Grammar Checker for libreoffice
 EAPI=5
 HOMEPAGE=https://www.languagetool.org/
 IUSE=office_implementation_libreoffice office_implementation_openoffice
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.8 office_implementation_libreoffice? ( || ( app-office/libreoffice[java] app-office/libreoffice-bin[java] ) ) office_implementation_openoffice? ( app-office/openoffice-bin[java] )
 REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://www.languagetool.org/download/LanguageTool-3.4.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_=807ecfb528100dde4dbe4d328ff7ad1a
+_md5_=355ce9eec72bf0cd7b497a6cb9603fb7
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.3.2-r1 b/metadata/md5-cache/app-portage/gentoolkit-0.3.2-r1
index 46fccb19145b..241bdce98a9c 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.3.2-r1
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.3.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of administration scripts for Gentoo
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
 IUSE=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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-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 ~x86-fbsd ~x64-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=GPL-2
 RDEPEND=sys-apps/portage[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(-)] !<=app-portage/gentoolkit-dev-0.2.7 sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy? ( virtual/pypy:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),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=http://dev.gentoo.org/~dolsen/releases/gentoolkit/gentoolkit-0.3.2.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	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d2e07c2aab94df5c318a427de27405cf
+_md5_=1d550ecb885ff3c8719d436c15289ba1
diff --git a/metadata/md5-cache/app-shells/fish-2.4.0 b/metadata/md5-cache/app-shells/fish-2.4.0
index 975e4c69e4b6..3864b19e1462 100644
--- a/metadata/md5-cache/app-shells/fish-2.4.0
+++ b/metadata/md5-cache/app-shells/fish-2.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=fish is the Friendly Interactive SHell
 EAPI=6
 HOMEPAGE=http://fishshell.com/
 IUSE=X
-KEYWORDS=amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= sys-devel/bc sys-devel/gettext X? ( x11-misc/xsel )
 SLOT=0
 SRC_URI=http://fishshell.com/files/2.4.0/fish-2.4.0.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_configure:- src_test:-
-_md5_=568ff49dcae5582d69209e5c0f899046
+_md5_=b860ba67382bc676e648de92511b0246
diff --git a/metadata/md5-cache/app-text/aspell-0.60.6.1-r3 b/metadata/md5-cache/app-text/aspell-0.60.6.1-r3
index e6b0d634cf64..7fa5febbf1bc 100644
--- a/metadata/md5-cache/app-text/aspell-0.60.6.1-r3
+++ b/metadata/md5-cache/app-text/aspell-0.60.6.1-r3
@@ -4,7 +4,7 @@ DESCRIPTION=A spell checker replacement for ispell
 EAPI=5
 HOMEPAGE=http://aspell.net/
 IUSE=nls l10n_af linguas_af l10n_be linguas_be l10n_bg linguas_bg l10n_br linguas_br l10n_ca linguas_ca l10n_cs linguas_cs l10n_cy linguas_cy l10n_da linguas_da l10n_de linguas_de l10n_de-1901 linguas_de@1901 l10n_el linguas_el l10n_en linguas_en l10n_eo linguas_eo l10n_es linguas_es l10n_et linguas_et l10n_fi linguas_fi l10n_fo linguas_fo l10n_fr linguas_fr l10n_ga linguas_ga l10n_gl linguas_gl l10n_he linguas_he l10n_hr linguas_hr l10n_hu linguas_hu l10n_hy linguas_hy l10n_is linguas_is l10n_it linguas_it l10n_la linguas_la l10n_lt linguas_lt l10n_nl linguas_nl l10n_no linguas_no l10n_pl linguas_pl l10n_pt linguas_pt l10n_pt-BR linguas_pt_BR l10n_ro linguas_ro l10n_ru linguas_ru l10n_sk linguas_sk l10n_sl linguas_sl l10n_sr linguas_sr l10n_sv linguas_sv l10n_uk linguas_uk l10n_vi linguas_vi
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2
 PDEPEND=app-dicts/aspell-en l10n_af? ( app-dicts/aspell-af ) l10n_be? ( app-dicts/aspell-be ) l10n_bg? ( app-dicts/aspell-bg ) l10n_br? ( app-dicts/aspell-br ) l10n_ca? ( app-dicts/aspell-ca ) l10n_cs? ( app-dicts/aspell-cs ) l10n_cy? ( app-dicts/aspell-cy ) l10n_da? ( app-dicts/aspell-da ) l10n_de? ( app-dicts/aspell-de ) l10n_de-1901? ( app-dicts/aspell-de-alt ) l10n_el? ( app-dicts/aspell-el ) l10n_en? ( app-dicts/aspell-en ) l10n_eo? ( app-dicts/aspell-eo ) l10n_es? ( app-dicts/aspell-es ) l10n_et? ( app-dicts/aspell-et ) l10n_fi? ( app-dicts/aspell-fi ) l10n_fo? ( app-dicts/aspell-fo ) l10n_fr? ( app-dicts/aspell-fr ) l10n_ga? ( app-dicts/aspell-ga ) l10n_gl? ( app-dicts/aspell-gl ) l10n_he? ( app-dicts/aspell-he ) l10n_hr? ( app-dicts/aspell-hr ) l10n_hu? ( app-dicts/aspell-hu ) l10n_hy? ( app-dicts/aspell-hy ) l10n_is? ( app-dicts/aspell-is ) l10n_it? ( app-dicts/aspell-it ) l10n_la? ( app-dicts/aspell-la ) l10n_lt? ( app-dicts/aspell-lt ) l10n_nl? ( app-dicts/aspell-nl ) l10n_no? ( app-dicts/aspell-no ) l10n_pl? ( app-dicts/aspell-pl ) l10n_pt? ( app-dicts/aspell-pt ) l10n_pt-BR? ( app-dicts/aspell-pt-br ) l10n_ro? ( app-dicts/aspell-ro ) l10n_ru? ( app-dicts/aspell-ru ) l10n_sk? ( app-dicts/aspell-sk ) l10n_sl? ( app-dicts/aspell-sl ) l10n_sr? ( app-dicts/aspell-sr ) l10n_sv? ( app-dicts/aspell-sv ) l10n_uk? ( app-dicts/aspell-uk ) l10n_vi? ( app-dicts/aspell-vi )
 RDEPEND=>=sys-libs/ncurses-5.2:0= nls? ( virtual/libintl ) !=app-dicts/aspell-en-0.5*
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://gnu/aspell/aspell-0.60.6.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=28987287f7c602f359cd5dc2471e6802
+_md5_=b20fb41d6b70404faef6bc6bd8bb5465
diff --git a/metadata/md5-cache/app-text/convmv-2.0 b/metadata/md5-cache/app-text/convmv-2.0
index b7e07b63ffd1..03ea4125dea9 100644
--- a/metadata/md5-cache/app-text/convmv-2.0
+++ b/metadata/md5-cache/app-text/convmv-2.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=convert filenames to utf8 or any other charset
 EAPI=6
 HOMEPAGE=http://j3e.de/linux/convmv
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=http://j3e.de/linux/convmv/convmv-2.0.tar.gz
 _eclass_exported_funcs=src_prepare:- src_test:- src_install:-
-_md5_=adbe4d1d9493615266db98a729b3b48f
+_md5_=427823f4b0c03f4498bcf36794890495
diff --git a/metadata/md5-cache/app-text/ding-1.8.1 b/metadata/md5-cache/app-text/ding-1.8.1
index fd5cadef1b80..3b770e705ab3 100644
--- a/metadata/md5-cache/app-text/ding-1.8.1
+++ b/metadata/md5-cache/app-text/ding-1.8.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Tk based dictionary (German-English) (incl. dictionary itself)
 EAPI=6
 HOMEPAGE=http://www-user.tu-chemnitz.de/~fri/ding/
-KEYWORDS=amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/tk-8.3
 SLOT=0
 SRC_URI=http://wftp.tu-chemnitz.de/pub/Local/urz/ding/ding-1.8.1.tar.gz
 _eclass_exported_funcs=src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ce493f0825b20dfd9426a9c589f79ac6
+_md5_=fa46fdb59c5c252c730f2650e15c8321
diff --git a/metadata/md5-cache/app-text/libodfgen-0.1.6 b/metadata/md5-cache/app-text/libodfgen-0.1.6
index 1e9541314b37..9fed76072857 100644
--- a/metadata/md5-cache/app-text/libodfgen-0.1.6
+++ b/metadata/md5-cache/app-text/libodfgen-0.1.6
@@ -4,10 +4,10 @@ DESCRIPTION=Library to generate ODF documents from libwpd and libwpg
 EAPI=6
 HOMEPAGE=http://libwpd.sf.net
 IUSE=doc
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-2.1 MPL-2.0 )
 RDEPEND=dev-libs/librevenge
 SLOT=0
 SRC_URI=mirror://sourceforge/libwpd/libodfgen-0.1.6.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
-_md5_=0de17810e811b4c3a258e4207e4cfa5a
+_md5_=1628cddb0fbb203b8b59f534c4e6a126
diff --git a/metadata/md5-cache/app-text/pdfgrep-1.4.1-r1 b/metadata/md5-cache/app-text/pdfgrep-1.4.1-r1
index a0b9dc7a573e..0db99a8602ef 100644
--- a/metadata/md5-cache/app-text/pdfgrep-1.4.1-r1
+++ b/metadata/md5-cache/app-text/pdfgrep-1.4.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A tool similar to grep which searches text in PDFs
 EAPI=5
 HOMEPAGE=http://pdfgrep.org/
 IUSE=+pcre test unac
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/poppler:=[cxx] pcre? ( dev-libs/libpcre[cxx] ) unac? ( app-text/unac )
 SLOT=0
 SRC_URI=https://pdfgrep.org/download/pdfgrep-1.4.1.tar.gz
 _eclass_exported_funcs=src_configure:-
-_md5_=b5e5142049df68a839f0adcba3a8316e
+_md5_=9142e269d7d6fcf28c248639efe8f7a5
diff --git a/metadata/md5-cache/dev-cpp/lucene++-3.0.7 b/metadata/md5-cache/dev-cpp/lucene++-3.0.7
index afc4d5fa8084..a38668e201f3 100644
--- a/metadata/md5-cache/dev-cpp/lucene++-3.0.7
+++ b/metadata/md5-cache/dev-cpp/lucene++-3.0.7
@@ -4,7 +4,7 @@ DESCRIPTION=C++ port of Java Lucene library, a high-performance, full-featured t
 EAPI=5
 HOMEPAGE=https://github.com/luceneplusplus/LucenePlusPlus
 IUSE=debug
-KEYWORDS=amd64 ~hppa ~ppc64 ~x86
+KEYWORDS=amd64 ~hppa ~ppc64 x86
 LICENSE=|| ( LGPL-3 Apache-2.0 )
 RDEPEND=dev-libs/boost:=
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_3.0.7.tar.gz -> lucene++-3.0.7.tar.gz
 _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_=b968b9d4531ddcee6d54b826bfe52bc8
+_md5_=0cc0c4c66123291997c6b7c0a6cd1451
diff --git a/metadata/md5-cache/dev-dotnet/gnome-sharp-2.24.2-r1 b/metadata/md5-cache/dev-dotnet/gnome-sharp-2.24.2-r1
index 5ffb4e7429e0..56212bc3a9fb 100644
--- a/metadata/md5-cache/dev-dotnet/gnome-sharp-2.24.2-r1
+++ b/metadata/md5-cache/dev-dotnet/gnome-sharp-2.24.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=gnome bindings for mono
 EAPI=5
 HOMEPAGE=http://www.mono-project.com/GtkSharp
 IUSE=debug
-KEYWORDS=amd64 ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-dotnet/gtk-sharp-2.12.21:2 gnome-base/gconf gnome-base/libgnomecanvas gnome-base/libgnomeui media-libs/libart_lgpl !dev-dotnet/gnomevfs-sharp !dev-dotnet/gconf-sharp !dev-dotnet/art-sharp
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.2.tar.bz2
 _eclass_exported_funcs=pkg_setup:dotnet src_unpack:base src_prepare:- src_configure:- src_compile:base src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	dotnet	b8788d81fe4ec93fda9fc56fed2981d0	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	mono-env	10809200679bcceefebac9e72bebb6e6	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3392440574ed2a193c213c6d48935eba
+_md5_=88666c70815f0ed94cfd21e9639bdbf5
diff --git a/metadata/md5-cache/dev-dotnet/gtk-sharp-2.12.21 b/metadata/md5-cache/dev-dotnet/gtk-sharp-2.12.21
index 1c6a3e920cce..c266f37a03a9 100644
--- a/metadata/md5-cache/dev-dotnet/gtk-sharp-2.12.21
+++ b/metadata/md5-cache/dev-dotnet/gtk-sharp-2.12.21
@@ -4,7 +4,7 @@ DESCRIPTION=gtk bindings for mono
 EAPI=5
 HOMEPAGE=http://www.mono-project.com/GtkSharp
 IUSE=debug
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/mono-3.0 x11-libs/pango >=dev-libs/glib-2.31 dev-libs/atk x11-libs/gtk+:2 gnome-base/libglade dev-perl/XML-LibXML !dev-dotnet/gtk-sharp-gapi !dev-dotnet/gtk-sharp-docs !dev-dotnet/gtk-dotnet-sharp !dev-dotnet/gdk-sharp !dev-dotnet/glib-sharp !dev-dotnet/glade-sharp !dev-dotnet/pango-sharp !dev-dotnet/atk-sharp
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=2
 SRC_URI=http://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-2.12.21.tar.gz
 _eclass_exported_funcs=pkg_setup:dotnet src_unpack:base src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	dotnet	b8788d81fe4ec93fda9fc56fed2981d0	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	mono-env	10809200679bcceefebac9e72bebb6e6	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=16d3e73cd558e3a9706bb0437395299b
+_md5_=52311ceba0a751173ca9dbb90d281e92
diff --git a/metadata/md5-cache/dev-dotnet/mono-addins-1.0-r1 b/metadata/md5-cache/dev-dotnet/mono-addins-1.0-r1
index 36317e5a62bd..7ce78e7aa1eb 100644
--- a/metadata/md5-cache/dev-dotnet/mono-addins-1.0-r1
+++ b/metadata/md5-cache/dev-dotnet/mono-addins-1.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A generic framework for creating extensible applications
 EAPI=5
 HOMEPAGE=http://www.mono-project.com/Mono.Addins
 IUSE=+gtk
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/mono-3 gtk? ( >=dev-dotnet/gtk-sharp-2.12.21:2 )
 SLOT=0
 SRC_URI=https://github.com/mono/mono-addins/archive/mono-addins-1.0.tar.gz -> mono-addins-1.0.tar.gz
 _eclass_exported_funcs=pkg_setup:dotnet src_prepare:- src_configure:- src_compile:- src_test:autotools-utils src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	dotnet	b8788d81fe4ec93fda9fc56fed2981d0	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	mono-env	10809200679bcceefebac9e72bebb6e6	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2c4296a1abe848a6a38001d888e82b4f
+_md5_=ab225bf80a9632a5e3b8679597a70e32
diff --git a/metadata/md5-cache/dev-dotnet/pe-format-2.1.2-r1 b/metadata/md5-cache/dev-dotnet/pe-format-2.1.2-r1
index d33193c00aee..b81202976816 100644
--- a/metadata/md5-cache/dev-dotnet/pe-format-2.1.2-r1
+++ b/metadata/md5-cache/dev-dotnet/pe-format-2.1.2-r1
@@ -3,11 +3,11 @@ DEPEND=dev-util/desktop-file-utils virtual/pkgconfig
 DESCRIPTION=Intelligent PE executable wrapper for binfmt_misc
 EAPI=6
 HOMEPAGE=https://bitbucket.org/mgorny/pe-format2/
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=!<sys-apps/openrc-0.9.4
 SLOT=0
 SRC_URI=https://www.bitbucket.org/mgorny/pe-format2/downloads/pe-format-2.1.2.tar.bz2
 _eclass_exported_funcs=pkg_postinst:- src_configure:- src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=70ad03420e9ef124e6ecc7cb21fa160f
+_md5_=e3c76dad76418fc0705c120a1d3c2528
diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.6 b/metadata/md5-cache/dev-lang/tcl-8.6.6
index e2f8cf41b1ca..8f878da3db22 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.6.6
+++ b/metadata/md5-cache/dev-lang/tcl-8.6.6
@@ -4,11 +4,11 @@ DESCRIPTION=Tool Command Language
 EAPI=6
 HOMEPAGE=http://www.tcl.tk/
 IUSE=debug +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 ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=tcltk
 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/8.6
 SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.6-src.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3c0287d702d744d30190e22fba3c370c
+_md5_=81e543f12c63b23a0161660ed131ecc3
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.6 b/metadata/md5-cache/dev-lang/tk-8.6.6
index 4f50afceb44e..f8481944a608 100644
--- a/metadata/md5-cache/dev-lang/tk-8.6.6
+++ b/metadata/md5-cache/dev-lang/tk-8.6.6
@@ -4,11 +4,11 @@ DESCRIPTION=Tk Widget Set
 EAPI=6
 HOMEPAGE=http://www.tcl.tk/
 IUSE=debug +threads truetype aqua xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=tcltk
 RDEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-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(-)?] ) ) ~dev-lang/tcl-8.6.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tk8.6.6-src.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=732703b288804d163defb9bf982901fd
+_md5_=41a3349ac55555eb152feaddaead5d6b
diff --git a/metadata/md5-cache/dev-libs/gmime-2.6.20-r3 b/metadata/md5-cache/dev-libs/gmime-2.6.20-r3
index fa5a888655d9..722221500fdb 100644
--- a/metadata/md5-cache/dev-libs/gmime-2.6.20-r3
+++ b/metadata/md5-cache/dev-libs/gmime-2.6.20-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Utilities for creating and parsing messages using MIME
 EAPI=5
 HOMEPAGE=http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/
 IUSE=doc mono smime static-libs vala
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.18:2 sys-libs/zlib mono? ( dev-lang/mono >=dev-dotnet/gtk-sharp-2.12.21:2 ) smime? ( >=app-crypt/gpgme-1.1.6 )
 SLOT=2.6
 SRC_URI=mirror://gnome/sources/gmime/2.6/gmime-2.6.20.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 pkg_setup:- src_unpack:gnome2 src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	mono-env	10809200679bcceefebac9e72bebb6e6	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vala	ca3f1c504058f5de407febddfae73167	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=40f32aac0f2d906ec4cf2d551550ab80
+_md5_=e61700f2a74fd78b46d583506177be0a
diff --git a/metadata/md5-cache/dev-libs/jansson-2.9 b/metadata/md5-cache/dev-libs/jansson-2.9
index bccea156ee95..d2e12052a533 100644
--- a/metadata/md5-cache/dev-libs/jansson-2.9
+++ b/metadata/md5-cache/dev-libs/jansson-2.9
@@ -4,10 +4,10 @@ DESCRIPTION=C library for encoding, decoding and manipulating JSON data
 EAPI=6
 HOMEPAGE=http://www.digip.org/jansson/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://www.digip.org/jansson/releases/jansson-2.9.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=85696cc64cecebd0d8fccc6c96c6fbd4
+_md5_=3c356d7b9a73636e897f33c1baefc4ea
diff --git a/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r3 b/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r3
index 29a3242820e6..e4ce3849fa6b 100644
--- a/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r3
+++ b/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r3
@@ -3,10 +3,10 @@ DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=s
 DESCRIPTION=libmcrypt is a library that provides uniform interface to access several encryption algorithms
 EAPI=5
 HOMEPAGE=http://mcrypt.sourceforge.net/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/mcrypt/libmcrypt-2.5.8.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=e629f59c1a965ab17560464cbd5bcc3a
+_md5_=b3c52894718898dc6a4f9587247d382f
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.9-r1 b/metadata/md5-cache/dev-libs/libtasn1-4.9-r1
index b92117a0efe4..2f05bbe52294 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-4.9-r1
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=ASN.1 library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libtasn1/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r16 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/6
 SRC_URI=mirror://gnu/libtasn1/libtasn1-4.9.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	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=2511b4c7db9cf49effbc10ea0bd44587
+_md5_=93ca68542e6b727b741aed9d6ad8dfd9
diff --git a/metadata/md5-cache/dev-libs/rasqal-0.9.32 b/metadata/md5-cache/dev-libs/rasqal-0.9.32
index 42ed30fafa24..5bce5060f5f0 100644
--- a/metadata/md5-cache/dev-libs/rasqal-0.9.32
+++ b/metadata/md5-cache/dev-libs/rasqal-0.9.32
@@ -4,11 +4,11 @@ DESCRIPTION=library that handles Resource Description Framework (RDF)
 EAPI=5
 HOMEPAGE=http://librdf.org/rasqal/
 IUSE=+crypt gmp kernel_linux +mhash pcre static-libs test xml
-KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/raptor-2.0.14 kernel_linux? ( >=sys-apps/util-linux-2.19 ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) !gmp? ( dev-libs/mpfr ) gmp? ( dev-libs/gmp ) crypt? ( !mhash? ( dev-libs/libgcrypt:0 ) mhash? ( app-crypt/mhash ) )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/rasqal-0.9.32.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=fb23646c52fef21cf859ee8762e5ab5e
+_md5_=17fe4b6a641576d7e63055cc1bcc8406
diff --git a/metadata/md5-cache/dev-lua/luarocks-2.2.0 b/metadata/md5-cache/dev-lua/luarocks-2.2.0
index de09303b56c4..de7a84daa5c2 100644
--- a/metadata/md5-cache/dev-lua/luarocks-2.2.0
+++ b/metadata/md5-cache/dev-lua/luarocks-2.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=A deployment and management system for Lua modules
 EAPI=4
 HOMEPAGE=http://www.luarocks.org
 IUSE=curl openssl
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=MIT
 RDEPEND=dev-lang/lua curl? ( net-misc/curl ) openssl? ( dev-libs/openssl ) app-arch/unzip
 SLOT=0
 SRC_URI=http://luarocks.org/releases/luarocks-2.2.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ca8fe7d2fc8fc9b2776dee19370a9833
+_md5_=027954b788ca62a11c46b9c15c68b36c
diff --git a/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.303.0 b/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.303.0
index a8bf70cbe2d3..f3c222dd3df8 100644
--- a/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.303.0
+++ b/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.303.0
@@ -4,11 +4,11 @@ DESCRIPTION=Internationalizing Domain Names in Applications (IDNA)
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Net-IDN-Encode/
 IUSE=test examples
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Unicode-Normalize dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.303.tar.gz
 _eclass_exported_funcs=src_prepare:perl-module src_configure:perl-module src_compile:perl-module src_test:- src_install:perl-module
 _eclasses_=multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358
-_md5_=a49b25b8a6ba02693823e0e3e6efd3a1
+_md5_=58ffa51ef92bb5b92b6709d228ee0b14
diff --git a/metadata/md5-cache/dev-python/abstract_rendering-0.5.1 b/metadata/md5-cache/dev-python/abstract_rendering-0.5.1
index 39f7accd539b..7f797d90b1a1 100644
--- a/metadata/md5-cache/dev-python/abstract_rendering-0.5.1
+++ b/metadata/md5-cache/dev-python/abstract_rendering-0.5.1
@@ -4,7 +4,7 @@ DESCRIPTION=Rendering as a binning process
 EAPI=5
 HOMEPAGE=https://github.com/ContinuumIO/abstract_rendering http://pypi.python.org/pypi/abstract_rendering
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=uni_indiana
 RDEPEND=dev-python/numpy[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/a/abstract_rendering/abstract_rendering-0.5.1.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b3d0a2d51eff72cea29fdd1ca74bee30
+_md5_=2b33e473824dfbe7466f5c94c8a1d5ff
diff --git a/metadata/md5-cache/dev-python/bokeh-0.11.1 b/metadata/md5-cache/dev-python/bokeh-0.11.1
index 54282c90c65c..d2850b2e3bf2 100644
--- a/metadata/md5-cache/dev-python/bokeh-0.11.1
+++ b/metadata/md5-cache/dev-python/bokeh-0.11.1
@@ -4,7 +4,7 @@ DESCRIPTION=Statistical and novel interactive HTML plots for Python
 EAPI=6
 HOMEPAGE=http://bokeh.pydata.org/ https://github.com/bokeh/bokeh http://pypi.python.org/pypi/bokeh
 IUSE=examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/abstract_rendering[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/colorama-0.2.7[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/flask-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.7[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/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pandas-0.11[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-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.10[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/pyzmq-14.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/redis-py-2.7.6[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-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-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(-)] >=dev-python/werkzeug-0.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=www-servers/tornado-4.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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/b/bokeh/bokeh-0.11.1.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=32ae8530188f31b88fcfc41194d13dcb
+_md5_=1f85287d26f0cb416db8b3224f1e190e
diff --git a/metadata/md5-cache/dev-python/editobj-0.5.7-r2 b/metadata/md5-cache/dev-python/editobj-0.5.7-r2
index fc669b6562ef..1fb78c604451 100644
--- a/metadata/md5-cache/dev-python/editobj-0.5.7-r2
+++ b/metadata/md5-cache/dev-python/editobj-0.5.7-r2
@@ -4,7 +4,7 @@ DESCRIPTION=EditObj can create a dialog box to edit ANY Python object
 EAPI=5
 HOMEPAGE=http://home.gna.org/oomadness/en/editobj/index.html
 IUSE=+examples python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ppc ~x86
+KEYWORDS=amd64 ~ia64 ppc x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) >=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://download.gna.org/songwrite/EditObj-0.5.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_=2b5bbeb029f1620b20d09b7da8bd3d18
+_md5_=06dc358db582fcdb2c0e9d0c762c15bc
diff --git a/metadata/md5-cache/dev-python/flexx-0.3.1 b/metadata/md5-cache/dev-python/flexx-0.3.1
index 9e39a9d0790f..50c995fdda15 100644
--- a/metadata/md5-cache/dev-python/flexx-0.3.1
+++ b/metadata/md5-cache/dev-python/flexx-0.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=Pure Python toolkit for creating GUI's using web technology
 EAPI=5
 HOMEPAGE=http://flexx.readthedocs.org https://github.com/zoofio/flexx http://pypi.python.org/pypi/flexx
 IUSE=python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/f/flexx/flexx-0.3.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	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d3430a876b0150ac194adf205f87726e
+_md5_=7b6b1e6b60b7381e1db3887b9cbcdfba
diff --git a/metadata/md5-cache/dev-python/formencode-1.3.0-r2 b/metadata/md5-cache/dev-python/formencode-1.3.0-r2
index 6203e1dedbe8..82b1553ee3d6 100644
--- a/metadata/md5-cache/dev-python/formencode-1.3.0-r2
+++ b/metadata/md5-cache/dev-python/formencode-1.3.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=HTML form validation, generation, and conversion package
 EAPI=5
 HOMEPAGE=http://formencode.org/ https://pypi.python.org/pypi/FormEncode
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~ia64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=PSF-2
 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/F/FormEncode/FormEncode-1.3.0.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	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c6708b6529322e19a23534a821eb9bf2
+_md5_=fd70670b406645ed32057da1bd68418d
diff --git a/metadata/md5-cache/dev-python/paisley-0.3.1-r1 b/metadata/md5-cache/dev-python/paisley-0.3.1-r1
index f9de259a9b90..cb892700fbfe 100644
--- a/metadata/md5-cache/dev-python/paisley-0.3.1-r1
+++ b/metadata/md5-cache/dev-python/paisley-0.3.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Paisley is a CouchDB client written in Python to be used within a Tw
 EAPI=5
 HOMEPAGE=https://launchpad.net/paisley https://pypi.python.org/pypi/paisley
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=MIT
 RDEPEND=dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-web[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/p/paisley/paisley-0.3.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_=1a5cd2edab6afee75a72acacc54a8123
+_md5_=e7ee7296635767707f31582eb78adf5c
diff --git a/metadata/md5-cache/dev-python/piddle-1.0.15-r1 b/metadata/md5-cache/dev-python/piddle-1.0.15-r1
index 6ab2b151ef8b..f2265da33bf5 100644
--- a/metadata/md5-cache/dev-python/piddle-1.0.15-r1
+++ b/metadata/md5-cache/dev-python/piddle-1.0.15-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Cross-media, cross-platform 2D graphics package
 EAPI=5
 HOMEPAGE=http://piddle.sourceforge.net/
 IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ~x86
+KEYWORDS=amd64 ~ia64 x86
 LICENSE=LGPL-2.1
 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=mirror://sourceforge/piddle/piddle-1.0.15.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_=2e332f1e823db61c6994667364ca352c
+_md5_=c6b109f252fea7a8a6633e999b6f5f8f
diff --git a/metadata/md5-cache/dev-python/py-xmlrpc-0.9 b/metadata/md5-cache/dev-python/py-xmlrpc-0.9
index 5613b1b39f58..0833e803f09f 100644
--- a/metadata/md5-cache/dev-python/py-xmlrpc-0.9
+++ b/metadata/md5-cache/dev-python/py-xmlrpc-0.9
@@ -4,7 +4,7 @@ DESCRIPTION=Fast XML-RPC implementation for Python
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/py-xmlrpc/
 IUSE=examples python_targets_python2_7
-KEYWORDS=alpha amd64 ~ia64 ppc ~sparc ~x86
+KEYWORDS=alpha amd64 ~ia64 ppc ~sparc x86
 LICENSE=LGPL-2.1
 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=mirror://sourceforge/py-xmlrpc/py-xmlrpc-0.9.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=459192cee1688728e469b61876992b86
+_md5_=25472c60fee8de5b0638150f10f66301
diff --git a/metadata/md5-cache/dev-python/pycountry-16.11.8 b/metadata/md5-cache/dev-python/pycountry-16.11.8
index ceeda6b7f1b7..04889038248a 100644
--- a/metadata/md5-cache/dev-python/pycountry-16.11.8
+++ b/metadata/md5-cache/dev-python/pycountry-16.11.8
@@ -4,7 +4,7 @@ DESCRIPTION=Database of countries, subdivisions, languages, currencies and scrip
 EAPI=6
 HOMEPAGE=https://bitbucket.org/flyingcircus/pycountry
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~ia64 ppc ~sparc ~x86
+KEYWORDS=amd64 ~ia64 ppc ~sparc x86
 LICENSE=GPL-2
 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/p/pycountry/pycountry-16.11.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_=3101587b8e9e89e45c2f9b8ada70f6ba
+_md5_=e88ea44d2355f064374ce80f22dec14b
diff --git a/metadata/md5-cache/dev-python/pyemf-2.0.0 b/metadata/md5-cache/dev-python/pyemf-2.0.0
index 79cf3fc8c9ca..e29724ded047 100644
--- a/metadata/md5-cache/dev-python/pyemf-2.0.0
+++ b/metadata/md5-cache/dev-python/pyemf-2.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Pure Python Enhanced Metafile Library
 EAPI=5
 HOMEPAGE=http://pyemf.sf.net/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=dev-python/numpy[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://sourceforge/pyemf/pyemf-2.0.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_=4e20507dab08b14ddc502c4fd8f69edd
+_md5_=55f84c6b11c9aca316e7ac8d256a5d3e
diff --git a/metadata/md5-cache/dev-python/pyid3lib-0.5.1-r2 b/metadata/md5-cache/dev-python/pyid3lib-0.5.1-r2
index 711c32685d94..d7ec24c70877 100644
--- a/metadata/md5-cache/dev-python/pyid3lib-0.5.1-r2
+++ b/metadata/md5-cache/dev-python/pyid3lib-0.5.1-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Module for manipulating ID3 tags in Python
 EAPI=5
 HOMEPAGE=http://pyid3lib.sourceforge.net/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=media-libs/id3lib 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/pyid3lib/pyid3lib-0.5.1.tar.bz2
 _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	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e11fcd5a70e8ff144cf0b3d4612d32b1
+_md5_=64c77824e10ca83d8971c9d481707b39
diff --git a/metadata/md5-cache/dev-python/pylibpcap-0.6.4-r1 b/metadata/md5-cache/dev-python/pylibpcap-0.6.4-r1
index eb2f0e3caea0..fccbc1d94410 100644
--- a/metadata/md5-cache/dev-python/pylibpcap-0.6.4-r1
+++ b/metadata/md5-cache/dev-python/pylibpcap-0.6.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Python interface to libpcap
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/pylibpcap/
 IUSE=examples python_targets_python2_7
-KEYWORDS=amd64 ~hppa ~ia64 ~x86
+KEYWORDS=amd64 ~hppa ~ia64 x86
 LICENSE=BSD
 RDEPEND=net-libs/libpcap 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/pylibpcap/pylibpcap-0.6.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_=8f889c36d23271b6f976790ea6436a2f
+_md5_=45637ce7217734772899d8f2be95286f
diff --git a/metadata/md5-cache/dev-python/pyminuit-1.2.1-r1 b/metadata/md5-cache/dev-python/pyminuit-1.2.1-r1
index 99797f27aa1e..cc6dd9871d68 100644
--- a/metadata/md5-cache/dev-python/pyminuit-1.2.1-r1
+++ b/metadata/md5-cache/dev-python/pyminuit-1.2.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Minuit numerical function minimization in Python
 EAPI=5
 HOMEPAGE=https://github.com/jpivarski/pyminuit
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 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://pyminuit.googlecode.com/files/pyminuit-1.2.1.tgz https://pyminuit.googlecode.com/files/Minuit-1_7_9-patch1.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:- src_compile:- 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_=e5dbf826e19924e7b3bf1c3091a266a9
+_md5_=b32ef4675507e5b8cd72e48a0fd12eba
diff --git a/metadata/md5-cache/dev-python/pyndex-0.3.2a-r1 b/metadata/md5-cache/dev-python/pyndex-0.3.2a-r1
index db864df6d1c8..8d34b2278a6c 100644
--- a/metadata/md5-cache/dev-python/pyndex-0.3.2a-r1
+++ b/metadata/md5-cache/dev-python/pyndex-0.3.2a-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Simple and fast Python full-text indexer (aka search engine) using M
 EAPI=5
 HOMEPAGE=http://www.divmod.org/Pyndex/index.html
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-db/metakit-2.4.9.2[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(+)]
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/pyndex/Pyndex-0.3.2a.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b06af46288e940b0d1cd71cf3e57e620
+_md5_=14c692cd35f55208a2339a6d55e73650
diff --git a/metadata/md5-cache/dev-python/pyosd-0.2.14-r1 b/metadata/md5-cache/dev-python/pyosd-0.2.14-r1
index 793e00f0ecce..c017ba9e01d2 100644
--- a/metadata/md5-cache/dev-python/pyosd-0.2.14-r1
+++ b/metadata/md5-cache/dev-python/pyosd-0.2.14-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Python module for displaying text on your X display, like the 'On Sc
 EAPI=5
 HOMEPAGE=http://ichi2.net/pyosd/
 IUSE=doc examples python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ppc ~x86
+KEYWORDS=amd64 ~ia64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/xosd-2.2.4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://ichi2.net/pyosd/pyosd-0.2.14.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_=7bd18d52a89ee5b5f07f7c6bb11a9c2a
+_md5_=086bafd4310bc5b7a87d52e119dd9732
diff --git a/metadata/md5-cache/dev-python/python-cdb-0.34-r1 b/metadata/md5-cache/dev-python/python-cdb-0.34-r1
index 24c6d33ecc53..be2c56217be6 100644
--- a/metadata/md5-cache/dev-python/python-cdb-0.34-r1
+++ b/metadata/md5-cache/dev-python/python-cdb-0.34-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A Python extension module for cdb
 EAPI=5
 HOMEPAGE=http://pilcrow.madison.wi.us/#pycdb
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 arm ~ia64 ppc ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 arm ~ia64 ppc ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=|| ( dev-db/cdb dev-db/tinycdb ) 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://pilcrow.madison.wi.us/python-cdb/python-cdb-0.34.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_=11fd79c141226e47408dfabe31a5ddb5
+_md5_=a0dae28126b4c94b7321f9d535984f66
diff --git a/metadata/md5-cache/dev-python/sampy-1.2.1 b/metadata/md5-cache/dev-python/sampy-1.2.1
index 283cc5e41b74..a70e8660d414 100644
--- a/metadata/md5-cache/dev-python/sampy-1.2.1
+++ b/metadata/md5-cache/dev-python/sampy-1.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Simple Application Messaging Protocol messaging system implementatio
 EAPI=5
 HOMEPAGE=http://packages.python.org/sampy/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk(+)] ) >=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/s/sampy/sampy-1.2.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_=e5ca294a816c3f139f7f72cd8092f08c
+_md5_=469b146a72cda720bdb17956152cf7f4
diff --git a/metadata/md5-cache/dev-python/virtualenvwrapper-4.7.1 b/metadata/md5-cache/dev-python/virtualenvwrapper-4.7.1
index 886ffbd4e4fa..bf61e7325a1b 100644
--- a/metadata/md5-cache/dev-python/virtualenvwrapper-4.7.1
+++ b/metadata/md5-cache/dev-python/virtualenvwrapper-4.7.1
@@ -4,7 +4,7 @@ DESCRIPTION=Set of extensions to Ian Bicking's virtualenv tool
 EAPI=5
 HOMEPAGE=http://www.doughellmann.com/projects/virtualenvwrapper https://pypi.python.org/pypi/virtualenvwrapper
 IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-0.15-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/virtualenv-clone[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 )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=mirror://pypi/v/virtualenvwrapper/virtualenvwrapper-4.7.1.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_=ad926fa8e09fcd2e0802ee09fed8e833
+_md5_=2b0031df10b106488aa7a226f3b0e8a4
diff --git a/metadata/md5-cache/dev-python/webpy-0.37-r1 b/metadata/md5-cache/dev-python/webpy-0.37-r1
index 0c9b7506c928..3fad59c1cc77 100644
--- a/metadata/md5-cache/dev-python/webpy-0.37-r1
+++ b/metadata/md5-cache/dev-python/webpy-0.37-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A small and simple web framework for Python
 EAPI=5
 HOMEPAGE=http://www.webpy.org https://pypi.python.org/pypi/web.py
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~hppa ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~hppa x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
 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.webpy.org/static/web.py-0.37.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_=f64b282350088c1c411a20a11d7da90a
+_md5_=3674ef5857039d3973e906113f50570d
diff --git a/metadata/md5-cache/dev-python/webut-0.1.0.2-r1 b/metadata/md5-cache/dev-python/webut-0.1.0.2-r1
index be4124ff9fa5..f92735569b24 100644
--- a/metadata/md5-cache/dev-python/webut-0.1.0.2-r1
+++ b/metadata/md5-cache/dev-python/webut-0.1.0.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Miscellaneous utilities for nevow and twisted.web programming
 EAPI=5
 HOMEPAGE=http://www.inoi.fi/open/trac/webut
 IUSE=examples python_targets_python2_7
-KEYWORDS=alpha amd64 ~ia64 ppc ~sparc ~x86
+KEYWORDS=alpha amd64 ~ia64 ppc ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/nevow-0.9.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-core-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/zope-interface-3.0.1[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://debian/pool/main/w/webut/webut_0.1-0.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	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2b822eb164f0acd39ecc463e2946e064
+_md5_=f169059570300c655c0448a28d018b09
diff --git a/metadata/md5-cache/dev-tcltk/itcl-4.0.3 b/metadata/md5-cache/dev-tcltk/itcl-4.0.3
index b3acc72814f2..9e438238daf6 100644
--- a/metadata/md5-cache/dev-tcltk/itcl-4.0.3
+++ b/metadata/md5-cache/dev-tcltk/itcl-4.0.3
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/tcl-8.6:0=
 DESCRIPTION=Object Oriented Enhancements for Tcl/Tk
 EAPI=5
 HOMEPAGE=http://incrtcl.sourceforge.net/
-KEYWORDS=alpha amd64 ~ia64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 ~ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-lang/tcl-8.6:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itcl%204.0.3/itcl4.0.3.tar.gz
 _eclass_exported_funcs=src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3da2246c85fc096aa61a2547b1818163
+_md5_=0159798d29da4938ffa1c9ae3039b542
diff --git a/metadata/md5-cache/dev-tcltk/itk-4.0.1 b/metadata/md5-cache/dev-tcltk/itk-4.0.1
index e8be95235d18..e4234f215088 100644
--- a/metadata/md5-cache/dev-tcltk/itk-4.0.1
+++ b/metadata/md5-cache/dev-tcltk/itk-4.0.1
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/tk-8.6:= =dev-tcltk/itcl-4.0* !<sys-devel/gettext-0.18.1.1-r3
 DESCRIPTION=Object Oriented Enhancements for Tcl/Tk
 EAPI=5
 HOMEPAGE=http://incrtcl.sourceforge.net/
-KEYWORDS=alpha amd64 ~ia64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/tk-8.6:= =dev-tcltk/itcl-4.0*
 SLOT=0
 SRC_URI=mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itk%204.0.1/itk4.0.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1b4ebd1ceb9c2bc0b72f3f75b92c7ab0
+_md5_=0d5e6d0b620addeb51f7a04ed914794b
diff --git a/metadata/md5-cache/dev-tex/rubber-1.4 b/metadata/md5-cache/dev-tex/rubber-1.4
index 97ab9d1d8b85..d78c65e1b264 100644
--- a/metadata/md5-cache/dev-tex/rubber-1.4
+++ b/metadata/md5-cache/dev-tex/rubber-1.4
@@ -4,7 +4,7 @@ DESCRIPTION=A LaTeX wrapper for automatically building documents
 EAPI=5
 HOMEPAGE=https://launchpad.net/rubber/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=virtual/latex-base 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://launchpad.net/rubber/trunk/1.4/+download/rubber-1.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	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=eb3ede2532e156b93c28dd0cc27c8d03
+_md5_=e5fcc5095e350a58516ec55e44a4f38d
diff --git a/metadata/md5-cache/dev-util/a8-1.0 b/metadata/md5-cache/dev-util/a8-1.0
index 358961ce7e57..93537bf1467b 100644
--- a/metadata/md5-cache/dev-util/a8-1.0
+++ b/metadata/md5-cache/dev-util/a8-1.0
@@ -4,7 +4,7 @@ DESCRIPTION=An ultra-lightweight IDE, that embeds Vim, a terminal emulator, and
 EAPI=5
 HOMEPAGE=https://github.com/aliafshar/a8
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-python/dbus-python-1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/logbook[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2.22[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtkhelpers-0.4.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/vte-0.28.2-r206:0[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-editors/gvim app-editors/vim 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/a/a8/a8-1.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- 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	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=aa268ddcc03d669167469a9d97644b03
+_md5_=b5ae231bba9286a1035421d0b8734516
diff --git a/metadata/md5-cache/dev-util/distro-info-0.14 b/metadata/md5-cache/dev-util/distro-info-0.14
index 0260ef3a0851..2c7ae90a7ce3 100644
--- a/metadata/md5-cache/dev-util/distro-info-0.14
+++ b/metadata/md5-cache/dev-util/distro-info-0.14
@@ -4,7 +4,7 @@ DESCRIPTION=Provides information about the Debian distributions' releases
 EAPI=6
 HOMEPAGE=https://debian.org
 IUSE=python test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ISC
 RDEPEND=dev-lang/perl:= python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-util/distro-info-data
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://debian/pool/main/d/distro-info/distro-info_0.14.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0a8bde84e92996a47648569f81537022
+_md5_=f0475b723ba7115cde311a7e93edc7f7
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1
index ea86619b95a8..6a7cd3646d49 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1
@@ -3,11 +3,11 @@ DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
 EAPI=5
 HOMEPAGE=http://developer.nvidia.com/cuda
 IUSE=debugger doc eclipse profiler
-KEYWORDS=-* amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=-* amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=NVIDIA-CUDA
 RDEPEND=<sys-devel/gcc-4.9[cxx] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 ) amd64? ( >=x11-drivers/nvidia-drivers-343.22[uvm] ) x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
 SLOT=0/6.5.19
 SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_32.run )
 _eclass_exported_funcs=pkg_pretend:check-reqs pkg_postinst:- pkg_setup:- src_unpack:- src_prepare:- src_install:-
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cuda	e8857dd1a7c161259295205ce0220046	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3a32d47d0af14448f5ceb82d5e72fb7d
+_md5_=2f09da69a76a9d194d358283bd6ced79
diff --git a/metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1 b/metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1
index 874a86e393ca..d3b89ca3e060 100644
--- a/metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1
+++ b/metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Convert a CVS repository to a Subversion repository
 EAPI=6
 HOMEPAGE=http://cvs2svn.tigris.org/
 IUSE=bazaar git test python_targets_python2_7
-KEYWORDS=alpha amd64 ~ia64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-vcs/subversion-1.0.9 bazaar? ( >=dev-vcs/bzr-1.13[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(+)] ) git? ( >=dev-vcs/git-1.5.4.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) dev-vcs/rcs >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://cvs2svn.tigris.org/files/documents/1462/49237/cvs2svn-2.4.0.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:distutils-r1 src_compile:- src_test:distutils-r1 src_install:-
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a38282c88a119595f3ab425c965c60f1
+_md5_=33f632c41445ce0bfee12171a39b0a6c
diff --git a/metadata/md5-cache/dev-vcs/giggle-0.7-r2 b/metadata/md5-cache/dev-vcs/giggle-0.7-r2
index 8dc50526db90..87a36c66a907 100644
--- a/metadata/md5-cache/dev-vcs/giggle-0.7-r2
+++ b/metadata/md5-cache/dev-vcs/giggle-0.7-r2
@@ -4,11 +4,11 @@ DESCRIPTION=GTK+ Frontend for GIT
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/giggle
 IUSE=eds
-KEYWORDS=amd64 ~x86 ~x86-interix ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~x86-interix ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-vcs/git-1.5 >=dev-libs/glib-2.30:2 >=x11-libs/gtk+-3.3.12:3 >=x11-libs/gtksourceview-3.0:3.0 >=x11-libs/gdk-pixbuf-2.22.0 eds? ( gnome-extra/evolution-data-server:= ) >=x11-libs/vte-0.28:2.91
 SLOT=0
 SRC_URI=mirror://gnome/sources/giggle/0.7/giggle-0.7.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=24553459f90a948beb9c731440018453
+_md5_=05f799bbec5cebe51e70069981d3ee89
diff --git a/metadata/md5-cache/games-arcade/blobwars-2.00 b/metadata/md5-cache/games-arcade/blobwars-2.00
index 9ae0cbb12dce..0924430f58fc 100644
--- a/metadata/md5-cache/games-arcade/blobwars-2.00
+++ b/metadata/md5-cache/games-arcade/blobwars-2.00
@@ -3,11 +3,11 @@ DEPEND=media-libs/libsdl2 media-libs/sdl2-mixer media-libs/sdl2-ttf media-libs/s
 DESCRIPTION=Platform game about a blob and his quest to rescue MIAs from an alien invader
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/blobwars/ https://sourceforge.net/apps/mediawiki/blobwars/index.php?title=Main_Page
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD CC-BY-SA-3.0 CC-BY-3.0 GPL-2 LGPL-2.1 fairuse public-domain
 RDEPEND=media-libs/libsdl2 media-libs/sdl2-mixer media-libs/sdl2-ttf media-libs/sdl2-image media-libs/sdl2-net sys-libs/zlib virtual/libintl
 SLOT=0
 SRC_URI=mirror://sourceforge/blobwars/blobwars-2.00.tar.gz
 _eclass_exported_funcs=pkg_preinst:xdg pkg_postrm:xdg pkg_postinst:xdg src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=67bcb1ab01e2385be84b31b62df2e181
+_md5_=9c0610beb9f603502c835ad0d8f25d8e
diff --git a/metadata/md5-cache/games-board/pychess-0.12.4 b/metadata/md5-cache/games-board/pychess-0.12.4
index 36cf9e400541..022a04ab85dd 100644
--- a/metadata/md5-cache/games-board/pychess-0.12.4
+++ b/metadata/md5-cache/games-board/pychess-0.12.4
@@ -4,7 +4,7 @@ DESCRIPTION=A chess client for Gnome
 EAPI=6
 HOMEPAGE=http://pychess.org/
 IUSE=gstreamer python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome-base/librsvg:2 x11-libs/gtksourceview:3.0 x11-libs/pango x11-themes/adwaita-icon-theme gstreamer? ( dev-python/gst-python:1.0 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) 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=http://pychess.org/download/pychess-0.12.4.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:distutils-r1 src_compile:- 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_=cd146d5800924e2cb0c9862c682866ee
+_md5_=dd6e6dfcfc94a9be09f0f619542a85b7
diff --git a/metadata/md5-cache/games-emulation/snes9x-1.54.1 b/metadata/md5-cache/games-emulation/snes9x-1.54.1
index 104b4859ae07..fb6189b9aea8 100644
--- a/metadata/md5-cache/games-emulation/snes9x-1.54.1
+++ b/metadata/md5-cache/games-emulation/snes9x-1.54.1
@@ -4,7 +4,7 @@ DESCRIPTION=Super Nintendo Entertainment System (SNES) emulator
 EAPI=6
 HOMEPAGE=https://github.com/snes9xgit/snes9x
 IUSE=alsa debug gtk joystick multilib netplay nls opengl oss png pulseaudio portaudio +xv +xrandr
-KEYWORDS=amd64 ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP
 RDEPEND=sys-libs/zlib[minizip] x11-libs/libX11 x11-libs/libXext png? ( >=media-libs/libpng-1.2.43:0 ) gtk? ( >=x11-libs/gtk+-2.10:2 x11-misc/xdg-utils portaudio? ( >=media-libs/portaudio-19_pre ) joystick? ( >=media-libs/libsdl-1.2.12[joystick] ) opengl? ( virtual/opengl ) xv? ( x11-libs/libXv ) xrandr? ( x11-libs/libXrandr ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) )
 RESTRICT=bindist
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/snes9xgit/snes9x/archive/1.54.1.tar.gz -> snes9x-1.54.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=728e18213b338390002e84f665511b93
+_md5_=7c95dc40d7b1b4157b2bba5c79415dfb
diff --git a/metadata/md5-cache/games-strategy/galaxyhack-1.74 b/metadata/md5-cache/games-strategy/galaxyhack-1.74
index aed17a95559b..1eb65e6c68c3 100644
--- a/metadata/md5-cache/games-strategy/galaxyhack-1.74
+++ b/metadata/md5-cache/games-strategy/galaxyhack-1.74
@@ -3,11 +3,11 @@ DEPEND=media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/sdl-mixer[m
 DESCRIPTION=Multiplayer AI script based strategy game
 EAPI=5
 HOMEPAGE=http://galaxyhack.sourceforge.net/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 galaxyhack
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/sdl-mixer[mod,vorbis] >=dev-libs/boost-1.34 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/galaxyhack/galaxyhack-1.74.tar.bz2 mirror://gentoo/galaxyhack.png
 _eclass_exported_funcs=pkg_preinst:games pkg_postinst:- pkg_setup:games src_unpack:base src_prepare:- src_configure:games src_compile:games src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	games	2cf0d67d765e6358b435ccda30c13ad8	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=266f78577c2fb9a8d99fa45384b71642
+_md5_=4b67db178febc70737877bcaaf0fdc7b
diff --git a/metadata/md5-cache/gnome-extra/gnome-commander-1.6.1 b/metadata/md5-cache/gnome-extra/gnome-commander-1.6.1
index 4296dfa89429..c99ddb84d9a8 100644
--- a/metadata/md5-cache/gnome-extra/gnome-commander-1.6.1
+++ b/metadata/md5-cache/gnome-extra/gnome-commander-1.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=A graphical, full featured, twin-panel file manager
 EAPI=6
 HOMEPAGE=http://gcmd.github.io/
 IUSE=chm exif gsf pdf python taglib samba test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/gnome-doc-utils >=dev-libs/glib-2.44.0:2 >=dev-libs/libunique-0.9.3:1 gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.8.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) python? ( >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-commander/1.6/gnome-commander-1.6.1.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:- pkg_setup:python-single-r1 src_prepare:gnome2 src_configure:- 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_=c10276b967b8323a3a6c0a2792253bc9
+_md5_=e7cfe6db0091d8e791e8ed4c40461eea
diff --git a/metadata/md5-cache/kde-apps/kopete-16.12.0 b/metadata/md5-cache/kde-apps/kopete-16.12.0
index 3f527bfbfa28..597fce12c1a1 100644
--- a/metadata/md5-cache/kde-apps/kopete-16.12.0
+++ b/metadata/md5-cache/kde-apps/kopete-16.12.0
@@ -4,7 +4,7 @@ DESCRIPTION=KDE multi-protocol IM client
 EAPI=6
 HOMEPAGE=https://kopete.kde.org https://www.kde.org/applications/internet/kopete
 IUSE=debug ssl v4l +addbookmarks +autoreplace +contactnotes +highlight +history latex +nowlistening otr +pipes +privacy +statistics +texteffect +translator +urlpicpreview webpresence gadu groupwise jingle meanwhile oscar skype testbed winpopup +xmpp yahoo zeroconf +handbook aqua
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.3:4[aqua=] dev-libs/libpcre >=dev-qt/qtgui-4.4.0:4[mng] media-libs/phonon[qt4] media-libs/qimageblitz kde-frameworks/kdelibs:4[zeroconf?] !aqua? ( x11-libs/libX11 x11-libs/libXScrnSaver ) gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt4(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0 >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt4(+)] dev-libs/qjson net-dns/libidn sys-libs/zlib ) yahoo? ( media-libs/jasper ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) ssl? ( app-crypt/qca:2[ssl] ) winpopup? ( net-fs/samba ) !kde-base/kopete:4 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kopete-16.12.0.tar.xz
 _eclass_exported_funcs=pkg_preinst:kde4-base pkg_postrm:kde4-base pkg_postinst:- pkg_setup:kde4-base src_unpack:kde4-base src_prepare:kde4-base src_configure:- src_compile:kde4-base src_test:kde4-base src_install:kde4-base
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	958da2c50ab906e72cd6fc7c77146404	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a2cae24284f40fa0e20dde2dac70db4b
+_md5_=e034611944d6e1d1a4da1f59b1075532
diff --git a/metadata/md5-cache/mail-client/alpine-2.00-r7 b/metadata/md5-cache/mail-client/alpine-2.00-r7
index b57f72c9922f..d29658ade489 100644
--- a/metadata/md5-cache/mail-client/alpine-2.00-r7
+++ b/metadata/md5-cache/mail-client/alpine-2.00-r7
@@ -4,11 +4,11 @@ DESCRIPTION=alpine is an easy to use text-based based mail and news client
 EAPI=6
 HOMEPAGE=http://www.washington.edu/alpine/ http://patches.freeiz.com/alpine/
 IUSE=doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads +chappa
-KEYWORDS=alpha amd64 ~ia64 ppc ~sparc ~x86
+KEYWORDS=alpha amd64 ~ia64 ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=virtual/pam >=net-libs/c-client-2007f-r4[chappa=] >=sys-libs/ncurses-5.1:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ldap? ( net-nds/openldap ) kerberos? ( app-crypt/mit-krb5 ) spell? ( app-text/aspell ) app-misc/mime-types !onlyalpine? ( !mail-client/pine ) !<=net-mail/uw-imap-2004g
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/alpine/alpine-2.00.tar.bz2 chappa? ( http://patches.freeiz.com/alpine/patches/alpine-2.00/all.patch.gz -> alpine-2.00-chappa-115-all.patch.gz )
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=46e767a4832cb8d006a87d4cdf803244
+_md5_=cc18d90c7e25b9267b5b26afba73c1f9
diff --git a/metadata/md5-cache/media-gfx/darktable-2.0.6 b/metadata/md5-cache/media-gfx/darktable-2.0.6
index e8bd65372a6e..925ead5989dd 100644
--- a/metadata/md5-cache/media-gfx/darktable-2.0.6
+++ b/metadata/md5-cache/media-gfx/darktable-2.0.6
@@ -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= ) x11-themes/gtk-engines:2 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.6/darktable-2.0.6.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_=9e87a24693559330c636645f64415758
+_md5_=909d6da2d51493d5864452d3f35870a7
diff --git a/metadata/md5-cache/media-gfx/gnofract4d-3.14-r1 b/metadata/md5-cache/media-gfx/gnofract4d-3.14-r1
index 43bb669e9a14..7b858bc0764d 100644
--- a/metadata/md5-cache/media-gfx/gnofract4d-3.14-r1
+++ b/metadata/md5-cache/media-gfx/gnofract4d-3.14-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A program for drawing beautiful mathematically-based images known as
 EAPI=5
 HOMEPAGE=http://gnofract4d.sourceforge.net/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=x11-libs/gtk+:2 >=media-libs/libpng-1.4 virtual/jpeg >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gconf-2[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://sourceforge/gnofract4d/gnofract4d-3.14.tar.gz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:-
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=56549fda69f38b0e740b15f7abaf1f74
+_md5_=15c34f63dd2e05b462de39cedeafb9a5
diff --git a/metadata/md5-cache/media-gfx/luminance-hdr-2.4.0 b/metadata/md5-cache/media-gfx/luminance-hdr-2.4.0
index da9271627e7f..3bd6cf6ae742 100644
--- a/metadata/md5-cache/media-gfx/luminance-hdr-2.4.0
+++ b/metadata/md5-cache/media-gfx/luminance-hdr-2.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Luminance HDR is a graphical user interface that provides a workflow
 EAPI=5
 HOMEPAGE=http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR
 IUSE=cpu_flags_x86_sse2 fits openmp test linguas_cs linguas_de linguas_es linguas_fi linguas_fr linguas_hi linguas_hu linguas_id linguas_it linguas_pl linguas_ro linguas_ru linguas_sk linguas_tr linguas_zh
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 >=media-gfx/exiv2-0.14:0= media-libs/lcms:2 media-libs/libpng:0= >=media-libs/libraw-0.13.4:= media-libs/ilmbase:= >=media-libs/openexr-1.2.2-r2:= >=media-libs/tiff-3.8.2-r2:0 sci-libs/fftw:3.0[threads] fits? ( sci-libs/ccfits ) sci-libs/gsl virtual/jpeg:0
 SLOT=0
 SRC_URI=mirror://sourceforge/qtpfsgui/luminance-hdr-2.4.0.tar.bz2
 _eclass_exported_funcs=pkg_pretend:- 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	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1f61dd79c4726687aadc97aed93ef342
+_md5_=2e81ac6987cbf4ba618b1484246a4589
diff --git a/metadata/md5-cache/media-gfx/mirage-0.9.5.2-r1 b/metadata/md5-cache/media-gfx/mirage-0.9.5.2-r1
index 6ffcb9d4fb23..9d4b973d2194 100644
--- a/metadata/md5-cache/media-gfx/mirage-0.9.5.2-r1
+++ b/metadata/md5-cache/media-gfx/mirage-0.9.5.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A fast and simple image viewer based on python and GTK+
 EAPI=5
 HOMEPAGE=http://mirageiv.berlios.de/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~arm ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=x11-libs/libX11 >=dev-python/pygtk-2.12:2[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://gentoo/mirage-0.9.5.2.tar.bz2
 _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_=cad8db86e02d73c507cf4507b1572bb4
+_md5_=2592b210995776ea943cfe67165a632e
diff --git a/metadata/md5-cache/media-gfx/mypaint-1.1.0-r2 b/metadata/md5-cache/media-gfx/mypaint-1.1.0-r2
index 5a44c337baf0..928038313648 100644
--- a/metadata/md5-cache/media-gfx/mypaint-1.1.0-r2
+++ b/metadata/md5-cache/media-gfx/mypaint-1.1.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=fast and easy graphics application for digital painters
 EAPI=5
 HOMEPAGE=http://mypaint.intilinux.com/
 IUSE=linguas_cs linguas_de linguas_en_CA linguas_en_GB linguas_es linguas_fr linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_nb linguas_nn_NO linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sl linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW python_targets_python2_7
-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/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.4[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-libs/protobuf[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-libs/json-c-0.11:= media-libs/lcms:2 media-libs/libpng:0= >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://download.gna.org/mypaint/mypaint-1.1.0.tar.bz2
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	scons-utils	d42c1726f481bb5812cc2ce1f236db1d	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ae51c8b148ae2a3f741d30be820f52b9
+_md5_=eceb9fb59aa608976a1edcb37806da2c
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.25-r1 b/metadata/md5-cache/media-gfx/sane-backends-1.0.25-r1
index 33659c035f1c..8fe976210b87 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.25-r1
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.25-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Scanner Access Now Easy - Backends
 EAPI=5
 HOMEPAGE=http://www.sane-project.org/
 IUSE=doc gphoto2 ipv6 nls snmp systemd threads usb v4l xinetd zeroconf +sane_backends_abaton +sane_backends_agfafocus +sane_backends_apple +sane_backends_artec +sane_backends_artec_eplus48u +sane_backends_as6e +sane_backends_avision +sane_backends_bh +sane_backends_canon +sane_backends_canon630u +sane_backends_canon_dr -sane_backends_canon_pp +sane_backends_cardscan +sane_backends_coolscan +sane_backends_coolscan2 +sane_backends_coolscan3 +sane_backends_dc210 +sane_backends_dc240 +sane_backends_dc25 +sane_backends_dell1600n_net +sane_backends_dmc +sane_backends_epjitsu +sane_backends_epson +sane_backends_epson2 +sane_backends_fujitsu +sane_backends_genesys +sane_backends_gt68xx +sane_backends_hp +sane_backends_hp3500 +sane_backends_hp3900 +sane_backends_hp4200 +sane_backends_hp5400 +sane_backends_hp5590 +sane_backends_hpljm1005 -sane_backends_hpsj5s +sane_backends_hs2p +sane_backends_ibm +sane_backends_kodak +sane_backends_kodakaio +sane_backends_kvs1025 +sane_backends_kvs20xx sane_backends_kvs40xx +sane_backends_leo +sane_backends_lexmark +sane_backends_ma1509 +sane_backends_magicolor +sane_backends_matsushita +sane_backends_microtek +sane_backends_microtek2 +sane_backends_mustek -sane_backends_mustek_pp +sane_backends_mustek_usb sane_backends_mustek_usb2 +sane_backends_nec +sane_backends_net +sane_backends_niash +sane_backends_p5 +sane_backends_pie +sane_backends_pixma +sane_backends_plustek +sane_backends_plustek_pp -sane_backends_pnm +sane_backends_qcam +sane_backends_ricoh +sane_backends_rts8891 +sane_backends_s9036 +sane_backends_sceptre +sane_backends_sharp +sane_backends_sm3600 +sane_backends_sm3840 +sane_backends_snapscan +sane_backends_sp15c +sane_backends_st400 +sane_backends_stv680 +sane_backends_tamarack +sane_backends_teco1 +sane_backends_teco2 +sane_backends_teco3 +sane_backends_test +sane_backends_u12 +sane_backends_umax +sane_backends_umax1220u +sane_backends_umax_pp +sane_backends_xerox_mfp 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 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2 public-domain
 RDEPEND=sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dell1600n_net? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/tiff-3.9.7-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(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-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(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-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(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-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(-)?] ) usb? ( >=virtual/libusb-1-r1: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(-)?] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.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(-)?] ) xinetd? ( sys-apps/xinetd ) snmp? ( net-analyzer/net-snmp ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-fs/udev-114
 REQUIRED_USE=sane_backends_mustek_usb2? ( threads ) sane_backends_kvs40xx? ( threads )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://alioth.debian.org/frs/download.php/file/4146/sane-backends-1.0.25.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- 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	udev	73058269b3e70e34e084fa3981282338	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=12c4b2cdd77f929a3530990038c4ffc2
+_md5_=d4473656d695fef9018b5d10ed720625
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta19 b/metadata/md5-cache/media-libs/libcaca-0.99_beta19
index fe008c4d40bf..c7b2efcc679c 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta19
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta19
@@ -4,7 +4,7 @@ DESCRIPTION=A library that creates colored ASCII-art graphics
 EAPI=5
 HOMEPAGE=http://libcaca.zoy.org/
 IUSE=cxx doc imlib java mono ncurses opengl python ruby slang static-libs test truetype X elibc_FreeBSD ruby_targets_ruby20 elibc_FreeBSD java 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 ~mips ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 ISC LGPL-2.1 WTFPL-2
 RDEPEND=imlib? ( >=media-libs/imlib2-1.4.6-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(-)?] ) mono? ( dev-lang/mono ) ncurses? ( >=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(-)?] ) opengl? ( >=virtual/glu-9.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(-)?] >=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(-)?] >=media-libs/freeglut-2.8.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(-)?] truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) 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(+)] ) ruby? ( ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ) slang? ( >=sys-libs/slang-2.2.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(-)?] ) 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/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=python? ( python_targets_python2_7 ) ruby? ( ruby_targets_ruby20 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta19.tar.gz
 _eclass_exported_funcs=pkg_preinst:java-pkg-opt-2 pkg_setup:- 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	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	mono-env	10809200679bcceefebac9e72bebb6e6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9c5809e5c809a4dd9008c133070ff556
+_md5_=61e25d949eaf6c2737a2400028de6582
diff --git a/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1 b/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1
index f5f13f27bce4..8c0bf42246a9 100644
--- a/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1
+++ b/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=library for manipulating the International Press Telecommunications
 EAPI=5
 HOMEPAGE=http://libiptcdata.sourceforge.net
 IUSE=doc examples nls python python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2
 RDEPEND=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(+)] ) nls? ( virtual/libintl )
 REQUIRED_USE=python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/libiptcdata/libiptcdata-1.0.4.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=730fed09a5c8647280eacb9604c2c261
+_md5_=104f8e3656aa22ad6fdb0b05719396fe
diff --git a/metadata/md5-cache/media-libs/libogg-1.3.2 b/metadata/md5-cache/media-libs/libogg-1.3.2
index 990d0ee7101e..5e7f24c4aa99 100644
--- a/metadata/md5-cache/media-libs/libogg-1.3.2
+++ b/metadata/md5-cache/media-libs/libogg-1.3.2
@@ -3,11 +3,11 @@ DESCRIPTION=the Ogg media file format library
 EAPI=5
 HOMEPAGE=http://xiph.org/ogg/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~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 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.xz
 _eclass_exported_funcs=src_prepare:autotools-multilib src_configure:- src_compile:autotools-multilib src_test:autotools-multilib src_install:autotools-multilib
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=3d67ce735248ad9924a59a7b8e338b98
+_md5_=b472eb83e1a4c7208c652820cb6e1e1a
diff --git a/metadata/md5-cache/media-libs/libpagemaker-0.0.3-r1 b/metadata/md5-cache/media-libs/libpagemaker-0.0.3-r1
index e2ba44192f2f..a545bc6b3dea 100644
--- a/metadata/md5-cache/media-libs/libpagemaker-0.0.3-r1
+++ b/metadata/md5-cache/media-libs/libpagemaker-0.0.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=C++ Library that parses the file format of Aldus/Adobe PageMaker doc
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker
 IUSE=debug doc tools
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libpagemaker/libpagemaker-0.0.3.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
-_md5_=e92ecc843c6525ebf692a4514e07b3d2
+_md5_=2a758c0decfefccbbb0f6da7744b9e39
diff --git a/metadata/md5-cache/media-libs/libpng-1.2.57 b/metadata/md5-cache/media-libs/libpng-1.2.57
index 996e416b1caa..730ecf2669af 100644
--- a/metadata/md5-cache/media-libs/libpng-1.2.57
+++ b/metadata/md5-cache/media-libs/libpng-1.2.57
@@ -4,11 +4,11 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=6
 HOMEPAGE=http://www.libpng.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=libpng
 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(-)?] !=media-libs/libpng-1.2*:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=1.2
 SRC_URI=mirror://sourceforge/libpng/libpng-1.2.57.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d0fc4a8923c49e4d761c15735734e620
+_md5_=6256263e6f784ee41e9d369af8e53c4c
diff --git a/metadata/md5-cache/media-libs/libpng-1.5.28 b/metadata/md5-cache/media-libs/libpng-1.5.28
index 33668dd32aa9..1e7fcc551b79 100644
--- a/metadata/md5-cache/media-libs/libpng-1.5.28
+++ b/metadata/md5-cache/media-libs/libpng-1.5.28
@@ -4,11 +4,11 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=6
 HOMEPAGE=http://www.libpng.org/
 IUSE=apng neon 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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=libpng
 RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !=media-libs/libpng-1.5*:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=1.5
 SRC_URI=mirror://sourceforge/libpng/libpng-1.5.28.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.5.28-apng.patch.gz )
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=a16cc96862ad47e988dd5a44e199553a
+_md5_=fe8d47fa4d5f11153e08256a641b0e8e
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.27 b/metadata/md5-cache/media-libs/libpng-1.6.27
index e0742ed6e3ce..b03908b4389d 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.27
+++ b/metadata/md5-cache/media-libs/libpng-1.6.27
@@ -4,11 +4,11 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=6
 HOMEPAGE=http://www.libpng.org/
 IUSE=apng neon static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-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 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=libpng
 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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/16
 SRC_URI=mirror://sourceforge/libpng/libpng-1.6.27.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.27-apng.patch.gz )
 _eclass_exported_funcs=src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=86ad269299486d09a8ef8e0cc74b4a3a
+_md5_=10cd816163028ab28eb9613bf7e2d081
diff --git a/metadata/md5-cache/media-libs/libvorbis-1.3.5 b/metadata/md5-cache/media-libs/libvorbis-1.3.5
index c2896046a13c..65f02845b87b 100644
--- a/metadata/md5-cache/media-libs/libvorbis-1.3.5
+++ b/metadata/md5-cache/media-libs/libvorbis-1.3.5
@@ -4,11 +4,11 @@ DESCRIPTION=The Ogg Vorbis sound file format library
 EAPI=5
 HOMEPAGE=http://xiph.org/vorbis
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~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 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.xz
 _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_=1bef76ad4bcd670d666a0b6898e83c3d
+_md5_=ce3336b64867a908638816ccc81070da
diff --git a/metadata/md5-cache/media-libs/netpbm-10.70.00 b/metadata/md5-cache/media-libs/netpbm-10.70.00
index ca16e67bdd2d..431727195253 100644
--- a/metadata/md5-cache/media-libs/netpbm-10.70.00
+++ b/metadata/md5-cache/media-libs/netpbm-10.70.00
@@ -4,11 +4,11 @@ DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) f
 EAPI=4
 HOMEPAGE=http://netpbm.sourceforge.net/
 IUSE=doc jbig jpeg jpeg2k png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) png? ( >=media-libs/libpng-1.4:0 ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=mirror://gentoo/netpbm-10.70.00.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=e081659c323f25182a9189d6a085bd81
+_md5_=8ba9969ab1a7402fae48744d6a431a66
diff --git a/metadata/md5-cache/media-libs/portmidi-217-r1 b/metadata/md5-cache/media-libs/portmidi-217-r1
index 32d9d452074b..5b3807e9337b 100644
--- a/metadata/md5-cache/media-libs/portmidi-217-r1
+++ b/metadata/md5-cache/media-libs/portmidi-217-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A library for real time MIDI input and output
 EAPI=5
 HOMEPAGE=http://portmedia.sourceforge.net/
 IUSE=debug doc java python static-libs test-programs python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=media-libs/alsa-lib java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/portmedia/portmidi-src-217.zip
 _eclass_exported_funcs=pkg_preinst:java-pkg-opt-2 pkg_setup:- src_prepare:- src_configure:- src_compile:- src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3eae5339f6db71c7f86749f475179c5e
+_md5_=0c357e4465b94b5fec70c3fcf26d5726
diff --git a/metadata/md5-cache/media-libs/raptor-2.0.14 b/metadata/md5-cache/media-libs/raptor-2.0.14
index 2b8b7f58f4e1..ad73ecc12517 100644
--- a/metadata/md5-cache/media-libs/raptor-2.0.14
+++ b/metadata/md5-cache/media-libs/raptor-2.0.14
@@ -4,11 +4,11 @@ DESCRIPTION=The RDF Parser Toolkit
 EAPI=5
 HOMEPAGE=http://librdf.org/raptor/
 IUSE=+curl debug json static-libs unicode
-KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt curl? ( net-misc/curl ) json? ( dev-libs/yajl ) unicode? ( dev-libs/icu:= ) !media-libs/raptor:0
 SLOT=2
 SRC_URI=http://download.librdf.org/source/raptor2-2.0.14.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_test:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=a814ec3bc25ad85b765059e7a66e5866
+_md5_=17d94d635caa391e2f0de32cd3984c78
diff --git a/metadata/md5-cache/media-libs/slv2-0.6.6-r1 b/metadata/md5-cache/media-libs/slv2-0.6.6-r1
index 85abb610a957..ed6712635598 100644
--- a/metadata/md5-cache/media-libs/slv2-0.6.6-r1
+++ b/metadata/md5-cache/media-libs/slv2-0.6.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A library to make the use of LV2 plugins as simple as possible for a
 EAPI=5
 HOMEPAGE=http://wiki.drobilla.net/SLV2
 IUSE=doc jack
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/redland-1.0.6 jack? ( >=media-sound/jack-audio-connection-kit-0.107.0 ) || ( media-libs/lv2 media-libs/lv2core )
 SLOT=0
 SRC_URI=http://download.drobilla.net/slv2-0.6.6.tar.bz2
 _eclass_exported_funcs=pkg_setup:python-any-r1 src_prepare:- src_configure:- src_compile:waf-utils src_install:waf-utils
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	waf-utils	c21174962af5ca8091b66f58612797ce
-_md5_=02009bba5117b12c037bac0202f35594
+_md5_=3fd3c8a25e21df3280417a8503f82bc6
diff --git a/metadata/md5-cache/media-plugins/mythplugins-0.27.5_p20150627-r4 b/metadata/md5-cache/media-plugins/mythplugins-0.27.5_p20150627-r4
index 144b08701624..2e5122019e61 100644
--- a/metadata/md5-cache/media-plugins/mythplugins-0.27.5_p20150627-r4
+++ b/metadata/md5-cache/media-plugins/mythplugins-0.27.5_p20150627-r4
@@ -4,7 +4,7 @@ DESCRIPTION=Official MythTV plugins
 EAPI=5
 HOMEPAGE=http://www.mythtv.org
 IUSE=mytharchive mythbrowser mythgallery mythgame mythmusic mythnetvision mythnews mythweather mythzoneminder alsa cdda cdr exif fftw hls ieee1394 libass raw theora vorbis xml xvid python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather >=media-tv/mythtv-0.27:=[alsa=,hls=,ieee1394=,libass=,python,theora=,vorbis=,xml=,xvid=] dev-libs/glib:= xml? ( >=dev-libs/libxml2-2.6.0:= ) dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4 dev-libs/openssl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) hls? ( media-libs/faac:= media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) media-libs/freetype:= libass? ( >=media-libs/libass-0.9.11:= ) media-libs/libpng:= theora? ( media-libs/libtheora:= media-libs/libogg:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) virtual/libudev:= ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) x11-libs/libX11:= sys-libs/zlib:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= fftw? ( sci-libs/fftw:= ) sys-apps/util-linux:= mythzoneminder? ( virtual/mysql ) mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/taglib-1.6:= >=media-libs/libvorbis-1.0:= media-libs/libogg:= >=media-sound/lame-3.93.1 virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/Date-Manip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 dev-perl/Image-Size dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) mythbrowser? ( dev-qt/qtwebkit:4 )
 REQUIRED_USE=cdda? ( mythmusic ) cdr? ( mythmusic cdda ) exif? ( mythgallery ) fftw? ( mythmusic ) mythmusic? ( vorbis ) mythnews? ( mythbrowser ) raw? ( mythgallery ) mythnetvision? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/MythTV/mythtv/archive/v0.27.5.tar.gz -> mythtv-0.27.5.tar.gz https://dev.gentoo.org/~rich0/distfiles/mythplugins-0.27.5-9498257571e8158926b60a0eefc74568c4436823.tar.xz
 _eclass_exported_funcs=pkg_setup:python-single-r1 src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=83f63a470408d720e7ce13f074431ef6
+_md5_=9b84a078199c6e7ea6ae1c7602606016
diff --git a/metadata/md5-cache/media-radio/flrig-1.3.27 b/metadata/md5-cache/media-radio/flrig-1.3.27
index 398bb0de045d..5d4dc19f512a 100644
--- a/metadata/md5-cache/media-radio/flrig-1.3.27
+++ b/metadata/md5-cache/media-radio/flrig-1.3.27
@@ -4,11 +4,11 @@ DESCRIPTION=Transceiver control program for Amateur Radio use
 EAPI=5
 HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
 IUSE=nls
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://sourceforge/fldigi/flrig-1.3.27.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=128422dbbcba25bb217068be029e5790
+_md5_=2399fd144deb7cba156a9935f26a0b0c
diff --git a/metadata/md5-cache/media-sound/ario-1.5.1-r1 b/metadata/md5-cache/media-sound/ario-1.5.1-r1
index 02b58626e073..b6913898e8d9 100644
--- a/metadata/md5-cache/media-sound/ario-1.5.1-r1
+++ b/metadata/md5-cache/media-sound/ario-1.5.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=a GTK2 MPD (Music Player Daemon) client inspired by Rythmbox
 EAPI=5
 HOMEPAGE=http://ario-player.sourceforge.net
 IUSE=audioscrobbler dbus debug +idle libnotify nls python taglib zeroconf debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0= dev-libs/libunique:1 dev-libs/libxml2:2 media-libs/libmpdclient net-misc/curl net-libs/gnutls >=x11-libs/gtk+-2.16:2 audioscrobbler? ( net-libs/libsoup:2.4 ) dbus? ( dev-libs/dbus-glib ) libnotify? ( x11-libs/libnotify ) python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) taglib? ( media-libs/taglib ) zeroconf? ( net-dns/avahi )
 SLOT=0
 SRC_URI=mirror://sourceforge/ario-player/ario-1.5.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 pkg_setup:- src_unpack:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=526a79367363d7fc2726d2315edc62ab
+_md5_=475f0700744b721846af05a103fdc7b5
diff --git a/metadata/md5-cache/media-sound/cmus-2.8.0_rc0 b/metadata/md5-cache/media-sound/cmus-2.8.0_rc0
index b51a212c8ab5..654c5cdbeb0d 100644
--- a/metadata/md5-cache/media-sound/cmus-2.8.0_rc0
+++ b/metadata/md5-cache/media-sound/cmus-2.8.0_rc0
@@ -4,7 +4,7 @@ DESCRIPTION=A ncurses based music player with plugin support for many formats
 EAPI=5
 HOMEPAGE=http://cmus.github.io/
 IUSE=aac alsa ao cue cdio cddb discid debug examples ffmpeg +flac jack libsamplerate +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio tremor +unicode +vorbis wavpack
-KEYWORDS=amd64 ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) cue? ( media-libs/libcue ) cdio? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) discid? ( media-libs/libdiscid ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9:0 ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) tremor? ( media-libs/tremor ) !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) wavpack? ( media-sound/wavpack ) pidgin? ( net-im/pidgin dev-python/dbus-python )
 REQUIRED_USE=tremor? ( vorbis ) mp4? ( aac )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/cmus/cmus/archive/v2.8.0-rc0.tar.gz -> cmus-2.8.0_rc0.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_configure:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=68c491c4a7a2a296f2fcf4cc6ea58793
+_md5_=fcfeedcab929243f669c41e3a5d65d9c
diff --git a/metadata/md5-cache/media-sound/mp3splt-gtk-0.9.2-r1 b/metadata/md5-cache/media-sound/mp3splt-gtk-0.9.2-r1
index ee7bf21aa040..6dbfb6d96b1a 100644
--- a/metadata/md5-cache/media-sound/mp3splt-gtk-0.9.2-r1
+++ b/metadata/md5-cache/media-sound/mp3splt-gtk-0.9.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=a GTK+ based utility to split mp3 and ogg files without decoding
 EAPI=6
 HOMEPAGE=http://mp3splt.sourceforge.net
 IUSE=audacious doc gstreamer nls
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=~media-libs/libmp3splt-0.9.2 x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) !audacious? ( dev-libs/dbus-glib ) gstreamer? ( media-libs/gstreamer:1.0 media-plugins/gst-plugins-meta:1.0[mp3] )
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3splt/mp3splt-gtk-0.9.2.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a7cd28c8d01aa467d4fa3f30b3f52ca3
+_md5_=c7e7ba912d855d3c436e6a55dba33f91
diff --git a/metadata/md5-cache/media-sound/quimup-1.4.0 b/metadata/md5-cache/media-sound/quimup-1.4.0
index 612016b92175..846a3400d58e 100644
--- a/metadata/md5-cache/media-sound/quimup-1.4.0
+++ b/metadata/md5-cache/media-sound/quimup-1.4.0
@@ -3,11 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=me
 DESCRIPTION=A Qt4 client for the music player daemon (MPD) written in C++
 EAPI=5
 HOMEPAGE=http://mpd.wikia.com/wiki/Client:Quimup
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=media-libs/libmpdclient-2.3 media-libs/taglib
 SLOT=0
 SRC_URI=mirror://sourceforge/quimup/quimup_1.4.0_src.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d6d026c4996b7a0a8dcba93edafe340e
+_md5_=c2fe044724d47bdbc82af34d6f43b9fc
diff --git a/metadata/md5-cache/media-sound/xmms2-0.8-r4 b/metadata/md5-cache/media-sound/xmms2-0.8-r4
index 29e777fe348c..4c6a2e96a406 100644
--- a/metadata/md5-cache/media-sound/xmms2-0.8-r4
+++ b/metadata/md5-cache/media-sound/xmms2-0.8-r4
@@ -4,7 +4,7 @@ DESCRIPTION=X(cross)platform Music Multiplexing System. Next generation of the X
 EAPI=5
 HOMEPAGE=http://xmms2.org/wiki/Main_Page
 IUSE=aac airplay +alsa ao asf cdda curl cxx ffmpeg flac gvfs ices jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa oss perl phonehome pulseaudio python ruby samba +server sid sndfile speex test valgrind +vorbis vocoder wavpack xml zeroconf python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
-KEYWORDS=alpha amd64 ppc ~x86
+KEYWORDS=alpha amd64 ppc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) gvfs? ( gnome-base/gnome-vfs ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( >=media-sound/jack-audio-connection-kit-0.101.1 ) mac? ( media-sound/mac ) mms? ( virtual/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.2[client] ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.2 ) virtual/rubygems )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/xmms2/xmms2-0.8DrO_o.tar.bz2
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ruby-single	a5e86595177a8998cbb9f794f2bf9700	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=bbe28c7ab790d99f1223f9d1af525af7
+_md5_=46874e063066115ca38478d25f963596
diff --git a/metadata/md5-cache/media-tv/mythtv-0.27.5_p20151025 b/metadata/md5-cache/media-tv/mythtv-0.27.5_p20151025
index 40cb1f299674..0bfe99ce7d49 100644
--- a/metadata/md5-cache/media-tv/mythtv-0.27.5_p20151025
+++ b/metadata/md5-cache/media-tv/mythtv-0.27.5_p20151025
@@ -4,7 +4,7 @@ DESCRIPTION=Homebrew PVR project
 EAPI=5
 HOMEPAGE=http://www.mythtv.org
 IUSE=alsa altivec avahi libass autostart bluray cec crystalhd debug dvb dvd egl fftw +hls ieee1394 jack lcd lirc perl pulseaudio python +theora vaapi vdpau +vorbis +wrapper +xml xmltv +xvid input_devices_joystick python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/freetype-2.0:= >=media-sound/lame-3.93.1 sys-libs/zlib:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXv:= x11-libs/libXrandr:= x11-libs/libXxf86vm:= >=dev-qt/qtcore-4.7.2:4= >=dev-qt/qtdbus-4.7.2:4= >=dev-qt/qtgui-4.7.2:4= >=dev-qt/qtscript-4.7.2:4= >=dev-qt/qtsql-4.7.2:4=[mysql] >=dev-qt/qtopengl-4.7.2:4=[egl?] >=dev-qt/qtwebkit-4.7.2:4= x11-misc/wmctrl:= virtual/mysql virtual/opengl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) avahi? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= sys-fs/udisks:0 ) cec? ( dev-libs/libcec:= ) dvb? ( media-libs/libdvb:= virtual/linuxtv-dvb-headers:= ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:0 ) egl? ( media-libs/mesa:=[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( media-libs/faac:= <media-libs/libvpx-1.5.0:= >=media-libs/x264-0.0.20111220:= ) ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( dev-perl/DBD-mysql dev-perl/Net-UPnP dev-perl/LWP-Protocol-https dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 >=dev-perl/libwww-perl-5 ) pulseaudio? ( media-sound/pulseaudio ) 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(+)] dev-python/mysql-python dev-python/lxml dev-python/urlgrabber ) theora? ( media-libs/libtheora:= media-libs/libogg:= ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau:= ) vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= ) xml? ( >=dev-libs/libxml2-2.6.0:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) !media-tv/mythtv-bindings !x11-themes/mythtv-themes media-libs/taglib:= dev-libs/glib:= media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts x11-apps/xinit autostart? ( net-dialup/mingetty x11-wm/evilwm x11-apps/xset ) dvd? ( media-libs/libdvdcss:= ) xmltv? ( >=media-tv/xmltv-0.5.43 )
 REQUIRED_USE=bluray? ( xml ) python? ( python_targets_python2_7 ) theora? ( vorbis )
@@ -12,4 +12,4 @@ SLOT=0/0.27.5_p20151025
 SRC_URI=https://github.com/MythTV/mythtv/archive/v0.27.5.tar.gz -> mythtv-0.27.5.tar.gz https://dev.gentoo.org/~cardoe/distfiles/mythtv-0.27.5-68e51d6fd4fa25e985b21cb3a5b5ca6fce9aca9d.tar.xz
 _eclass_exported_funcs=pkg_info:- pkg_preinst:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=8ad17cbcdeca8986134d9cb5ad5dfc22
+_md5_=d36d3c71931bf2e80a73ab8ff0c1543b
diff --git a/metadata/md5-cache/media-video/griffith-0.13-r1 b/metadata/md5-cache/media-video/griffith-0.13-r1
index 21f9c61da8b6..b4e31e674953 100644
--- a/metadata/md5-cache/media-video/griffith-0.13-r1
+++ b/metadata/md5-cache/media-video/griffith-0.13-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Movie collection manager
 EAPI=5
 HOMEPAGE=http://www.griffith.cc/
 IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-python/pillow gnome-base/libglade dev-python/pyxml[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/pygtk-2.6.1: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/pygobject: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/sqlalchemy-0.5.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/reportlab-1.19[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=https://launchpad.net/griffith/trunk/0.13/+download/griffith-0.13.tar.gz https://dev.gentoo.org/~hwoarang/distfiles/griffith-extra-artwork-0.9.4.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ee416952c8c980d1487f5e1b6ed37b93
+_md5_=e96d32990b40ad08cb6239f7dde6904f
diff --git a/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401-r1 b/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401-r1
index 58a988fc42a3..d07eb4b41348 100644
--- a/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401-r1
+++ b/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A program which listens to network traffic and picks out images from
 EAPI=5
 HOMEPAGE=http://www.ex-parrot.com/~chris/driftnet/
 IUSE=gtk mp3 suid +filecaps
-KEYWORDS=amd64 ppc -sparc ~x86
+KEYWORDS=amd64 ppc -sparc x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap gtk? ( x11-libs/gtk+:2 virtual/jpeg:0 media-libs/giflib:= media-libs/libpng:= ) mp3? ( media-sound/mpg123 )
 SLOT=0
 SRC_URI=mirror://github/rbu/driftnet/driftnet-0.1.6_p20090401.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d2fbb360200d294485169c0e344c20bc
+_md5_=fa9568d752a5d5c9395db08adca27a2e
diff --git a/metadata/md5-cache/net-analyzer/etherape-0.9.14 b/metadata/md5-cache/net-analyzer/etherape-0.9.14
index b4d6ec8b8b4a..84b3901d06ac 100644
--- a/metadata/md5-cache/net-analyzer/etherape-0.9.14
+++ b/metadata/md5-cache/net-analyzer/etherape-0.9.14
@@ -3,11 +3,11 @@ DEPEND=>=gnome-base/libglade-2.0 >=gnome-base/libgnomeui-2.0 gnome-base/libgnome
 DESCRIPTION=A graphical network monitor for Unix modeled after etherman
 EAPI=6
 HOMEPAGE=http://etherape.sourceforge.net/
-KEYWORDS=amd64 ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=gnome-base/libglade-2.0 >=gnome-base/libgnomeui-2.0 gnome-base/libgnomecanvas[glade] net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/etherape/etherape-0.9.14.tar.gz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:gnome2 src_configure:gnome2 src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d1a54120285e1c826bb1d7a2b182b5eb
+_md5_=9e2392e82875a36b7169a917a949db7e
diff --git a/metadata/md5-cache/net-analyzer/pnp4nagios-0.6.25-r2 b/metadata/md5-cache/net-analyzer/pnp4nagios-0.6.25-r2
index f98ba6f38b20..88aa14c035b9 100644
--- a/metadata/md5-cache/net-analyzer/pnp4nagios-0.6.25-r2
+++ b/metadata/md5-cache/net-analyzer/pnp4nagios-0.6.25-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A performance data analyzer for nagios
 EAPI=5
 HOMEPAGE=http://www.pnp4nagios.org/
 IUSE=apache2
-KEYWORDS=amd64 ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php:*[filter,gd,json,simplexml,xml,zlib] >=net-analyzer/rrdtool-1.2[graph,perl] || ( <net-analyzer/nagios-core-4 net-analyzer/icinga net-analyzer/icinga2 ) virtual/perl-Getopt-Long virtual/perl-Time-HiRes media-fonts/dejavu apache2? ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authz_core,apache2_modules_rewrite] ) apache2? ( =www-servers/apache-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/pnp4nagios/PNP-0.6/pnp4nagios-0.6.25.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=depend.apache	7aeacf4ba074b9aa0047e2ba05c1010f	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=80b0c9364251d9fdd077d5db508cf290
+_md5_=bbac7cdbad835869dd8dfd120ba42869
diff --git a/metadata/md5-cache/net-dialup/rp-pppoe-3.12-r1 b/metadata/md5-cache/net-dialup/rp-pppoe-3.12-r1
index 7eb681e646b5..230945fa3830 100644
--- a/metadata/md5-cache/net-dialup/rp-pppoe-3.12-r1
+++ b/metadata/md5-cache/net-dialup/rp-pppoe-3.12-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A user-mode PPPoE client and server suite for Linux
 EAPI=6
 HOMEPAGE=https://www.roaringpenguin.com/products/pppoe
 IUSE=tk
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86
 LICENSE=GPL-2
 RDEPEND=net-dialup/ppp:= tk? ( dev-lang/tk:= )
 SLOT=0
 SRC_URI=http://www.roaringpenguin.com/files/download/rp-pppoe-3.12.tar.gz ftp://ftp.samba.org/pub/ppp/ppp-2.4.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=b24a244d9bd4e3d4cf8aab9f9c32e14a
+_md5_=e0c1d0d0ef65056772ac93f5b54e0411
diff --git a/metadata/md5-cache/net-im/ejabberd-16.09 b/metadata/md5-cache/net-im/ejabberd-16.09
index 84bce153cdca..65b9adb65f9b 100644
--- a/metadata/md5-cache/net-im/ejabberd-16.09
+++ b/metadata/md5-cache/net-im/ejabberd-16.09
@@ -4,7 +4,7 @@ DESCRIPTION=Robust, scalable and extensible XMPP server
 EAPI=6
 HOMEPAGE=http://www.ejabberd.im/ https://github.com/processone/ejabberd/
 IUSE=captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis riak roster-gw sqlite zlib
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-erlang/cache_tab-1.0.4 >=dev-erlang/esip-1.0.8 >=dev-erlang/fast_tls-1.0.7 >=dev-erlang/fast_xml-1.1.15 >=dev-erlang/fast_yaml-1.0.6 >=dev-erlang/jiffy-0.14.7 >=dev-erlang/lager-3.2.1 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.5 >=dev-erlang/stringprep-1.0.6 >=dev-erlang/stun-1.0.7 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.1 ) nls? ( >=dev-erlang/iconv-1.0.2 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/p1_pam-1.0.0 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.0 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.1.1_p20151111 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.1 ) captcha? ( media-gfx/imagemagick[truetype,png] ) dev-lang/erlang
 REQUIRED_USE=mssql? ( odbc )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=http://www.process-one.net/downloads/ejabberd/16.09/ejabberd-16.09.tgz -> ejabberd-16.09.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_test:rebar src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	rebar	98c3519ff55e51c3d222cde7f9f5d2e9	ssl-cert	b031e94f4c7c34e1d677376b8929821a	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f558868c6977e74de3e9dff7c5b66d1e
+_md5_=0f198971dbaabbf7a013d632631972f1
diff --git a/metadata/md5-cache/net-im/gg-transport-2.2.6 b/metadata/md5-cache/net-im/gg-transport-2.2.6
index 3f16905ac2df..0453146ea81c 100644
--- a/metadata/md5-cache/net-im/gg-transport-2.2.6
+++ b/metadata/md5-cache/net-im/gg-transport-2.2.6
@@ -3,10 +3,10 @@ DEPEND=>=net-im/jabber-base-0.01 >=dev-libs/glib-2.6.4:2 net-dns/libidn >=net-li
 DESCRIPTION=Gadu-Gadu transport for Jabber
 EAPI=6
 HOMEPAGE=https://github.com/Jajcus/jggtrans
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-im/jabber-base-0.01 >=dev-libs/glib-2.6.4:2 net-dns/libidn >=net-libs/libgadu-1.9.0_rc3 dev-libs/expat
 SLOT=0
 SRC_URI=https://github.com/Jajcus/jggtrans/releases/download/v2.2.6/jggtrans-2.2.6.tar.gz
 _eclass_exported_funcs=src_install:-
-_md5_=6e0847fe8e85a7f7ef033768f7f05f3d
+_md5_=d57eb9d574f090bb35d80bbc5372f74c
diff --git a/metadata/md5-cache/net-libs/libmbim-1.14.0 b/metadata/md5-cache/net-libs/libmbim-1.14.0
index 1fa80dd00587..5477623aa9a0 100644
--- a/metadata/md5-cache/net-libs/libmbim-1.14.0
+++ b/metadata/md5-cache/net-libs/libmbim-1.14.0
@@ -4,11 +4,11 @@ DESCRIPTION=Mobile Broadband Interface Model (MBIM) modem protocol helper librar
 EAPI=6
 HOMEPAGE=https://cgit.freedesktop.org/libmbim/
 IUSE=static-libs udev
-KEYWORDS=~alpha amd64 ~arm ~mips ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~mips ~ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.32:2
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libmbim/libmbim-1.14.0.tar.xz
 _eclass_exported_funcs=src_configure:- src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=2d5247df3a56124fb72495a6e784bbd7
+_md5_=78bdbe110216ae039365f25e883df638
diff --git a/metadata/md5-cache/net-libs/qxmpp-0.8.0 b/metadata/md5-cache/net-libs/qxmpp-0.8.0
index 629210f7ab64..af811afcbc8b 100644
--- a/metadata/md5-cache/net-libs/qxmpp-0.8.0
+++ b/metadata/md5-cache/net-libs/qxmpp-0.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=A cross-platform C++ XMPP client library based on the Qt framework
 EAPI=5
 HOMEPAGE=https://code.google.com/p/qxmpp/
 IUSE=debug doc +speex test theora vpx
-KEYWORDS=amd64 ~x86 ~amd64-linux
+KEYWORDS=amd64 x86 ~amd64-linux
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:4 speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) vpx? ( media-libs/libvpx )
 SLOT=0
 SRC_URI=http://download.qxmpp.org/qxmpp-0.8.0.tar.gz
 _eclass_exported_funcs=src_unpack:qt4-r2 src_prepare:- src_configure:- src_compile:qt4-r2 src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=e64f93edbd63e2e8f47ce05e78eff236
+_md5_=cbe675755a011cde3d9d439c7049449a
diff --git a/metadata/md5-cache/net-libs/xrootd-4.4.0 b/metadata/md5-cache/net-libs/xrootd-4.4.0
index 5cc8ff3a440c..9b8c5c1b88a7 100644
--- a/metadata/md5-cache/net-libs/xrootd-4.4.0
+++ b/metadata/md5-cache/net-libs/xrootd-4.4.0
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://xrootd.org/download/v4.4.0/xrootd-4.4.0.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:cmake-utils 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	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=37e32016086afd5787b3b6ac2d567b05
+_md5_=ef3441a758a8f3f05096fd33f9b49302
diff --git a/metadata/md5-cache/net-libs/xrootd-4.5.0 b/metadata/md5-cache/net-libs/xrootd-4.5.0
index 449b9f167dd7..06dff15f8b58 100644
--- a/metadata/md5-cache/net-libs/xrootd-4.5.0
+++ b/metadata/md5-cache/net-libs/xrootd-4.5.0
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://xrootd.org/download/v4.5.0/xrootd-4.5.0.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:cmake-utils src_configure:- src_compile:- src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=93a154365734d26f89ebcdd265dabd18
+_md5_=014a07c6e985594ad312086c0947b7fa
diff --git a/metadata/md5-cache/net-libs/zeromq-4.1.6 b/metadata/md5-cache/net-libs/zeromq-4.1.6
index 1956aab4673d..23b63b72230f 100644
--- a/metadata/md5-cache/net-libs/zeromq-4.1.6
+++ b/metadata/md5-cache/net-libs/zeromq-4.1.6
@@ -4,11 +4,11 @@ DESCRIPTION=A brokerless kernel
 EAPI=6
 HOMEPAGE=http://www.zeromq.org/
 IUSE=pgm static-libs test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=dev-libs/libsodium:= pgm? ( =net-libs/openpgm-5.2.122 )
 SLOT=0/5
 SRC_URI=https://github.com/zeromq/zeromq4-1/releases/download/v4.1.6/zeromq-4.1.6.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_=a4604e72506cac20ef0fce7977bd62f5
+_md5_=557764b803591af41e78186d76939582
diff --git a/metadata/md5-cache/net-misc/hotot-0.9.8.14_p20130514-r1 b/metadata/md5-cache/net-misc/hotot-0.9.8.14_p20130514-r1
index 2d1f25aa8511..c79b9dc5da23 100644
--- a/metadata/md5-cache/net-misc/hotot-0.9.8.14_p20130514-r1
+++ b/metadata/md5-cache/net-misc/hotot-0.9.8.14_p20130514-r1
@@ -4,7 +4,7 @@ DESCRIPTION=lightweight & open source microblogging client
 EAPI=5
 HOMEPAGE=http://hotot.org
 IUSE=chrome kde qt4 python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/dbus-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(+)] qt4? ( dev-qt/qtwebkit:4 kde? ( kde-frameworks/kdelibs:4 ) )
 REQUIRED_USE=|| ( chrome qt4 ) python_targets_python2_7
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/lyricat/Hotot/tarball/ed2ff013 -> hotot-0.9.8.14_p20130514.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_unpack:vcs-snapshot 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	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c1863370d5b36794db0d13cd5fd6c7b0
+_md5_=a7d32b425bc2114c8587e5424500810d
diff --git a/metadata/md5-cache/net-misc/icecast-2.4.3 b/metadata/md5-cache/net-misc/icecast-2.4.3
index b5a75821c90c..3346dfed5be9 100644
--- a/metadata/md5-cache/net-misc/icecast-2.4.3
+++ b/metadata/md5-cache/net-misc/icecast-2.4.3
@@ -4,11 +4,11 @@ DESCRIPTION=Opensource alternative to shoutcast that supports mp3, ogg and aac s
 EAPI=6
 HOMEPAGE=http://www.icecast.org/
 IUSE=kate libressl logrotate +speex +ssl +theora +yp
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxslt dev-libs/libxml2 media-libs/libogg media-libs/libvorbis kate? ( media-libs/libkate ) logrotate? ( app-admin/logrotate ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) yp? ( net-misc/curl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/icecast/icecast-2.4.3.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=0af315c26adaace0f8a890941a4532bf
+_md5_=d57260a1d77a8e1a61592b099a4d030c
diff --git a/metadata/md5-cache/net-misc/pytvshows-0.2-r3 b/metadata/md5-cache/net-misc/pytvshows-0.2-r3
index 542e4f7e75df..17d39f4dba6b 100644
--- a/metadata/md5-cache/net-misc/pytvshows-0.2-r3
+++ b/metadata/md5-cache/net-misc/pytvshows-0.2-r3
@@ -4,7 +4,7 @@ DESCRIPTION=downloads torrents for TV shows from RSS feeds provided by ezrss.it
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/pytvshows/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-python/feedparser[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/pytvshows/pytvshows-0.2.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1aa150fe895ebb191b1eb4369811e075
+_md5_=37df47594cd5ab8cfae6c1fe1a65aa6c
diff --git a/metadata/md5-cache/net-misc/tn5250-0.17.4-r1 b/metadata/md5-cache/net-misc/tn5250-0.17.4-r1
index 56afa8a71389..0985fb67bbe7 100644
--- a/metadata/md5-cache/net-misc/tn5250-0.17.4-r1
+++ b/metadata/md5-cache/net-misc/tn5250-0.17.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Telnet client for the IBM AS/400 that emulates 5250 terminals and pr
 EAPI=6
 HOMEPAGE=http://tn5250.sourceforge.net/
 IUSE=X libressl ssl
-KEYWORDS=amd64 ppc ~sparc ~x86
+KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/tn5250/tn5250-0.17.4.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=715f5bd64d0f14e853e639b77bf9a077
+_md5_=2474e0060d72e3e0486d5f9b7c3d4db8
diff --git a/metadata/md5-cache/net-p2p/bittornado-0.3.18-r4 b/metadata/md5-cache/net-p2p/bittornado-0.3.18-r4
index 880f0ab55d1c..c4951986ab83 100644
--- a/metadata/md5-cache/net-p2p/bittornado-0.3.18-r4
+++ b/metadata/md5-cache/net-p2p/bittornado-0.3.18-r4
@@ -4,7 +4,7 @@ DESCRIPTION=TheShad0w's experimental BitTorrent client
 EAPI=6
 HOMEPAGE=http://www.bittornado.com/
 IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 ~hppa ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 ~hppa ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/pycrypto[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=http://download2.bittornado.com/download/BitTornado-0.3.18.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_=dab62ce355385ccb3b374350fdabe3de
+_md5_=cd7265ab52b6126d86da0e8c5011500e
diff --git a/metadata/md5-cache/net-p2p/nicotine+-1.2.16-r1 b/metadata/md5-cache/net-p2p/nicotine+-1.2.16-r1
index 2134a476d48e..4ee5cfbe844c 100644
--- a/metadata/md5-cache/net-p2p/nicotine+-1.2.16-r1
+++ b/metadata/md5-cache/net-p2p/nicotine+-1.2.16-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A fork of nicotine, a Soulseek client in Python
 EAPI=5
 HOMEPAGE=http://nicotine-plus.sourceforge.net
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
 LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-python/pygtk-2.12[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] gnome-base/librsvg >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/nicotine-plus/nicotine+-1.2.16.tar.bz2
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:- src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:-
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ec497dd595e7fb98ac16183db1bb5dd9
+_md5_=01ea96180fc267eeefe9927c54ea5c15
diff --git a/metadata/md5-cache/net-proxy/dante-1.4.1-r1 b/metadata/md5-cache/net-proxy/dante-1.4.1-r1
index 312b400e15c0..8687da3fafa4 100644
--- a/metadata/md5-cache/net-proxy/dante-1.4.1-r1
+++ b/metadata/md5-cache/net-proxy/dante-1.4.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A free socks4,5 and msproxy implementation
 EAPI=6
 HOMEPAGE=http://www.inet.no/dante/
 IUSE=debug kerberos pam selinux static-libs tcpd upnp
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD GPL-2
 RDEPEND=kerberos? ( virtual/krb5 ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) upnp? ( net-libs/miniupnpc:= ) userland_GNU? ( virtual/shadow ) selinux? ( sec-policy/selinux-dante )
 SLOT=0
 SRC_URI=ftp://ftp.inet.no/pub/socks/dante-1.4.1.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=1449566f87f5910e0c544babce7a6460
+_md5_=4507dfb10b01c8c0d50d7c5900380763
diff --git a/metadata/md5-cache/sci-astronomy/erfa-1.2.0 b/metadata/md5-cache/sci-astronomy/erfa-1.2.0
index f300b7e617df..6fdb946963e9 100644
--- a/metadata/md5-cache/sci-astronomy/erfa-1.2.0
+++ b/metadata/md5-cache/sci-astronomy/erfa-1.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Essential Routines for Fundamental Astronomy
 EAPI=5
 HOMEPAGE=https://github.com/liberfa/erfa
 IUSE=static-libs
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0/1
 SRC_URI=https://github.com/liberfa/erfa/archive/v1.2.0.tar.gz -> erfa-1.2.0.tar.gz
 _eclass_exported_funcs=src_prepare:autotools-utils src_configure:autotools-utils src_compile:autotools-utils src_test:autotools-utils src_install:autotools-utils
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=44bbea7f0648b92f151868017f50cfb6
+_md5_=14f726525ce91a5270cdb026f7f8977f
diff --git a/metadata/md5-cache/sci-biology/biopython-1.68 b/metadata/md5-cache/sci-biology/biopython-1.68
index 9d4be3848155..5c96a467f122 100644
--- a/metadata/md5-cache/sci-biology/biopython-1.68
+++ b/metadata/md5-cache/sci-biology/biopython-1.68
@@ -4,7 +4,7 @@ DESCRIPTION=Python modules for computational molecular biology
 EAPI=6
 HOMEPAGE=http://www.biopython.org/ https://pypi.python.org/pypi/biopython/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=HPND
 RDEPEND=dev-python/matplotlib[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(-)] dev-python/networkx[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(-)] dev-python/numpy[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(-)] dev-python/rdflib[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(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/reportlab[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(-)] media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://www.biopython.org/DIST/biopython-1.68.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_=1fdf6eae5089f209727e2a4e4d64e0de
+_md5_=2d6e484286d13acfee2452276259d598
diff --git a/metadata/md5-cache/sci-biology/rebase-1607 b/metadata/md5-cache/sci-biology/rebase-1607
index 4a64e6ca89a0..740991317930 100644
--- a/metadata/md5-cache/sci-biology/rebase-1607
+++ b/metadata/md5-cache/sci-biology/rebase-1607
@@ -4,11 +4,11 @@ DESCRIPTION=A restriction enzyme database
 EAPI=5
 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-1607.tar.xz
 _eclass_exported_funcs=src_compile:- src_install:-
-_md5_=26b922810c8fec2e2e32b3927c1fc1b1
+_md5_=b878584bd42ced2003765af4aa57a2d6
diff --git a/metadata/md5-cache/sci-calculators/hcalc-1.2-r1 b/metadata/md5-cache/sci-calculators/hcalc-1.2-r1
index c9afbe0109c2..7e65e3ae627d 100644
--- a/metadata/md5-cache/sci-calculators/hcalc-1.2-r1
+++ b/metadata/md5-cache/sci-calculators/hcalc-1.2-r1
@@ -3,11 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXpm sys-devel/make >=dev-util/cmake-3.5.2
 DESCRIPTION=DJ's Hex Calculator
 EAPI=6
 HOMEPAGE=http://www.delorie.com/store/hcalc/ https://github.com/jlec/hcalc
-KEYWORDS=amd64 ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXpm
 SLOT=0
 SRC_URI=mirror://github/jlec/hcalc/hcalc-1.2.tar.xz
 _eclass_exported_funcs=pkg_postinst:- 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_=0287f1ad6c2784ad9a115db09f16b3f8
+_md5_=d41a13617e12c771691d2b3b33cbeb6c
diff --git a/metadata/md5-cache/sci-calculators/hexcalc-1.11-r3 b/metadata/md5-cache/sci-calculators/hexcalc-1.11-r3
index 467052313d23..a1e08beff6ce 100644
--- a/metadata/md5-cache/sci-calculators/hexcalc-1.11-r3
+++ b/metadata/md5-cache/sci-calculators/hexcalc-1.11-r3
@@ -3,11 +3,11 @@ DEPEND=x11-libs/libXaw x11-misc/imake app-text/rman
 DESCRIPTION=A simple hex calculator for X
 EAPI=6
 HOMEPAGE=ftp://ftp.x.org/R5contrib/
-KEYWORDS=amd64 ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXaw
 SLOT=0
 SRC_URI=ftp://ftp.x.org/R5contrib/hexcalc.tar.Z
 _eclass_exported_funcs=src_compile:- src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ba94c44a83044bf8b2625c7787bade57
+_md5_=717041587e0e06398e8c8cd89364c38a
diff --git a/metadata/md5-cache/sci-calculators/qalculate-gtk-0.9.9 b/metadata/md5-cache/sci-calculators/qalculate-gtk-0.9.9
index 48b4bda04325..7a63e1e0d21a 100644
--- a/metadata/md5-cache/sci-calculators/qalculate-gtk-0.9.9
+++ b/metadata/md5-cache/sci-calculators/qalculate-gtk-0.9.9
@@ -4,11 +4,11 @@ DESCRIPTION=Modern multi-purpose calculator
 EAPI=6
 HOMEPAGE=https://qalculate.github.io/
 IUSE=gnome
-KEYWORDS=alpha amd64 ~hppa ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~hppa ppc ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=sci-libs/libqalculate-0.9.9:= x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/Qalculate/qalculate-gtk/releases/download/v0.9.9/qalculate-gtk-0.9.9.tar.gz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst: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	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e800fdc837546c08b32c879e04879c4c
+_md5_=9f050a0bbe25db083f059c1b6e146823
diff --git a/metadata/md5-cache/sci-calculators/speedcrunch-0.11-r2 b/metadata/md5-cache/sci-calculators/speedcrunch-0.11-r2
index 8951407159da..cc5629f96401 100644
--- a/metadata/md5-cache/sci-calculators/speedcrunch-0.11-r2
+++ b/metadata/md5-cache/sci-calculators/speedcrunch-0.11-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Fast and usable calculator for power users
 EAPI=5
 HOMEPAGE=http://speedcrunch.org/
 IUSE=doc linguas_ar_JO linguas_ca_ES linguas_cs_CZ linguas_de_DE linguas_en_GB linguas_en_US linguas_es_AR linguas_es_ES linguas_et_EE linguas_eu_ES linguas_fi_FI linguas_fr_FR linguas_he_IL linguas_hu_HU linguas_id_ID linguas_it_IT linguas_ja_JP linguas_ko_KR linguas_lv_LV linguas_nb_NO linguas_nl_NL linguas_pl_PL linguas_pt_BR linguas_pt_PT linguas_ro_RO linguas_ru_RU linguas_sv_SE linguas_tr_TR linguas_uz_UZ linguas_vi_VN linguas_zh_CN
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:4
 SLOT=0
 SRC_URI=https://github.com/speedcrunch/SpeedCrunch/archive/0.11.tar.gz -> speedcrunch-0.11.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:cmake-utils src_compile:cmake-utils src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cfb7da12dfc73a0aa4ed584589ff4f12
+_md5_=9a901a64bde18bc2601f461008c448bf
diff --git a/metadata/md5-cache/sci-calculators/wcalc-2.5 b/metadata/md5-cache/sci-calculators/wcalc-2.5
index 40d8d6877c13..a29c7326db56 100644
--- a/metadata/md5-cache/sci-calculators/wcalc-2.5
+++ b/metadata/md5-cache/sci-calculators/wcalc-2.5
@@ -4,11 +4,11 @@ DESCRIPTION=A flexible command-line scientific calculator
 EAPI=6
 HOMEPAGE=http://w-calc.sourceforge.net/
 IUSE=readline
-KEYWORDS=amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/w-calc/wcalc-2.5.tar.bz2
 _eclass_exported_funcs=src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=0b7268bfd67b10ed959d078dc79064b9
+_md5_=9ca1a26e0ae722786cbe2dce5b200a98
diff --git a/metadata/md5-cache/sci-chemistry/votca-csg-1.4 b/metadata/md5-cache/sci-chemistry/votca-csg-1.4
index b5a006205abb..9cfaf2a260af 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csg-1.4
+++ b/metadata/md5-cache/sci-chemistry/votca-csg-1.4
@@ -4,7 +4,7 @@ DESCRIPTION=Votca coarse-graining engine
 EAPI=6
 HOMEPAGE=http://www.votca.org
 IUSE=doc examples extras +gromacs hdf5
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-macos
 LICENSE=Apache-2.0
 PDEPEND=extras? ( =sci-chemistry/votca-csgapps-1.4 )
 RDEPEND==sci-libs/votca-tools-1.4 gromacs? ( sci-chemistry/gromacs:= ) hdf5? ( sci-libs/hdf5 ) dev-lang/perl app-shells/bash:*
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/votca/csg/archive/v1.4.tar.gz -> votca-csg-1.4.tar.gz doc? ( https://github.com/votca/csg-manual/releases/download/v1.4/votca-csg-manual-1.4.pdf ) examples? ( https://github.com/votca/csg-tutorials/archive/v1.4.tar.gz -> votca-csg-tutorials-1.4.tar.gz )
 _eclass_exported_funcs=pkg_postinst:- src_unpack:- 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_=7a2806ead29126b5ef70dc7c9a3f5688
+_md5_=b65c6eb6c77d891ddde38c39d94b3db3
diff --git a/metadata/md5-cache/sci-chemistry/votca-csgapps-1.4 b/metadata/md5-cache/sci-chemistry/votca-csgapps-1.4
index cc3f6cb3ee80..cc4006aa66ac 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csgapps-1.4
+++ b/metadata/md5-cache/sci-chemistry/votca-csgapps-1.4
@@ -3,11 +3,11 @@ DEPEND=~sci-chemistry/votca-csg-1.4 dev-util/ninja >=dev-util/cmake-3.5.2
 DESCRIPTION=Extra applications for votca-csg
 EAPI=6
 HOMEPAGE=http://www.votca.org
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=~sci-chemistry/votca-csg-1.4
 SLOT=0
 SRC_URI=https://github.com/votca/csgapps/archive/v1.4.tar.gz -> votca-csgapps-1.4.tar.gz
 _eclass_exported_funcs=src_prepare:cmake-utils src_configure:cmake-utils src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=59a2b57e71d27bf560ec1e92841ac1e4
+_md5_=3a2d45715f9acb81a772ea61d55224fe
diff --git a/metadata/md5-cache/sci-chemistry/votca-xtp-1.4 b/metadata/md5-cache/sci-chemistry/votca-xtp-1.4
index 5be452116b86..020d25ceb754 100644
--- a/metadata/md5-cache/sci-chemistry/votca-xtp-1.4
+++ b/metadata/md5-cache/sci-chemistry/votca-xtp-1.4
@@ -4,11 +4,11 @@ DESCRIPTION=Votca excitation and charge properties module
 EAPI=6
 HOMEPAGE=http://www.votca.org
 IUSE=doc
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND==sci-libs/votca-tools-1.4[sqlite] =sci-chemistry/votca-csg-1.4
 SLOT=0
 SRC_URI=https://github.com/votca/xtp/archive/v1.4.tar.gz -> votca-xtp-1.4.tar.gz doc? ( https://github.com/votca/xtp/releases/download/v1.4/votca-xtp-manual-1.4.pdf )
 _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_=ad77aa294191f68c82bb4c6eb087effc
+_md5_=1a0fd4a968164a3902c533dbe6b72daa
diff --git a/metadata/md5-cache/sci-electronics/gresistor-0.0.2 b/metadata/md5-cache/sci-electronics/gresistor-0.0.2
index 6382654c0534..225d31bf5e81 100644
--- a/metadata/md5-cache/sci-electronics/gresistor-0.0.2
+++ b/metadata/md5-cache/sci-electronics/gresistor-0.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=Translate a resistor color codes into a readable value
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/gresistor/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-3 LGPL-3 )
 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(+)] x11-libs/gtk+:2 gnome-base/libglade:2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/gresistor/gresistor-0.0.2.tar.gz
 _eclass_exported_funcs=pkg_setup:python-single-r1 src_prepare:- src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:-
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3166fa97473537ed3efdd0cc37268293
+_md5_=d1b63f57af678bf2ec41128deed28301
diff --git a/metadata/md5-cache/sci-electronics/kicad-4.0.4 b/metadata/md5-cache/sci-electronics/kicad-4.0.4
index 2280ab5e95b3..9506d0c565e7 100644
--- a/metadata/md5-cache/sci-electronics/kicad-4.0.4
+++ b/metadata/md5-cache/sci-electronics/kicad-4.0.4
@@ -4,7 +4,7 @@ DESCRIPTION=Electronic Schematic and PCB design tools.
 EAPI=5
 HOMEPAGE=http://www.kicad-pcb.org
 IUSE=debug doc examples github i18n libressl minimal +python linguas_bg linguas_ca linguas_cs linguas_de linguas_el linguas_es linguas_fi linguas_fr linguas_hu linguas_it linguas_ja linguas_ko linguas_nl linguas_pl linguas_pt linguas_ru linguas_sk linguas_sl linguas_sv linguas_zh_CN python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ GPL-3+ Boost-1.0
 RDEPEND=x11-libs/wxGTK:3.0[X,opengl] python? ( dev-python/wxpython:3.0[opengl,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(+)] ) >=dev-libs/boost-1.56[nls,threads,python?] github? ( libressl? ( dev-libs/libressl:0 ) !libressl? ( dev-libs/openssl:0 ) ) media-libs/glew:0= media-libs/freeglut media-libs/mesa sys-libs/zlib x11-libs/cairo sci-electronics/electronics-menu
 REQUIRED_USE=python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://launchpad.net/kicad/4.0/4.0.4/+download/kicad-4.0.4.tar.xz !minimal? ( http://downloads.kicad-pcb.org/libraries/kicad-footprints-4.0.4.tar.gz http://downloads.kicad-pcb.org/libraries/kicad-library-4.0.4.tar.gz ) i18n? ( https://github.com/KiCad/kicad-i18n/archive/4.0.4.tar.gz -> kicad-4.0.4-i18n.tar.gz ) https://github.com/twlostow/libcontext/archive/3d92a1a50f4749b5a92131a957c9615473be85b4.tar.gz -> kicad-libcontext.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:- src_unpack:vcs-snapshot src_prepare:- src_configure:- src_compile:- src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0f70305f3f65a524509eccc650116303
+_md5_=61bc09f2ea0016a780a67ef0220f36dd
diff --git a/metadata/md5-cache/sci-electronics/xnec2c-3.5.1 b/metadata/md5-cache/sci-electronics/xnec2c-3.5.1
index 702b6eb0627f..7aad9ade19fd 100644
--- a/metadata/md5-cache/sci-electronics/xnec2c-3.5.1
+++ b/metadata/md5-cache/sci-electronics/xnec2c-3.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=A GTK+ graphical interactive version of nec2c
 EAPI=5
 HOMEPAGE=http://www.qsl.net/5b4az/pages/nec2.html
 IUSE=doc examples
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://www.qsl.net/5b4az/pkg/nec2/xnec2c/xnec2c-3.5.1.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=0748424afcbbd1e56034d939194a63be
+_md5_=5a4df543120f7b01d0da7c6f0bd68543
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.10 b/metadata/md5-cache/sci-geosciences/gpsd-3.10
index 7b137f9852e4..fb9d06b4e77f 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.10
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.10
@@ -4,7 +4,7 @@ DESCRIPTION=GPS daemon and library for USB/serial GPS devices and GPS/mapping cl
 EAPI=5
 HOMEPAGE=http://catb.org/gpsd/
 IUSE=gpsd_protocols_aivdm gpsd_protocols_ashtech gpsd_protocols_earthmate gpsd_protocols_evermore gpsd_protocols_fury gpsd_protocols_fv18 gpsd_protocols_garmin gpsd_protocols_garmintxt gpsd_protocols_geostar gpsd_protocols_gpsclock gpsd_protocols_itrax gpsd_protocols_mtk3301 gpsd_protocols_navcom gpsd_protocols_nmea gpsd_protocols_nmea2000 gpsd_protocols_ntrip gpsd_protocols_oceanserver gpsd_protocols_oncore gpsd_protocols_rtcm104v2 gpsd_protocols_rtcm104v3 gpsd_protocols_sirf gpsd_protocols_superstar2 gpsd_protocols_tnt gpsd_protocols_tripmate gpsd_protocols_tsip gpsd_protocols_ublox bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X python_targets_python2_7
-KEYWORDS=amd64 ~arm ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=X? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ncurses? ( sys-libs/ncurses:= ) bluetooth? ( net-wireless/bluez ) usb? ( virtual/libusb:1 ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ntp? ( || ( net-misc/ntp net-misc/chrony ) ) qt4? ( dev-qt/qtgui:4 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) python? ( || ( python_targets_python2_7 ) )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.10.tar.gz
 _eclass_exported_funcs=pkg_preinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	scons-utils	d42c1726f481bb5812cc2ce1f236db1d	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	73058269b3e70e34e084fa3981282338	user	80aaa71614ced86f02ee1a513821dc87	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=dab2db1eef47af411873b990f7dfa6c3
+_md5_=87ddeec63ea76b06e23c5e40728e5edd
diff --git a/metadata/md5-cache/sci-libs/atlas-3.10.2 b/metadata/md5-cache/sci-libs/atlas-3.10.2
index 6fe00853fda2..bba27f4a16d2 100644
--- a/metadata/md5-cache/sci-libs/atlas-3.10.2
+++ b/metadata/md5-cache/sci-libs/atlas-3.10.2
@@ -4,11 +4,11 @@ DESCRIPTION=Automatically Tuned Linear Algebra Software
 EAPI=6
 HOMEPAGE=http://math-atlas.sourceforge.net/
 IUSE=doc fortran generic lapack static-libs threads
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=mirror://sourceforge/math-atlas/atlas3.10.2.tar.bz2 fortran? ( lapack? ( http://www.netlib.org/lapack/lapack-3.6.0.tgz ) )
 _eclass_exported_funcs=pkg_setup:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=116f90c0d48fcc4e4318a4eba328e87d
+_md5_=03416a0f590645e88a66f3381ea273e8
diff --git a/metadata/md5-cache/sci-libs/ccfits-2.4-r1 b/metadata/md5-cache/sci-libs/ccfits-2.4-r1
index 143aed5e14c0..3349d26e0f45 100644
--- a/metadata/md5-cache/sci-libs/ccfits-2.4-r1
+++ b/metadata/md5-cache/sci-libs/ccfits-2.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=C++ interface for cfitsio
 EAPI=6
 HOMEPAGE=http://heasarc.gsfc.nasa.gov/fitsio/CCfits/
 IUSE=doc static-libs
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=sci-libs/cfitsio-3.080
 SLOT=0
 SRC_URI=http://heasarc.gsfc.nasa.gov/fitsio/CCfits//CCfits-2.4.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=c3db59d1d2900b3532cd5c68ab02899f
+_md5_=79ea52ddcd4d151a52973d700c00d4d0
diff --git a/metadata/md5-cache/sci-libs/cqrlib-1.1.3 b/metadata/md5-cache/sci-libs/cqrlib-1.1.3
index 5c2ae98e6aa6..4f5a2825039e 100644
--- a/metadata/md5-cache/sci-libs/cqrlib-1.1.3
+++ b/metadata/md5-cache/sci-libs/cqrlib-1.1.3
@@ -3,11 +3,11 @@ DEPEND=dev-libs/cvector
 DESCRIPTION=Utility library for quaternion arithmetic / rotation math (ANSI C implemented)
 EAPI=6
 HOMEPAGE=http://cqrlib.sourceforge.net/
-KEYWORDS=amd64 ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/cvector
 SLOT=0
 SRC_URI=mirror://sourceforge/cqrlib/CQRlib-1.1.3.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_test:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=8304850380df487311216398ef9f2412
+_md5_=026a1b37fb456ee470fba89faca18dc9
diff --git a/metadata/md5-cache/sci-libs/libqalculate-0.9.9 b/metadata/md5-cache/sci-libs/libqalculate-0.9.9
index 50e98c67f0d7..84eaba7bd5ba 100644
--- a/metadata/md5-cache/sci-libs/libqalculate-0.9.9
+++ b/metadata/md5-cache/sci-libs/libqalculate-0.9.9
@@ -4,10 +4,10 @@ DESCRIPTION=A modern multi-purpose calculator library
 EAPI=6
 HOMEPAGE=https://qalculate.github.io/
 IUSE=gnuplot readline static-libs
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 >=sci-libs/cln-1.2 sys-libs/zlib readline? ( sys-libs/readline:0= ) net-misc/wget gnuplot? ( >=sci-visualization/gnuplot-3.7 )
 SLOT=0/6
 SRC_URI=https://github.com/Qalculate/libqalculate/releases/download/v0.9.9/libqalculate-0.9.9.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
-_md5_=5e975943a6361c950226d02d300eac15
+_md5_=5708cbfcc96c0d406d8678fcfa26f3fe
diff --git a/metadata/md5-cache/sci-libs/neartree-5.1.1 b/metadata/md5-cache/sci-libs/neartree-5.1.1
index 0e812f93cbf5..e86cb17ae16e 100644
--- a/metadata/md5-cache/sci-libs/neartree-5.1.1
+++ b/metadata/md5-cache/sci-libs/neartree-5.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Function library efficiently solving the Nearest Neighbor Problem
 EAPI=6
 HOMEPAGE=http://neartree.sourceforge.net/
 IUSE=static-libs
-KEYWORDS=amd64 ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/cvector
 SLOT=0
 SRC_URI=mirror://sourceforge/neartree/NearTree-5.1.1.tar.gz -> neartree-5.1.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_=58a637b2fe78ab9c6350a50c57a81d14
+_md5_=ea866b91bc303a46a4d0f3270356442f
diff --git a/metadata/md5-cache/sci-libs/nlopt-2.4.2-r1 b/metadata/md5-cache/sci-libs/nlopt-2.4.2-r1
index 59662fbdd2ec..5ecb4f8bc95b 100644
--- a/metadata/md5-cache/sci-libs/nlopt-2.4.2-r1
+++ b/metadata/md5-cache/sci-libs/nlopt-2.4.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Non-linear optimization library
 EAPI=5
 HOMEPAGE=http://ab-initio.mit.edu/nlopt/
 IUSE=cxx guile octave python static-libs python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 MIT
 RDEPEND=guile? ( dev-scheme/guile:* ) octave? ( sci-mathematics/octave ) python? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://ab-initio.mit.edu/nlopt//nlopt-2.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=b162df1697921fea562cfc4ed03a8bc1
+_md5_=00a2df1e899a15357b7677d62f17f087
diff --git a/metadata/md5-cache/sci-libs/votca-tools-1.4 b/metadata/md5-cache/sci-libs/votca-tools-1.4
index e3bff99f59fb..d80040fcffc3 100644
--- a/metadata/md5-cache/sci-libs/votca-tools-1.4
+++ b/metadata/md5-cache/sci-libs/votca-tools-1.4
@@ -4,11 +4,11 @@ DESCRIPTION=Votca tools library
 EAPI=6
 HOMEPAGE=http://www.votca.org
 IUSE=doc +fftw +gsl sqlite
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/boost:= dev-libs/expat fftw? ( sci-libs/fftw:3.0 ) gsl? ( sci-libs/gsl ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=https://github.com/votca/tools/archive/v1.4.tar.gz -> votca-tools-1.4.tar.gz
 _eclass_exported_funcs=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	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=16d7616025e599255e96660c39caeb86
+_md5_=f7dc91a59ab029a512a032c5793d0bae
diff --git a/metadata/md5-cache/sci-libs/vtk-6.1.0-r3 b/metadata/md5-cache/sci-libs/vtk-6.1.0-r3
index eaa77f499c73..7fcb0c2c800b 100644
--- a/metadata/md5-cache/sci-libs/vtk-6.1.0-r3
+++ b/metadata/md5-cache/sci-libs/vtk-6.1.0-r3
@@ -4,7 +4,7 @@ DESCRIPTION=The Visualization Toolkit
 EAPI=5
 HOMEPAGE=http://www.vtk.org/
 IUSE=all-modules aqua boost cg doc examples imaging ffmpeg gdal java json kaapi mpi mysql odbc offscreen postgres python qt4 rendering smp tbb test theora tk tcl video_cards_nvidia views web xdmf2 R +X elibc_FreeBSD java python_targets_python2_7 test
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=BSD LGPL-2
 RDEPEND=dev-libs/expat dev-libs/jsoncpp dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 media-libs/libpng:0 media-libs/mesa media-libs/libtheora media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl >=x11-libs/gl2ps-1.3.8 x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( >=dev-libs/boost-1.40.0[mpi?] ) cg? ( media-gfx/nvidia-cg-toolkit ) examples? ( dev-qt/qtcore:4 dev-qt/qtgui:4 sci-libs/vtkdata ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jre-1.5:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[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(+)] ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) 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(+)] dev-python/sip[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(+)] ) ) qt4? ( dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4 dev-qt/qtwebkit:4 python? ( dev-python/PyQt4[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(+)] ) ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) web? ( >=app-admin/webapp-config-1.50.15 python? ( dev-python/autobahn[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/twisted-core[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/zope-interface[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(+)] ) ) xdmf2? ( sci-libs/xdmf2 ) R? ( dev-lang/R ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=all-modules? ( python xdmf2 ) java? ( qt4 ) python? ( python_targets_python2_7 ) tcl? ( rendering ) smp? ( ^^ ( kaapi tbb ) ) test? ( python ) tk? ( tcl ) web? ( python ) ^^ ( X aqua offscreen )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=http://www.vtk.org/files/release/6.1/VTK-6.1.0.tar.gz doc? ( http://www.vtk.org/files/release/6.1/vtkDocHtml-6.1.0.tar.gz ) test? ( http://www.vtk.org/files/release/6.1/VTKData-6.1.0.tar.gz http://www.vtk.org/files/release/6.1/VTKLargeData-6.1.0.tar.gz )
 _eclass_exported_funcs=pkg_prerm:- pkg_preinst:java-pkg-opt-2 pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:cmake-utils src_test:- src_install:-
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=ec202dc0f0f636469a9c07e1e8549a3b
+_md5_=88e93ec5e65b0922315f171e770bac36
diff --git a/metadata/md5-cache/sci-mathematics/jags-4.2.0 b/metadata/md5-cache/sci-mathematics/jags-4.2.0
index 8a7cce2ff76a..19a1268639c6 100644
--- a/metadata/md5-cache/sci-mathematics/jags-4.2.0
+++ b/metadata/md5-cache/sci-mathematics/jags-4.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Just Another Gibbs Sampler for Bayesian MCMC simulation
 EAPI=6
 HOMEPAGE=http://mcmc-jags.sourceforge.net/
 IUSE=doc
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/blas virtual/lapack
 SLOT=0
 SRC_URI=mirror://sourceforge/project/mcmc-jags/JAGS/4.x/Source/JAGS-4.2.0.tar.gz
 _eclass_exported_funcs=src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=7429c7d856eca20d0e18d2c7c0532d46
+_md5_=7453479bb6e7a6d180fa05c6dae46208
diff --git a/metadata/md5-cache/sci-mathematics/pspp-0.10.1 b/metadata/md5-cache/sci-mathematics/pspp-0.10.1
index a0ede22451bd..3dd8b518adca 100644
--- a/metadata/md5-cache/sci-mathematics/pspp-0.10.1
+++ b/metadata/md5-cache/sci-mathematics/pspp-0.10.1
@@ -4,11 +4,11 @@ DESCRIPTION=Program for statistical analysis of sampled data
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/pspp/pspp.html
 IUSE=cairo doc emacs examples gtk ncurses nls perl postgres static-libs
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/libxml2:2= sci-libs/gsl:0= sys-devel/gettext:0= sys-libs/readline:0= sys-libs/zlib:0= virtual/libiconv cairo? ( x11-libs/cairo:0=[svg] ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:3= x11-libs/gtksourceview:3.0= ) ncurses? ( sys-libs/ncurses:0= ) postgres? ( dev-db/postgresql:=[server] )
 SLOT=0/0.10.1
 SRC_URI=mirror://gnu/pspp/pspp-0.10.1.tar.gz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_configure:- src_compile:- src_install:-
 _eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=75be6d42dfd2fe7fd99266934b906d2d
+_md5_=dfa53ff629665687184348d699ce12fc
diff --git a/metadata/md5-cache/sci-mathematics/snns-4.3-r2 b/metadata/md5-cache/sci-mathematics/snns-4.3-r2
index 72a11a9d3661..4fb5ddef20f8 100644
--- a/metadata/md5-cache/sci-mathematics/snns-4.3-r2
+++ b/metadata/md5-cache/sci-mathematics/snns-4.3-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Stuttgart Neural Network Simulator
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/snns/
 IUSE=X doc python python_targets_python2_7
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXaw3d x11-libs/libXt ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://www.ra.cs.uni-tuebingen.de/downloads/SNNS/SNNSv4.3.tar.gz doc? ( http://www.ra.cs.uni-tuebingen.de/downloads/SNNS/SNNSv4.2.Manual.pdf )
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- 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_=cc7e0d75c703f0fa37df8c48251958f9
+_md5_=de8b2a69e5c8fba39e1423293d178576
diff --git a/metadata/md5-cache/sci-mathematics/xmds-2.2.2 b/metadata/md5-cache/sci-mathematics/xmds-2.2.2
index 88ce71cf1c9e..21449f873305 100644
--- a/metadata/md5-cache/sci-mathematics/xmds-2.2.2
+++ b/metadata/md5-cache/sci-mathematics/xmds-2.2.2
@@ -4,7 +4,7 @@ DESCRIPTION=XMDS - The eXtensible Multi-Dimensional Simulator
 EAPI=6
 HOMEPAGE=http://www.xmds.org
 IUSE=doc examples mpi python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=sci-libs/fftw-3.3.1:3.0=[mpi?] mpi? ( virtual/mpi ) dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mpmath[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/h5py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/atlas sci-libs/hdf5 sci-libs/gsl 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/xmds/xmds-2.2.2.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	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b6d0fed6cb78413420430a8bb42b0c8b
+_md5_=a3453146d700cf1e6eae197ea47c76f7
diff --git a/metadata/md5-cache/sci-visualization/gwyddion-2.44 b/metadata/md5-cache/sci-visualization/gwyddion-2.44
index f42f447b4148..4d0b91b4a76e 100644
--- a/metadata/md5-cache/sci-visualization/gwyddion-2.44
+++ b/metadata/md5-cache/sci-visualization/gwyddion-2.44
@@ -4,7 +4,7 @@ DESCRIPTION=Framework for Scanning Mode Microscopy data analysis
 EAPI=5
 HOMEPAGE=http://gwyddion.net/
 IUSE=doc fits fftw gnome kde nls opengl perl python ruby sourceview xml X python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXmu x11-libs/pango fits? ( sci-libs/cfitsio ) fftw? ( sci-libs/fftw:3.0 ) gnome? ( gnome-base/gconf:2 ) kde? ( kde-frameworks/kdelibs:4 ) opengl? ( virtual/opengl x11-libs/gtkglext ) perl? ( dev-lang/perl ) 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(+)] 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(+)] ) ruby? ( dev-ruby/narray ) sourceview? ( x11-libs/gtksourceview:2.0 ) xml? ( dev-libs/libxml2:2 )
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://gwyddion.net/download/2.44/gwyddion-2.44.tar.xz
 _eclass_exported_funcs=pkg_prerm:- pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:autotools-utils src_configure:- src_compile:autotools-utils src_test:autotools-utils src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3be29e0eda94c7f7745cb76752d5b7b9
+_md5_=67295ba8118c246fd453d77702c8b9db
diff --git a/metadata/md5-cache/sys-apps/bleachbit-1.12 b/metadata/md5-cache/sys-apps/bleachbit-1.12
index 74c4a4ecf3e5..5f476fca8c1c 100644
--- a/metadata/md5-cache/sys-apps/bleachbit-1.12
+++ b/metadata/md5-cache/sys-apps/bleachbit-1.12
@@ -4,7 +4,7 @@ DESCRIPTION=Clean junk to free disk space and to maintain privacy
 EAPI=6
 HOMEPAGE=https://www.bleachbit.org
 IUSE=+gtk nls python_targets_python2_7 linguas_ar linguas_ast linguas_be linguas_bg linguas_bn linguas_bs linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_AU linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_gl linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_it linguas_ja linguas_ko linguas_ku linguas_ky linguas_lt linguas_lv linguas_ms linguas_my linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt_BR linguas_pt linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sr linguas_sv linguas_ta linguas_te linguas_th linguas_tr linguas_ug linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( dev-python/pygtk: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=mirror://sourceforge/bleachbit/bleachbit-1.12.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	l10n	e26ea0642846685782f1813642e7ff0f	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=889fa9657317af15e9263fc263a4c2c0
+_md5_=7446be68bd0064d4b74ebe91b8413172
diff --git a/metadata/md5-cache/sys-apps/cpuid-20151017 b/metadata/md5-cache/sys-apps/cpuid-20151017
index e3cde14415ef..db783b2c01db 100644
--- a/metadata/md5-cache/sys-apps/cpuid-20151017
+++ b/metadata/md5-cache/sys-apps/cpuid-20151017
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Utility to get detailed information about the CPU(s) using the CPUID instruction
 EAPI=5
 HOMEPAGE=http://www.etallen.com/cpuid.html
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.etallen.com/cpuid/cpuid-20151017.src.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=30ff1b3c44636c2feb155aec5adbeb0d
+_md5_=414eab509e4e6f11e5afed36fa9ace5e
diff --git a/metadata/md5-cache/sys-apps/dstat-0.7.3 b/metadata/md5-cache/sys-apps/dstat-0.7.3
index 6b1c27529e85..5c15d8ebd32c 100644
--- a/metadata/md5-cache/sys-apps/dstat-0.7.3
+++ b/metadata/md5-cache/sys-apps/dstat-0.7.3
@@ -3,11 +3,11 @@ DESCRIPTION=Versatile replacement for vmstat, iostat and ifstat
 EAPI=6
 HOMEPAGE=http://dag.wieers.com/home-made/dstat/
 IUSE=wifi doc examples python_targets_python2_7
-KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=wifi? ( net-wireless/python-wifi )
 SLOT=0
 SRC_URI=https://github.com/dagwieers/dstat/archive/0.7.3.tar.gz -> dstat-0.7.3.tar.gz
 _eclass_exported_funcs=src_install:-
 _eclasses_=multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=6c3c0319f5ef2662cc1ff5250744cf25
+_md5_=744399383c91cb71564096dc3bc0578f
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-3.1.1-r1 b/metadata/md5-cache/sys-apps/i2c-tools-3.1.1-r1
index 93d781646347..ae0d1eada6ae 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-3.1.1-r1
+++ b/metadata/md5-cache/sys-apps/i2c-tools-3.1.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=I2C tools for bus probing, chip dumping, register-level access helpe
 EAPI=5
 HOMEPAGE=http://www.lm-sensors.org/wiki/I2CTools
 IUSE=python python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=!<sys-apps/lm_sensors-3 python? ( 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(-)] )
 SLOT=0
 SRC_URI=http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-3.1.1.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _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_=31ce2d166caae7d3e79384523b9b606d
+_md5_=ed3ae8d375a3f05c6398c2e383ff991f
diff --git a/metadata/md5-cache/sys-apps/paludis-2.6.0 b/metadata/md5-cache/sys-apps/paludis-2.6.0
index 4e48df858a7b..8fe38a2170c7 100644
--- a/metadata/md5-cache/sys-apps/paludis-2.6.0
+++ b/metadata/md5-cache/sys-apps/paludis-2.6.0
@@ -4,7 +4,7 @@ DESCRIPTION=paludis, the other package mangler
 EAPI=5
 HOMEPAGE=http://paludis.exherbo.org/
 IUSE=doc pbins pink python ruby search-index test +xml python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=GPL-2 vim
 PDEPEND=app-eselect/eselect-package-manager
 RDEPEND=>=app-admin/eselect-1.2.13 >=app-shells/bash-3.2:0 dev-libs/libpcre[cxx] sys-apps/file pbins? ( >=app-arch/libarchive-3.1.2 ) 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(+)] >=dev-libs/boost-1.41.0[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(+)] ) ruby? ( dev-lang/ruby:2.1 ) search-index? ( >=dev-db/sqlite-3 ) xml? ( >=dev-libs/libxml2-2.6 ) sys-apps/sandbox
@@ -14,4 +14,4 @@ SLOT=0
 SRC_URI=http://paludis.exherbo.org/download/paludis-2.6.0.tar.bz2
 _eclass_exported_funcs=pkg_pretend:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_test:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=27bfd14c2c365855baab3bbb309641b0
+_md5_=c95334f41912a05040f321cd1ff2748f
diff --git a/metadata/md5-cache/sys-apps/shadow-4.2.1-r2 b/metadata/md5-cache/sys-apps/shadow-4.2.1-r2
index f93e627138ba..64fc1065ad04 100644
--- a/metadata/md5-cache/sys-apps/shadow-4.2.1-r2
+++ b/metadata/md5-cache/sys-apps/shadow-4.2.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Utilities to deal with user accounts
 EAPI=5
 HOMEPAGE=http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/
 IUSE=acl audit cracklib nls pam selinux skey xattr linguas_cs linguas_da linguas_de linguas_es linguas_fi linguas_fr linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_pl linguas_pt_BR linguas_ru linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=acl? ( sys-apps/acl ) audit? ( sys-process/audit ) cracklib? ( >=sys-libs/cracklib-2.7-r3 ) pam? ( virtual/pam ) skey? ( sys-auth/skey ) selinux? ( >=sys-libs/libselinux-1.28 sys-libs/libsemanage ) nls? ( virtual/libintl ) xattr? ( sys-apps/attr ) pam? ( >=sys-auth/pambase-20150213 )
 SLOT=0
 SRC_URI=http://pkg-shadow.alioth.debian.org/releases/shadow-4.2.1.tar.xz
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- 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_=7b060a73e657135562f91413821bc23e
+_md5_=43a2c0abdd6dd59dc97f6b31ed80a1ce
diff --git a/metadata/md5-cache/sys-block/seekwatcher-0.12_p20091015-r1 b/metadata/md5-cache/sys-block/seekwatcher-0.12_p20091015-r1
index 13c329524aa9..6f50b639b9e6 100644
--- a/metadata/md5-cache/sys-block/seekwatcher-0.12_p20091015-r1
+++ b/metadata/md5-cache/sys-block/seekwatcher-0.12_p20091015-r1
@@ -4,7 +4,7 @@ DESCRIPTION=generates graphs from blktrace to help visualize IO patterns and per
 EAPI=6
 HOMEPAGE=http://oss.oracle.com/~mason/seekwatcher/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-block/blktrace-0.0.20070730162628 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 ) || ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/seekwatcher-0.12_p20091015.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_=77a98fb5528cad25d820ed22b96cbf38
+_md5_=de451d08beb14b954344cfe1da08e25f
diff --git a/metadata/md5-cache/sys-boot/refind-0.10.4-r2 b/metadata/md5-cache/sys-boot/refind-0.10.4-r2
index c261465f58f4..f690b1e2ab9c 100644
--- a/metadata/md5-cache/sys-boot/refind-0.10.4-r2
+++ b/metadata/md5-cache/sys-boot/refind-0.10.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=The rEFInd UEFI Boot Manager by Rod Smith
 EAPI=6
 HOMEPAGE=http://www.rodsbooks.com/refind/
 IUSE=btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs -gnuefi doc -custom-cflags
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD GPL-2 GPL-3 FDL-1.3
 SLOT=0
 SRC_URI=mirror://sourceforge/project/refind/0.10.4/refind-src-0.10.4.tar.gz
 _eclass_exported_funcs=pkg_pretend:- pkg_postinst:- pkg_setup:- src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=064a974c434c35c7c7e6eadd6e9117e8
+_md5_=aefb4e1283354be8bcc02b05e200c490
diff --git a/metadata/md5-cache/sys-cluster/drbd-8.4.3-r2 b/metadata/md5-cache/sys-cluster/drbd-8.4.3-r2
index a39d93aa57db..568b406992bc 100644
--- a/metadata/md5-cache/sys-cluster/drbd-8.4.3-r2
+++ b/metadata/md5-cache/sys-cluster/drbd-8.4.3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=mirror/replicate block-devices across a network-connection
 EAPI=6
 HOMEPAGE=http://www.drbd.org
 IUSE=heartbeat pacemaker +udev xen
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://oss.linbit.com/drbd/8.4/drbd-8.4.3.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=136e5c0926c6854d4b1b9216fca3ec21
+_md5_=1a6796cacf450ff5b905f8211fb95c0e
diff --git a/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201 b/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201
index cbc874929e85..6f3eec8e2876 100644
--- a/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201
+++ b/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201
@@ -3,11 +3,11 @@ DEPEND=sys-devel/make >=dev-util/cmake-3.5.2
 DESCRIPTION=Toolset to accelerate the boot process and application startup
 EAPI=6
 HOMEPAGE=http://e4rat.sourceforge.net/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl:= >=dev-libs/boost-1.42:= sys-fs/e2fsprogs sys-process/audit sys-process/lsof
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/e4rat/e4rat-0.2.4_pre20141201.tar.xz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_prepare:cmake-utils src_configure:cmake-utils src_compile:cmake-utils src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6b4af388228ce3259dc2a6a3302f434f
+_md5_=aec12cefc8e377ac488d768c9144413f
diff --git a/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r4 b/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r4
index 043706ea3d18..c292c326c76a 100644
--- a/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r4
+++ b/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Library to query devices using IEEE1284
 EAPI=6
 HOMEPAGE=http://cyberelk.net/tim/libieee1284/index.html
 IUSE=doc python static-libs python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r9 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) 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=mirror://sourceforge/libieee1284/libieee1284-0.2.11.tar.bz2
 _eclass_exported_funcs=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	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d8db7eadbeb9de5065d3bae1f4624396
+_md5_=345c6deee5761862cf1a2aa69a2dd4af
diff --git a/metadata/md5-cache/sys-power/pm-utils-1.4.1-r7 b/metadata/md5-cache/sys-power/pm-utils-1.4.1-r7
index 3696d63bdb7e..9ca60386c41a 100644
--- a/metadata/md5-cache/sys-power/pm-utils-1.4.1-r7
+++ b/metadata/md5-cache/sys-power/pm-utils-1.4.1-r7
@@ -4,11 +4,11 @@ DESCRIPTION=Suspend and hibernation utilities
 EAPI=5
 HOMEPAGE=https://pm-utils.freedesktop.org/
 IUSE=alsa debug ntp video_cards_intel video_cards_radeon
-KEYWORDS=alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=!<app-laptop/laptop-mode-tools-1.55-r1 !sys-power/powermgmt-base[-pm-utils(+)] sys-apps/dbus >=sys-apps/util-linux-2.13 sys-power/pm-quirks alsa? ( media-sound/alsa-utils ) ntp? ( || ( net-misc/ntp net-misc/openntpd ) ) amd64? ( !video_cards_intel? ( sys-apps/vbetool ) ) x86? ( !video_cards_intel? ( sys-apps/vbetool ) ) video_cards_radeon? ( app-laptop/radeontool )
 SLOT=0
 SRC_URI=https://pm-utils.freedesktop.org/releases/pm-utils-1.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=c6c2704e4cb421535a6be69fb42d76c4
+_md5_=2f1d1d650a7c65e1fbdfa7da77552a97
diff --git a/metadata/md5-cache/virtual/leechcraft-notifier-0.6.70 b/metadata/md5-cache/virtual/leechcraft-notifier-0.6.70
index 73f6bccbbcba..b12928f6f987 100644
--- a/metadata/md5-cache/virtual/leechcraft-notifier-0.6.70
+++ b/metadata/md5-cache/virtual/leechcraft-notifier-0.6.70
@@ -1,8 +1,8 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for LeechCraft plugins capable of visually notifying the user
 EAPI=5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 RDEPEND=|| ( app-leechcraft/lc-kinotify app-leechcraft/lc-dbusmanager )
 SLOT=0
 _eclass_exported_funcs=-
-_md5_=b26be3eb31334f8bf0e12f8e7a38877e
+_md5_=5cd5535f4e00878f5d8764e5a7e681f0
diff --git a/metadata/md5-cache/virtual/leechcraft-quark-sideprovider-0.6.70 b/metadata/md5-cache/virtual/leechcraft-quark-sideprovider-0.6.70
index a051ba3166ef..214488dc6559 100644
--- a/metadata/md5-cache/virtual/leechcraft-quark-sideprovider-0.6.70
+++ b/metadata/md5-cache/virtual/leechcraft-quark-sideprovider-0.6.70
@@ -1,8 +1,8 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for LeechCraft plugins, displaying quarks in small size somewhere near screen end
 EAPI=4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 RDEPEND=app-leechcraft/lc-sb2
 SLOT=0
 _eclass_exported_funcs=-
-_md5_=c9abfd4952f69b74946d5ead3315aeb1
+_md5_=39a8c46c52e4cefac99ddbe5624a90f5
diff --git a/metadata/md5-cache/virtual/leechcraft-trayarea-0.6.70 b/metadata/md5-cache/virtual/leechcraft-trayarea-0.6.70
index 221a45ccf2bd..4c52bc7d1572 100644
--- a/metadata/md5-cache/virtual/leechcraft-trayarea-0.6.70
+++ b/metadata/md5-cache/virtual/leechcraft-trayarea-0.6.70
@@ -1,8 +1,8 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for LeechCraft plugins providing a tray area
 EAPI=4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 RDEPEND=app-leechcraft/lc-sb2
 SLOT=0
 _eclass_exported_funcs=-
-_md5_=6e0ed0fb106f6c8da4b02e9bbdd33832
+_md5_=2656e9871b9af46a261bf259129014e6
diff --git a/metadata/md5-cache/www-apache/mod_scgi-1.14-r1 b/metadata/md5-cache/www-apache/mod_scgi-1.14-r1
index e6474a6f9d18..654dda3faa63 100644
--- a/metadata/md5-cache/www-apache/mod_scgi-1.14-r1
+++ b/metadata/md5-cache/www-apache/mod_scgi-1.14-r1
@@ -3,11 +3,11 @@ DEPEND=~www-apps/scgi-1.14 =www-servers/apache-2.4*
 DESCRIPTION=Apache module for a replacement of the CGI protocol, similar to FastCGI
 EAPI=5
 HOMEPAGE=http://python.ca/scgi/ https://pypi.python.org/pypi/scgi
-KEYWORDS=amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~ppc x86
 LICENSE=CNRI
 RDEPEND=~www-apps/scgi-1.14 =www-servers/apache-2.4*
 SLOT=0
 SRC_URI=http://python.ca/scgi/releases/scgi-1.14.tar.gz
 _eclass_exported_funcs=pkg_postinst:apache-module pkg_setup:depend.apache src_prepare:- src_compile:apache-module src_install:apache-module
 _eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	depend.apache	7aeacf4ba074b9aa0047e2ba05c1010f	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=a59e51e4079d54c8aeafe5ba4f48656d
+_md5_=570c746da36080bde014bd42ae04508d
diff --git a/metadata/md5-cache/x11-libs/qtermwidget-0.6.0-r1 b/metadata/md5-cache/x11-libs/qtermwidget-0.6.0-r1
index c22e45581938..b66dadf5e3a6 100644
--- a/metadata/md5-cache/x11-libs/qtermwidget-0.6.0-r1
+++ b/metadata/md5-cache/x11-libs/qtermwidget-0.6.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Qt terminal emulator widget
 EAPI=6
 HOMEPAGE=https://github.com/lxde/qtermwidget
 IUSE=qt4 qt5
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=qt4? ( dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 REQUIRED_USE=|| ( qt4 qt5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/lxde/qtermwidget/releases/download/0.6.0/qtermwidget-0.6.0.tar.xz
 _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	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2c9b1c0dd5cd5d26aa963e46d1b0f1ed
+_md5_=553acf81a7d5f029a40a8473cac5de82
diff --git a/metadata/md5-cache/x11-misc/evolvotron-0.6.3 b/metadata/md5-cache/x11-misc/evolvotron-0.6.3
index ea47d08c8d2d..0412eedc4889 100644
--- a/metadata/md5-cache/x11-misc/evolvotron-0.6.3
+++ b/metadata/md5-cache/x11-misc/evolvotron-0.6.3
@@ -3,11 +3,11 @@ DEPEND=
 DESCRIPTION=Generative art image evolver
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/evolvotron/
-KEYWORDS=amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost dev-qt/qtgui:4
 SLOT=0
 SRC_URI=mirror://sourceforge/evolvotron/evolvotron-0.6.3.tar.gz
 _eclass_exported_funcs=src_unpack:qt4-r2 src_prepare:qt4-r2 src_configure:- src_compile:- src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=3f5399eb6294a8a485c6d201b155bd4e
+_md5_=e51a24c04ef555c192c77df1b0d75a44
diff --git a/metadata/md5-cache/x11-misc/icewmcp-3.2-r4 b/metadata/md5-cache/x11-misc/icewmcp-3.2-r4
index 31ef28934e4d..6b0ca47bc1da 100644
--- a/metadata/md5-cache/x11-misc/icewmcp-3.2-r4
+++ b/metadata/md5-cache/x11-misc/icewmcp-3.2-r4
@@ -4,11 +4,11 @@ DESCRIPTION=A complete control panel for IceWM using gtk & python
 EAPI=5
 HOMEPAGE=http://icesoundmanager.sourceforge.net/index.php
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-python/pygtk:2 x11-libs/gtk+:2 x11-wm/icewm
 SLOT=0
 SRC_URI=mirror://sourceforge/icesoundmanager/IceWMControlPanel-3.2.tar.bz2
 _eclass_exported_funcs=pkg_setup:python-single-r1 src_prepare:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ce45ce9d3f8c3e072f8f10c896af562b
+_md5_=ee1e0f4ca13f546a63b2d3f6bbd56876
diff --git a/metadata/md5-cache/x11-misc/obmenu-1.0-r1 b/metadata/md5-cache/x11-misc/obmenu-1.0-r1
index 90072219e55c..1d96d5faf6d7 100644
--- a/metadata/md5-cache/x11-misc/obmenu-1.0-r1
+++ b/metadata/md5-cache/x11-misc/obmenu-1.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Menu editor designed for openbox
 EAPI=5
 HOMEPAGE=http://obmenu.sourceforge.net/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-python/pygtk 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/obmenu/obmenu-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_=56e558dfebae698ac1cc4f9861696ea6
+_md5_=e99800ad8a4cabbd9643092cf88c7be7
diff --git a/metadata/md5-cache/x11-misc/tint2-0.12.3 b/metadata/md5-cache/x11-misc/tint2-0.12.3
index 45be1e607efb..b2f687503c9e 100644
--- a/metadata/md5-cache/x11-misc/tint2-0.12.3
+++ b/metadata/md5-cache/x11-misc/tint2-0.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=tint2 is a lightweight panel/taskbar for Linux.
 EAPI=5
 HOMEPAGE=https://gitlab.com/o9000/tint2
 IUSE=battery examples svg startup-notification tint2conf
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 svg? ( gnome-base/librsvg:2 ) >=media-libs/imlib2-1.4.2[X,png] x11-libs/cairo x11-libs/pango[X] tint2conf? ( x11-libs/gtk+:2 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXinerama >=x11-libs/libXrandr-1.3 x11-libs/libXrender startup-notification? ( x11-libs/startup-notification )
 SLOT=0
 SRC_URI=https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v0.12.3 -> tint2-0.12.3.tar.gz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_unpack:- 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	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e7a0bc016ef6ddcd2ea9c09fcedaf14d
+_md5_=6e1746875dea2bcd3647efeec9e11d7d
diff --git a/metadata/md5-cache/x11-misc/xclip-0.13 b/metadata/md5-cache/x11-misc/xclip-0.13
index 28683fb93c49..9b0f61605a28 100644
--- a/metadata/md5-cache/x11-misc/xclip-0.13
+++ b/metadata/md5-cache/x11-misc/xclip-0.13
@@ -3,11 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt !<sys-devel/gettext-0.18.1
 DESCRIPTION=Copy data from standard input to X clipboard
 EAPI=6
 HOMEPAGE=https://github.com/astrand/xclip
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXmu
 SLOT=0
 SRC_URI=https://github.com/astrand/xclip/archive/0.13.tar.gz -> xclip-0.13.tar.gz
 _eclass_exported_funcs=src_prepare:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=000463bd81ebbcf277b81a9bcc2a93c3
+_md5_=465dd9d6da040b8dd2a021ec1c1b54b9
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r3 b/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r3
index cc62c3a8604c..b9622c8a1289 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r3
+++ b/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r3
@@ -3,11 +3,11 @@ DEPEND=x11-libs/libdockapp x11-libs/libX11 x11-proto/xproto virtual/pkgconfig !<
 DESCRIPTION=XScreenSaver dockapp for the Window Maker window manager
 EAPI=5
 HOMEPAGE=http://xscreensaverapp.sourceforge.net/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libdockapp x11-libs/libX11 x11-misc/xscreensaver
 SLOT=0
 SRC_URI=mirror://sourceforge/project/xscreensaverapp/XScreenSaver.App/2.3/XScreenSaver.App-2.3.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d349bce16027ee7bfd8716e4f795edc6
+_md5_=c6d49c16ae8e47dba5490a6d29de2614
diff --git a/metadata/md5-cache/x11-wm/awesome-3.5.6-r2 b/metadata/md5-cache/x11-wm/awesome-3.5.6-r2
index 07be22b10366..ca823ce7bb09 100644
--- a/metadata/md5-cache/x11-wm/awesome-3.5.6-r2
+++ b/metadata/md5-cache/x11-wm/awesome-3.5.6-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A dynamic floating and tiling window manager
 EAPI=5
 HOMEPAGE=http://awesome.naquadah.org/
 IUSE=dbus doc elibc_FreeBSD gnome
-KEYWORDS=amd64 arm ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 arm ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo )
 SLOT=0
 SRC_URI=http://awesome.naquadah.org/download/awesome-3.5.6.tar.xz
 _eclass_exported_funcs=pkg_postinst:- 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_=280babe5e8d130574a0d76d63a22a664
+_md5_=4b223f493d87b64c92b3cd7064392cc1
diff --git a/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r3 b/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r3
index c939e3bcd1a7..5fa9b4166f6a 100644
--- a/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r3
+++ b/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r3
@@ -4,7 +4,7 @@ DESCRIPTION=Fluxbox is an X11 window manager featuring tabs and an iconbar
 EAPI=5
 HOMEPAGE=http://www.fluxbox.org
 IUSE=nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=!!<=x11-misc/fbdesk-1.2.1 !!<=x11-misc/fluxconf-0.9.9 !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 bidi? ( >=dev-libs/fribidi-0.19.2 ) imlib? ( >=media-libs/imlib2-1.2.0[X] ) truetype? ( media-libs/freetype ) vim-syntax? ( app-vim/fluxbox-syntax ) x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) || ( x11-misc/gxmessage x11-apps/xmessage )
 REQUIRED_USE=systray? ( toolbar )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/fluxbox/fluxbox-1.3.7.tar.xz
 _eclass_exported_funcs=pkg_preinst:xdg pkg_postrm:xdg pkg_postinst:xdg src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=432274f4be93b73d7827180f77a77cff
+_md5_=7192a72fdcdd3a926e9f2c10094b66e4
diff --git a/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r3 b/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r3
index 2d1d71a45277..603cbdb134f6 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r3
+++ b/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r3
@@ -3,11 +3,11 @@ DEPEND=|| ( dev-lang/vala:0.32[vapigen(+)] ) >=xfce-base/exo-0.10 >=xfce-base/ga
 DESCRIPTION=Vala bindings for the Xfce desktop environment
 EAPI=5
 HOMEPAGE=https://wiki.xfce.org/vala-bindings
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=|| ( dev-lang/vala:0.32[vapigen(+)] ) >=xfce-base/exo-0.10 >=xfce-base/garcon-0.2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/bindings/xfce4-vala/4.10/xfce4-vala-4.10.3.tar.bz2
 _eclass_exported_funcs=pkg_preinst:xfconf pkg_postrm:xfconf pkg_postinst:xfconf pkg_setup:- src_prepare:- src_configure:xfconf src_install:xfconf
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vala	ca3f1c504058f5de407febddfae73167	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48	xfconf	d842ab8b2140980394561496bf157447
-_md5_=d60cc11c9174e880f9d7b024bebf3512
+_md5_=764af3f770f25027605474de4ab346c0
author	Repository QA checks <repo-qa-checks@gentoo.org>	2017-01-02 10:01:10 +0000
committer	Repository QA checks <repo-qa-checks@gentoo.org>	2017-01-02 10:01:10 +0000
commit	dfb49ea3937d510299beaf6470c202fb1abdd2fc (patch)
tree	e6d95e0ee1e0ab9414d41122f8313b6891be334a /metadata/md5-cache
parent	Merge updates from master (diff)
download	gentoo-dfb49ea3937d510299beaf6470c202fb1abdd2fc.tar.gz gentoo-dfb49ea3937d510299beaf6470c202fb1abdd2fc.tar.bz2 gentoo-dfb49ea3937d510299beaf6470c202fb1abdd2fc.zip