2019-07-15 15:47:18 UTC

author: Repository mirror & CI <repomirrorci@gentoo.org> 2019-07-15 15:47:19 +0000
committer: Repository mirror & CI <repomirrorci@gentoo.org> 2019-07-15 15:47:19 +0000
commit: 3b009ada42e26fc9a26e69cf59c77209c49d2536 (patch)
tree: 08a122ee57c33aad12e337272f2ddc820d9bb474 /metadata
parent: Merge updates from master (diff)
download: gentoo-3b009ada42e26fc9a26e69cf59c77209c49d2536.tar.gz
gentoo-3b009ada42e26fc9a26e69cf59c77209c49d2536.tar.bz2
gentoo-3b009ada42e26fc9a26e69cf59c77209c49d2536.zip
308 files changed, 624 insertions, 608 deletions
diff --git a/metadata/md5-cache/app-accessibility/festival-freebsoft-utils-0.2 b/metadata/md5-cache/app-accessibility/festival-freebsoft-utils-0.2
index 7bebce3c387e..68751e739504 100644
--- a/metadata/md5-cache/app-accessibility/festival-freebsoft-utils-0.2
+++ b/metadata/md5-cache/app-accessibility/festival-freebsoft-utils-0.2
@@ -3,9 +3,9 @@ DEPEND=>=app-accessibility/festival-1.4.3
 DESCRIPTION=a collection of Festival functions for speech-dispatcher
 EAPI=0
 HOMEPAGE=http://www.freebsoft.org/festival-freebsoft-utils
-KEYWORDS=x86 ppc
+KEYWORDS=ppc x86
 LICENSE=GPL-2
 RDEPEND=>=app-accessibility/festival-1.4.3
 SLOT=0
 SRC_URI=http://www.freebsoft.org/pub/projects/festival-freebsoft-utils/festival-freebsoft-utils-0.2.tar.gz
-_md5_=1052c39322fea7bfc4013d754ce76c49
+_md5_=91f70e8c880a0d57ec96bb86b03b7715
diff --git a/metadata/md5-cache/app-accessibility/festival-hts-2.1 b/metadata/md5-cache/app-accessibility/festival-hts-2.1
index cc0cf339e0e2..a11f519fdf27 100644
--- a/metadata/md5-cache/app-accessibility/festival-hts-2.1
+++ b/metadata/md5-cache/app-accessibility/festival-hts-2.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=HTS voices for Festival
 EAPI=6
 HOMEPAGE=http://hts.sp.nitech.ac.jp/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=app-accessibility/festival-1.96
 SLOT=0
 SRC_URI=http://hts.sp.nitech.ac.jp/archives/2.1/festvox_nitech_us_awb_arctic_hts-2.1.tar.bz2 http://hts.sp.nitech.ac.jp/archives/2.1/festvox_nitech_us_bdl_arctic_hts-2.1.tar.bz2 http://hts.sp.nitech.ac.jp/archives/2.1/festvox_nitech_us_clb_arctic_hts-2.1.tar.bz2 http://hts.sp.nitech.ac.jp/archives/2.1/festvox_nitech_us_jmk_arctic_hts-2.1.tar.bz2 http://hts.sp.nitech.ac.jp/archives/2.1/festvox_nitech_us_rms_arctic_hts-2.1.tar.bz2 http://hts.sp.nitech.ac.jp/archives/2.1/festvox_nitech_us_slt_arctic_hts-2.1.tar.bz2
-_md5_=98b39c5fc63ebf4762e35d3b8bdd275f
+_md5_=a11215364cab7d6ec6dda0df611b135e
diff --git a/metadata/md5-cache/app-admin/bastille-3.0.9-r1 b/metadata/md5-cache/app-admin/bastille-3.0.9-r1
index b3d30bf9c9e5..ea849a3b6264 100644
--- a/metadata/md5-cache/app-admin/bastille-3.0.9-r1
+++ b/metadata/md5-cache/app-admin/bastille-3.0.9-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Bastille-Linux is a security hardening tool
 EAPI=5
 HOMEPAGE=http://bastille-linux.org/
 IUSE=X
-KEYWORDS=~x86 ~ppc ~sparc ~alpha ~amd64
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=net-firewall/iptables app-admin/logrotate dev-perl/Curses net-firewall/psad X? ( dev-perl/Tk ) virtual/logger dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/bastille-linux/Bastille-3.0.9.tar.bz2 mirror://gentoo/bastille-3.0.9-gentoo-0.2.patch.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=86c1c7caf49f04589f7605351fc38921
+_md5_=7c3c193a3147a309182feb007165ffcd
diff --git a/metadata/md5-cache/app-admin/bastille-3.0.9-r2 b/metadata/md5-cache/app-admin/bastille-3.0.9-r2
index 4a4b79b0b3f1..209b00a9865b 100644
--- a/metadata/md5-cache/app-admin/bastille-3.0.9-r2
+++ b/metadata/md5-cache/app-admin/bastille-3.0.9-r2
@@ -3,10 +3,10 @@ DESCRIPTION=Bastille-Linux is a security hardening tool
 EAPI=6
 HOMEPAGE=http://bastille-linux.org/
 IUSE=X
-KEYWORDS=~x86 ~ppc ~sparc ~alpha ~amd64
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=net-firewall/iptables app-admin/logrotate dev-lang/perl:= dev-perl/Curses net-firewall/psad X? ( dev-perl/Tk ) virtual/logger
 SLOT=0
 SRC_URI=mirror://sourceforge/bastille-linux/Bastille-3.0.9.tar.bz2 mirror://gentoo/bastille-3.0.9-gentoo-0.2.patch.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d75479ca8ce5c998db45d2b306b8a7bd
+_md5_=3322f7e933cc4a17e277d3ac55f0075f
diff --git a/metadata/md5-cache/app-admin/clog-1.3.0 b/metadata/md5-cache/app-admin/clog-1.3.0
index 1948894cc058..16350a13598c 100644
--- a/metadata/md5-cache/app-admin/clog-1.3.0
+++ b/metadata/md5-cache/app-admin/clog-1.3.0
@@ -3,9 +3,9 @@ DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=clog is a colorized log tail utility
 EAPI=6
 HOMEPAGE=https://taskwarrior.org/docs/clog/
-KEYWORDS=~amd64 ~x86 ~x64-macos ~amd64-fbsd
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x64-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://tasktools.org/download/clog-1.3.0.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=05351df9e6c44969307bdf06cc20fc52
+_md5_=f16d989a55e61d95b38ff9d03b15a5d0
diff --git a/metadata/md5-cache/app-admin/fetchlog-1.4-r1 b/metadata/md5-cache/app-admin/fetchlog-1.4-r1
index cfcf0a430194..2e1d7c0dba3a 100644
--- a/metadata/md5-cache/app-admin/fetchlog-1.4-r1
+++ b/metadata/md5-cache/app-admin/fetchlog-1.4-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Displays the last new messages of a logfile
 EAPI=6
 HOMEPAGE=http://fetchlog.sourceforge.net/
 IUSE=snmp
-KEYWORDS=amd64 ppc x86 ~ppc64
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=snmp? ( >=dev-perl/Net-SNMP-4.0.1-r2 >=net-analyzer/net-snmp-5.0.6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fetchlog/fetchlog-1.4.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=c451d7c39d813017e169ade66414e539
+_md5_=aba279ffba7cfe87b5217e20ab910041
diff --git a/metadata/md5-cache/app-admin/pydf-12-r1 b/metadata/md5-cache/app-admin/pydf-12-r1
index 0eef6dc8533a..c0ab15e591c7 100644
--- a/metadata/md5-cache/app-admin/pydf-12-r1
+++ b/metadata/md5-cache/app-admin/pydf-12-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Enhanced df with colors
 EAPI=6
 HOMEPAGE=http://kassiopeia.juls.savba.sk/~garabik/software/pydf/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm ppc ppc64 x86 ~arm64 ~x86-fbsd ~amd64-linux ~x86-linux ~amd64-fbsd
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=public-domain
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://kassiopeia.juls.savba.sk/~garabik/software/pydf/pydf_12.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=2270693f698e7366e26fa787b235bc16
+_md5_=3db300fac5116e9719dd4e9734801e35
diff --git a/metadata/md5-cache/app-admin/quickswitch-1.05 b/metadata/md5-cache/app-admin/quickswitch-1.05
index a8dce8dae3a8..ac20c5f5e36f 100644
--- a/metadata/md5-cache/app-admin/quickswitch-1.05
+++ b/metadata/md5-cache/app-admin/quickswitch-1.05
@@ -4,9 +4,9 @@ DESCRIPTION=Utility to switch network profiles on the fly
 EAPI=6
 HOMEPAGE=http://quickswitch.sf.net
 IUSE=ncurses
-KEYWORDS=x86 ppc sparc s390 amd64
+KEYWORDS=amd64 ppc s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=ncurses? ( dev-perl/CursesWidgets )
 SLOT=0
 SRC_URI=mirror://sourceforge/quickswitch/quickswitch-1.05.tar.gz
-_md5_=0a72e435579658f8d40db3e97c715faa
+_md5_=d55375cf6e5883b0b8d986fe0ee11515
diff --git a/metadata/md5-cache/app-admin/reportmagic-2.21 b/metadata/md5-cache/app-admin/reportmagic-2.21
index 686254326740..291e937f83e8 100644
--- a/metadata/md5-cache/app-admin/reportmagic-2.21
+++ b/metadata/md5-cache/app-admin/reportmagic-2.21
@@ -4,8 +4,8 @@ DESCRIPTION=Makes usable statistics from your web site log file analysis
 EAPI=5
 HOMEPAGE=http://www.reportmagic.org/
 IUSE=truetype
-KEYWORDS=x86 ppc amd64
+KEYWORDS=amd64 ppc x86
 LICENSE=Artistic
 SLOT=0
 SRC_URI=http://www.reportmagic.org/rmagic-2.21.tar.gz
-_md5_=59d4cf1e2110241a173fa0fd2a88a4fa
+_md5_=53888ff2178564058d91f769f406fd17
diff --git a/metadata/md5-cache/app-arch/deb2targz-1-r3 b/metadata/md5-cache/app-arch/deb2targz-1-r3
index 97fb74940fd6..9e3a5897efd4 100644
--- a/metadata/md5-cache/app-arch/deb2targz-1-r3
+++ b/metadata/md5-cache/app-arch/deb2targz-1-r3
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Convert a .deb file to a .tar.gz archive
 EAPI=7
 HOMEPAGE=http://www.miketaylor.org.uk/tech/deb/
-KEYWORDS=~alpha ~amd64 ~amd64-linux ~arm ~hppa ~ia64 ~ppc ~ppc-aix ~ppc-macos ~ppc64 ~sparc ~sparc-solaris ~x86 ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=http://www.miketaylor.org.uk/tech/deb/deb2targz
-_md5_=ccfad83a21b22c147173cd80eafc00d1
+_md5_=642292cab25fa1bd511f70033c8d9f65
diff --git a/metadata/md5-cache/app-arch/duff-0.5.2 b/metadata/md5-cache/app-arch/duff-0.5.2
index da91f120c961..c2ccb9997fec 100644
--- a/metadata/md5-cache/app-arch/duff-0.5.2
+++ b/metadata/md5-cache/app-arch/duff-0.5.2
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Command-line utility for quickly finding duplicates in a given set of files
 EAPI=5
 HOMEPAGE=http://duff.sourceforge.net/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=mirror://sourceforge/duff/duff-0.5.2.tar.bz2
-_md5_=6a01a4067b3e9d19e9b3a5041ff619b3
+_md5_=9db963cb5e18dc1d1796cf3bf9699e1f
diff --git a/metadata/md5-cache/app-backup/cpdup-1.18 b/metadata/md5-cache/app-backup/cpdup-1.18
index 54040ed00041..73c21b96717d 100644
--- a/metadata/md5-cache/app-backup/cpdup-1.18
+++ b/metadata/md5-cache/app-backup/cpdup-1.18
@@ -3,9 +3,9 @@ DESCRIPTION=A comprehensive filesystem mirroring program
 EAPI=6
 HOMEPAGE=http://apollo.backplane.com/FreeSrc/
 IUSE=userland_GNU threads
-KEYWORDS=~x86-fbsd ~amd64
+KEYWORDS=~amd64 ~x86-fbsd
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://apollo.backplane.com/FreeSrc/cpdup-1.18.tgz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=e69918b073ae4efb29c3fb41738740bd
+_md5_=158ab4fbb0b8169cab9510ccf01b4f95
diff --git a/metadata/md5-cache/app-backup/vzdump-1.2 b/metadata/md5-cache/app-backup/vzdump-1.2
index 0083afb92a35..2f0cce743b81 100644
--- a/metadata/md5-cache/app-backup/vzdump-1.2
+++ b/metadata/md5-cache/app-backup/vzdump-1.2
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=
 DESCRIPTION=A utility to make consistent snapshots of running OpenVZ containers
 EAPI=6
 HOMEPAGE=http://pve.proxmox.com/wiki/VZDump
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl:= app-misc/cstream dev-perl/LockFile-Simple net-misc/rsync sys-cluster/vzctl sys-fs/lvm2 virtual/mta virtual/perl-Getopt-Long
 SLOT=0
 SRC_URI=http://www.proxmox.com/cms_proxmox/cms/upload/vzdump/vzdump-1.2.tar.gz
 _eclasses_=perl-functions	f2e3420aed32cf1abe33b4129b842636
-_md5_=33d50f4cd6a8bd917b5231b0da242a40
+_md5_=67e6562ea6cd75674e07ef82bd11fcd9
diff --git a/metadata/md5-cache/app-benchmarks/forkbomb-1.4-r1 b/metadata/md5-cache/app-benchmarks/forkbomb-1.4-r1
index db65c9968e36..0b4ecf665c4d 100644
--- a/metadata/md5-cache/app-benchmarks/forkbomb-1.4-r1
+++ b/metadata/md5-cache/app-benchmarks/forkbomb-1.4-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Controlled fork() bomber for testing heavy system load
 EAPI=6
 HOMEPAGE=http://home.tiscali.cz:8080/~cz210552/forkbomb.html
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://home.tiscali.cz:8080/~cz210552/distfiles/forkbomb-1.4.tar.gz
-_md5_=0f92b0d62ae5d1e7343a78356e7f29bc
+_md5_=2dc6047a5537e6264d205df26091b49e
diff --git a/metadata/md5-cache/app-benchmarks/volanomark-2.5.0.9 b/metadata/md5-cache/app-benchmarks/volanomark-2.5.0.9
index ee4dbd19557e..868d723f095b 100644
--- a/metadata/md5-cache/app-benchmarks/volanomark-2.5.0.9
+++ b/metadata/md5-cache/app-benchmarks/volanomark-2.5.0.9
@@ -3,10 +3,10 @@ DEPEND=virtual/jre >=sys-apps/sed-4 sys-apps/net-tools
 DESCRIPTION=Java server benchmark utility
 EAPI=0
 HOMEPAGE=http://www.volano.com/benchmarks.html
-KEYWORDS=x86 amd64
+KEYWORDS=amd64 x86
 LICENSE=Volano
 RDEPEND=virtual/jre
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.volano.com/pub/vmark2_5_0_9.class
-_md5_=c460c5bd0dc97603a5a00f6a33131997
+_md5_=4ca01728f961ce857922e4a53b3bc178
diff --git a/metadata/md5-cache/app-benchmarks/wrk-3.1.2 b/metadata/md5-cache/app-benchmarks/wrk-3.1.2
index ac0b51431bf9..9f56c081fc14 100644
--- a/metadata/md5-cache/app-benchmarks/wrk-3.1.2
+++ b/metadata/md5-cache/app-benchmarks/wrk-3.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=A modern HTTP benchmarking tool
 EAPI=5
 HOMEPAGE=https://github.com/wg/wrk
 IUSE=libressl
-KEYWORDS=x86 amd64
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/luajit-2.0.2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://github.com/wg/wrk/archive/3.1.2.tar.gz -> wrk-3.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=14e60bbe8cf4287ec0f0f81f2d21fe13
+_md5_=adb6d7c5f0dd8fff061944e9e0fac6fb
diff --git a/metadata/md5-cache/app-benchmarks/wrk-4.0.2 b/metadata/md5-cache/app-benchmarks/wrk-4.0.2
index d013c527a61c..4d9260553cfc 100644
--- a/metadata/md5-cache/app-benchmarks/wrk-4.0.2
+++ b/metadata/md5-cache/app-benchmarks/wrk-4.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=A modern HTTP benchmarking tool
 EAPI=5
 HOMEPAGE=https://github.com/wg/wrk
 IUSE=libressl
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/luajit-2.0.2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://github.com/wg/wrk/archive/4.0.2.tar.gz -> wrk-4.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=96ff9bee96e5e4a46b15a199b83d0f30
+_md5_=59b23e27b05a0d1a8f91bbc89d8857c4
diff --git a/metadata/md5-cache/app-benchmarks/wrk-4.1.0 b/metadata/md5-cache/app-benchmarks/wrk-4.1.0
index a8c2d5c2668a..336a33590a0c 100644
--- a/metadata/md5-cache/app-benchmarks/wrk-4.1.0
+++ b/metadata/md5-cache/app-benchmarks/wrk-4.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=A modern HTTP benchmarking tool
 EAPI=5
 HOMEPAGE=https://github.com/wg/wrk
 IUSE=libressl
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/luajit-2.0.2 dev-lang/lua:0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://github.com/wg/wrk/archive/4.1.0.tar.gz -> wrk-4.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ddeabd346a58edcf59b60ba1f8bae59c
+_md5_=09277acab3e0a37083244630f927ecb9
diff --git a/metadata/md5-cache/app-crypt/eid-mw-4.4.1 b/metadata/md5-cache/app-crypt/eid-mw-4.4.1
index c11cf9c721b0..2a2ee1ead428 100644
--- a/metadata/md5-cache/app-crypt/eid-mw-4.4.1
+++ b/metadata/md5-cache/app-crypt/eid-mw-4.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=Electronic Identity Card middleware supplied by the Belgian Federal
 EAPI=6
 HOMEPAGE=https://eid.belgium.be
 IUSE=+dialogs +gtk p11-kit
-KEYWORDS=~x86 ~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-3
 RDEPEND=>=sys-apps/pcsc-lite-1.2.9 gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) p11-kit? ( app-crypt/p11-kit )
 REQUIRED_USE=dialogs? ( gtk )
 SLOT=0
 SRC_URI=https://codeload.github.com/fedict/eid-mw/tar.gz/v4.4.1 -> eid-mw-4.4.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2c5cabd31324c6e83754ac1a86b24efd
+_md5_=b7b1d1ffdd35db6372ad63072fe366ec
diff --git a/metadata/md5-cache/app-crypt/gentoo-keys-201901130136 b/metadata/md5-cache/app-crypt/gentoo-keys-201901130136
index 61c9e96514d9..99cbcbc1ca46 100644
--- a/metadata/md5-cache/app-crypt/gentoo-keys-201901130136
+++ b/metadata/md5-cache/app-crypt/gentoo-keys-201901130136
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=A OpenPGP/GPG keyring of official Gentoo release media GPG keys
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Gentoo-keys
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 x64-cygwin amd64-fbsd amd64-linux x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 x64-cygwin amd64-fbsd x86-fbsd amd64-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/keyrings/gentoo-keys-201901130136.tar.xz
-_md5_=3c7e56c923258ab6678f9cb6b9d5add3
+_md5_=cac6e1506bb786aeda812d93560c106a
diff --git a/metadata/md5-cache/app-crypt/gpg-ringmgr-1.12 b/metadata/md5-cache/app-crypt/gpg-ringmgr-1.12
index 03ac70739877..8574a5dba066 100644
--- a/metadata/md5-cache/app-crypt/gpg-ringmgr-1.12
+++ b/metadata/md5-cache/app-crypt/gpg-ringmgr-1.12
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl >=app-crypt/gnupg-1.2.1
 DESCRIPTION=GPG Keyring Manager to handle large GPG keyrings more easily
 EAPI=0
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=x86 ppc sparc alpha hppa amd64
+KEYWORDS=alpha amd64 hppa ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=app-crypt/gnupg-1.2.1
 SLOT=0
 SRC_URI=mirror://gentoo/gpg-ringmgr
-_md5_=359be7e06dc8d5a0f3b39bca74e60bd5
+_md5_=19a43812cfc872a9bf6da8e9fd1ad3af
diff --git a/metadata/md5-cache/app-crypt/md4sum-0.02.03-r1 b/metadata/md5-cache/app-crypt/md4sum-0.02.03-r1
index fcd9f8790a18..02505a7013c3 100644
--- a/metadata/md5-cache/app-crypt/md4sum-0.02.03-r1
+++ b/metadata/md5-cache/app-crypt/md4sum-0.02.03-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=md4 and edonkey hash algorithm tool
 EAPI=5
 HOMEPAGE=http://linux.xulin.de/c/
-KEYWORDS=~amd64 ~x86 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://linux.xulin.de/c/md4sum-0.02.03.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c2679b4aa347768c9d5ad5d97d94d45b
+_md5_=b92c5410dc77cbcbf43b1f5679b55d7d
diff --git a/metadata/md5-cache/app-crypt/ophcrack-tables-1.0-r2 b/metadata/md5-cache/app-crypt/ophcrack-tables-1.0-r2
index 9657bad5455e..136a98a719aa 100644
--- a/metadata/md5-cache/app-crypt/ophcrack-tables-1.0-r2
+++ b/metadata/md5-cache/app-crypt/ophcrack-tables-1.0-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Tables available for ophcrack
 EAPI=5
 HOMEPAGE=http://ophcrack.sourceforge.net/
 IUSE=+xpfast xpsmall +vistafree
-KEYWORDS=~x86 ~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 REQUIRED_USE=|| ( xpfast xpsmall vistafree )
 SLOT=0
 SRC_URI=xpfast? ( mirror://sourceforge/ophcrack/tables_xp_free_fast.zip ) xpsmall? ( mirror://sourceforge/ophcrack/tables_xp_free_small.zip ) vistafree? ( mirror://sourceforge/ophcrack/tables_vista_free.zip )
-_md5_=056bb25cbbcf2cc18fd2c529189cabfe
+_md5_=ae4c919bfd6c8244d65de48cf51fa42e
diff --git a/metadata/md5-cache/app-dicts/dictd-devils-0-r1 b/metadata/md5-cache/app-dicts/dictd-devils-0-r1
index 3fee4e855269..340e3991d84d 100644
--- a/metadata/md5-cache/app-dicts/dictd-devils-0-r1
+++ b/metadata/md5-cache/app-dicts/dictd-devils-0-r1
@@ -3,9 +3,9 @@ DEPEND=>=app-text/dictd-1.5.5
 DESCRIPTION=The Devil's Dictionary for dict
 EAPI=0
 HOMEPAGE=http://www.dict.org/
-KEYWORDS=x86 ppc sparc amd64 ppc64
+KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/dictd-1.5.5
 SLOT=0
 SRC_URI=ftp://ftp.dict.org/pub/dict/pre/devils-dict-pre.tar.gz
-_md5_=6b5e3a1bc266a1109b096d910de828ca
+_md5_=7b8d42007bc6de1d7d26a428bf814258
diff --git a/metadata/md5-cache/app-dicts/dictd-dicts-1.0 b/metadata/md5-cache/app-dicts/dictd-dicts-1.0
index 6337e5fbc1cc..a0fc6d633cba 100644
--- a/metadata/md5-cache/app-dicts/dictd-dicts-1.0
+++ b/metadata/md5-cache/app-dicts/dictd-dicts-1.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=A package to simplify installation of all dictd dictionaries
 EAPI=0
 HOMEPAGE=http://www.dict.org/
-KEYWORDS=x86 ppc sparc amd64 ppc64
+KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=app-dicts/dictd-devils app-dicts/dictd-elements app-dicts/dictd-foldoc app-dicts/dictd-gazetteer app-dicts/dictd-jargon app-dicts/dictd-misc app-dicts/dictd-vera app-dicts/dictd-web1913 app-dicts/dictd-wn
 SLOT=0
-_md5_=7f88f02a2142beb63c6891751ad261e4
+_md5_=2b4a7428bc758b7f36566394aaaa9e42
diff --git a/metadata/md5-cache/app-dicts/dictd-elements-2000.22.07-r1 b/metadata/md5-cache/app-dicts/dictd-elements-2000.22.07-r1
index 3d372c58ae5d..b927b66f3f1c 100644
--- a/metadata/md5-cache/app-dicts/dictd-elements-2000.22.07-r1
+++ b/metadata/md5-cache/app-dicts/dictd-elements-2000.22.07-r1
@@ -3,9 +3,9 @@ DEPEND=>=app-text/dictd-1.5.5
 DESCRIPTION=The elements database for dict
 EAPI=0
 HOMEPAGE=http://www.dict.org
-KEYWORDS=x86 ppc sparc amd64 ppc64
+KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/dictd-1.5.5
 SLOT=0
 SRC_URI=ftp://ftp.dict.org/pub/dict/pre/elements-20001107-pre.tar.gz
-_md5_=6866edd85e627ba770313ad5ddaffe5b
+_md5_=14ecfb97eadfd1251231224d46ce4fff
diff --git a/metadata/md5-cache/app-dicts/dictd-foldoc-2001.03.13-r1 b/metadata/md5-cache/app-dicts/dictd-foldoc-2001.03.13-r1
index d4defc619213..f3e0fa1e99c7 100644
--- a/metadata/md5-cache/app-dicts/dictd-foldoc-2001.03.13-r1
+++ b/metadata/md5-cache/app-dicts/dictd-foldoc-2001.03.13-r1
@@ -3,9 +3,9 @@ DEPEND=>=app-text/dictd-1.5.5
 DESCRIPTION=The Free On-line Dictionary of Computing for dict
 EAPI=0
 HOMEPAGE=http://www.dict.org/
-KEYWORDS=x86 ppc sparc amd64 ppc64
+KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/dictd-1.5.5
 SLOT=0
 SRC_URI=ftp://ftp.dict.org/pub/dict/pre/foldoc-20010313.tar.gz
-_md5_=4b4e239d7d396b91bfa735411fa7b331
+_md5_=84e34d1d840b034a0351285bde8444bd
diff --git a/metadata/md5-cache/app-dicts/dictd-gazetteer-1.2-r1 b/metadata/md5-cache/app-dicts/dictd-gazetteer-1.2-r1
index 96d0ac033876..3e94b475baa7 100644
--- a/metadata/md5-cache/app-dicts/dictd-gazetteer-1.2-r1
+++ b/metadata/md5-cache/app-dicts/dictd-gazetteer-1.2-r1
@@ -3,9 +3,9 @@ DEPEND=>=app-text/dictd-1.5.5
 DESCRIPTION=The original U.S. Gazetteer Place and Zipcode Files for dict
 EAPI=0
 HOMEPAGE=http://www.dict.org/
-KEYWORDS=x86 ppc sparc amd64 ppc64
+KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/dictd-1.5.5
 SLOT=0
 SRC_URI=ftp://ftp.dict.org/pub/dict/pre/dict-gazetteer-1.2-pre.tar.gz
-_md5_=c507ab520f3088455eeeeb30fd7e7305
+_md5_=f8f12e9ab7211bd9b9f1d55d6637d726
diff --git a/metadata/md5-cache/app-dicts/dictd-jargon-4.2.3-r1 b/metadata/md5-cache/app-dicts/dictd-jargon-4.2.3-r1
index dc7256963067..bfb5bf5858a6 100644
--- a/metadata/md5-cache/app-dicts/dictd-jargon-4.2.3-r1
+++ b/metadata/md5-cache/app-dicts/dictd-jargon-4.2.3-r1
@@ -3,9 +3,9 @@ DEPEND=>=app-text/dictd-1.5.5
 DESCRIPTION=Jargon lexicon
 EAPI=0
 HOMEPAGE=http://www.dict.org/
-KEYWORDS=x86 sparc ppc amd64 ppc64
+KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/dictd-1.5.5
 SLOT=0
 SRC_URI=ftp://ftp.dict.org/pub/dict/pre/jargon_4.2.3.tar.gz
-_md5_=ea5279587f6c650815f9813c031d6118
+_md5_=df031e7a1f57230ecc3bc949125f6848
diff --git a/metadata/md5-cache/app-dicts/dictd-misc-1.5b-r1 b/metadata/md5-cache/app-dicts/dictd-misc-1.5b-r1
index b209134b5a39..53e845c097c4 100644
--- a/metadata/md5-cache/app-dicts/dictd-misc-1.5b-r1
+++ b/metadata/md5-cache/app-dicts/dictd-misc-1.5b-r1
@@ -3,9 +3,9 @@ DEPEND=>=app-text/dictd-1.5.5
 DESCRIPTION=Easton's 1897 Bible Dictionary for dict
 EAPI=0
 HOMEPAGE=http://www.dict.org/
-KEYWORDS=x86 ppc sparc amd64 ppc64
+KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/dictd-1.5.5
 SLOT=0
 SRC_URI=ftp://ftp.dict.org/pub/dict/pre/dict-misc-1.5b-pre.tar.gz
-_md5_=de6e68ca272238756c177d991e542b2f
+_md5_=0c6d751910b8cbe49e3b79a98cbc516a
diff --git a/metadata/md5-cache/app-dicts/dictd-web1913-1.4-r1 b/metadata/md5-cache/app-dicts/dictd-web1913-1.4-r1
index 87d526152219..348ff6501e82 100644
--- a/metadata/md5-cache/app-dicts/dictd-web1913-1.4-r1
+++ b/metadata/md5-cache/app-dicts/dictd-web1913-1.4-r1
@@ -3,9 +3,9 @@ DEPEND=>=app-text/dictd-1.5.5
 DESCRIPTION=Webster's Revised Unabridged Dictionary (1913) for dict
 EAPI=0
 HOMEPAGE=http://www.dict.org/
-KEYWORDS=x86 ppc sparc amd64 ppc64
+KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/dictd-1.5.5
 SLOT=0
 SRC_URI=ftp://ftp.dict.org/pub/dict/pre/dict-web1913-1.4-pre.tar.gz
-_md5_=6445bca1041509b3ecb96fb721c51a30
+_md5_=1f99f5a8d841c881c3d9d08a9657829a
diff --git a/metadata/md5-cache/app-dicts/myspell-ru-20060316 b/metadata/md5-cache/app-dicts/myspell-ru-20060316
index ee81b189d394..3337341f6c6a 100644
--- a/metadata/md5-cache/app-dicts/myspell-ru-20060316
+++ b/metadata/md5-cache/app-dicts/myspell-ru-20060316
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Russian dictionaries for myspell/hunspell
 EAPI=0
 HOMEPAGE=http://lingucomponent.openoffice.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 LICENSE=LGPL-2.1 myspell-ru_RU-AlexanderLebedev
 SLOT=0
 SRC_URI=mirror://gentoo/myspell-ru_RU-20060316.zip mirror://gentoo/myspell-ru_RU_ye-20060316.zip mirror://gentoo/myspell-ru_RU_yo-20060316.zip mirror://gentoo/myspell-hyph_ru_RU-20060316.zip
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	myspell	a0259d47cff590f8fd5ab7027c637c59	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=d81c59576dc66f7947dea7722a18b46a
+_md5_=00da83ec63b9657c49bb14cf047f1ac0
diff --git a/metadata/md5-cache/app-dicts/myspell-ru-20150711 b/metadata/md5-cache/app-dicts/myspell-ru-20150711
index 98ac293d72a1..5d231735d668 100644
--- a/metadata/md5-cache/app-dicts/myspell-ru-20150711
+++ b/metadata/md5-cache/app-dicts/myspell-ru-20150711
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Russian spellcheck dictionary based on works of AOT group for myspell/hunspell
 EAPI=5
 HOMEPAGE=http://extensions.libreoffice.org/extension-center/russian-dictionary-pack
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://extensions.libreoffice.org/extension-center/russian-dictionary-pack/releases/0.4.0/dict_pack_ru-aot-0-4-0.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=b84029f1600aba5885302e2f49c09978
+_md5_=18bfe9df47c1d7c644b8ddc84bddb283
diff --git a/metadata/md5-cache/app-editors/nvi-1.81.6-r7 b/metadata/md5-cache/app-editors/nvi-1.81.6-r7
index 6f9c9309decc..8161142899d6 100644
--- a/metadata/md5-cache/app-editors/nvi-1.81.6-r7
+++ b/metadata/md5-cache/app-editors/nvi-1.81.6-r7
@@ -4,11 +4,11 @@ DESCRIPTION=Vi clone
 EAPI=6
 HOMEPAGE=https://sites.google.com/a/bostic.com/keithbostic/vi
 IUSE=perl tcl unicode
-KEYWORDS=alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x64-macos ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-macos
 LICENSE=BSD
 RDEPEND=>=sys-libs/db-4.2.52_p5:= >=sys-libs/ncurses-5.6-r2:= perl? ( dev-lang/perl ) tcl? ( >=dev-lang/tcl-8.5:0= ) app-eselect/eselect-vi
 REQUIRED_USE=tcl? ( !unicode )
 SLOT=0
 SRC_URI=http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/nvi-1.81.6.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9d99d7cadb7015fad5af85b93d1d541
+_md5_=9c537fb4d641ef85f5eb3c6102da2d29
diff --git a/metadata/md5-cache/app-emulation/dlx-1.0.0 b/metadata/md5-cache/app-emulation/dlx-1.0.0
index c7208a1445fc..27ef3dfc5121 100644
--- a/metadata/md5-cache/app-emulation/dlx-1.0.0
+++ b/metadata/md5-cache/app-emulation/dlx-1.0.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=DLX Simulator
 EAPI=6
 HOMEPAGE=http://www.davidviner.com/dlx.php
-KEYWORDS=x86 ppc
+KEYWORDS=ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.davidviner.com/dlx/dlx.tar.gz
-_md5_=14962fbc90fa039ad8030da6c447c654
+_md5_=2ac2475546be6b66276e5079f4b582e6
diff --git a/metadata/md5-cache/app-i18n/xvnkb-0.2.8a-r1 b/metadata/md5-cache/app-i18n/xvnkb-0.2.8a-r1
index e7e60fda1892..ee9c6840e250 100644
--- a/metadata/md5-cache/app-i18n/xvnkb-0.2.8a-r1
+++ b/metadata/md5-cache/app-i18n/xvnkb-0.2.8a-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Vietnamese input keyboard for X
 EAPI=0
 HOMEPAGE=http://xvnkb.sourceforge.net/
 IUSE=spell xft
-KEYWORDS=x86 ppc
+KEYWORDS=ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft )
 SLOT=0
 SRC_URI=http://xvnkb.sourceforge.net/xvnkb/xvnkb-0.2.8a.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b353d5d5e071f488c331f499728259b2
+_md5_=1a7edef66c5046b8fa4d9a91835ff066
diff --git a/metadata/md5-cache/app-laptop/dispad-0.3.1-r1 b/metadata/md5-cache/app-laptop/dispad-0.3.1-r1
index 18e3cbb2555b..c865c74ba556 100644
--- a/metadata/md5-cache/app-laptop/dispad-0.3.1-r1
+++ b/metadata/md5-cache/app-laptop/dispad-0.3.1-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/confuse x11-libs/libX11 x11-libs/libXi >=app-portage/elt-patches
 DESCRIPTION=Daemon to disable trackpads while typing
 EAPI=6
 HOMEPAGE=https://github.com/BlueDragonX/dispad
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/confuse x11-libs/libX11 x11-libs/libXi
 SLOT=0
 SRC_URI=https://github.com/BlueDragonX/dispad/tarball/v0.3.1 -> dispad-0.3.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=ce9573cb8997e106629ebb7b49c43b5f
+_md5_=835657d087da8d4df1c9a149c772c390
diff --git a/metadata/md5-cache/app-misc/cbview-0.06-r1 b/metadata/md5-cache/app-misc/cbview-0.06-r1
index 600249522c9e..f4ed171f8feb 100644
--- a/metadata/md5-cache/app-misc/cbview-0.06-r1
+++ b/metadata/md5-cache/app-misc/cbview-0.06-r1
@@ -3,8 +3,8 @@ DEPEND=dev-perl/Gtk2 dev-perl/String-ShellQuote app-arch/unrar app-arch/unzip
 DESCRIPTION=viewer/converter for CBR/CBZ comic book archives
 EAPI=6
 HOMEPAGE=https://web.archive.org/web/20061108214126/http://elvine.org:80/code/cbview/
-KEYWORDS=~x86 ~ppc ~amd64
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://elvine.org/code/cbview/cbview-0.06.tar.gz
-_md5_=1e2808ccd8974476d7f444785c74920a
+_md5_=9783c1515925cae48b693483c4bf4cbe
diff --git a/metadata/md5-cache/app-misc/egads-0.9.5 b/metadata/md5-cache/app-misc/egads-0.9.5
index 9edb7304ec4d..1b2ece7a7f89 100644
--- a/metadata/md5-cache/app-misc/egads-0.9.5
+++ b/metadata/md5-cache/app-misc/egads-0.9.5
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install unpack
 DESCRIPTION=Entropy Gathering And Distribution System
 EAPI=0
 HOMEPAGE=http://www.securesoftware.com/download_egads.htm
-KEYWORDS=~ppc x86 ~amd64
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.securesoftware.com/egads/egads-0.9.5.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=db8c230f165fbd0cd00cb7309296c6e9
+_md5_=94bdf37d6867ab05f28bc9a81fc6ced7
diff --git a/metadata/md5-cache/app-misc/getopt-1.1.6-r1 b/metadata/md5-cache/app-misc/getopt-1.1.6-r1
index 55773d4034df..ea5a3bdf034a 100644
--- a/metadata/md5-cache/app-misc/getopt-1.1.6-r1
+++ b/metadata/md5-cache/app-misc/getopt-1.1.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=getopt(1) replacement supporting GNU-style long options
 EAPI=7
 HOMEPAGE=http://frodo.looijaard.name/project/getopt/
 IUSE=nls
-KEYWORDS=~amd64-fbsd ~m68k-mint ~ppc-aix ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-cygwin ~x64-macos ~x64-solaris ~x86-fbsd ~x86-macos ~x86-solaris
+KEYWORDS=~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://frodo.looijaard.name/system/files/software/getopt/getopt-1.1.6.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=f77ee9075dfe4c685fba33466dcaf1b5
+_md5_=ed32b8a6ba40b49c7383191b6b395c68
diff --git a/metadata/md5-cache/app-misc/irtrans-irclient-6.01.05-r1 b/metadata/md5-cache/app-misc/irtrans-irclient-6.01.05-r1
index 353800de5b5c..7b0b184a3d14 100644
--- a/metadata/md5-cache/app-misc/irtrans-irclient-6.01.05-r1
+++ b/metadata/md5-cache/app-misc/irtrans-irclient-6.01.05-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=ASCII Client for the IRTrans Server
 EAPI=7
 HOMEPAGE=http://www.irtrans.de
-KEYWORDS=~x86 ~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://www.irtrans.de/download/Client/irclient-src.tar.gz -> irclient-src-6.01.05.tar.gz http://ftp.disconnected-by-peer.at/irtrans/irtrans-irclient-5.11.04-ip_assign-1.patch.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=68f54359b84fd7b992e4fa82820cca61
+_md5_=0ebd8ad839fb162e21c74286476e8cb4
diff --git a/metadata/md5-cache/app-misc/irtrans-irserver-6.09.04 b/metadata/md5-cache/app-misc/irtrans-irserver-6.09.04
index 3c3b4d8de515..269180343261 100644
--- a/metadata/md5-cache/app-misc/irtrans-irserver-6.09.04
+++ b/metadata/md5-cache/app-misc/irtrans-irserver-6.09.04
@@ -3,11 +3,11 @@ DESCRIPTION=IRTrans Server
 EAPI=5
 HOMEPAGE=http://www.irtrans.de
 IUSE=mono
-KEYWORDS=~x86 ~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD GPL-2
 RDEPEND=mono? ( >=dev-lang/mono-2.10.5 )
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://ftp.disconnected-by-peer.at/irtrans/irserver-src-6.09.04.tar.gz http://ftp.disconnected-by-peer.at/irtrans/irserver-6.09.04.tar.gz http://www.irtrans.de/download/Server/Linux/irserver-src.tar.gz -> irserver-src-6.09.04.tar.gz http://www.irtrans.de/download/Server/Linux/irserver.tar.gz -> irserver-6.09.04.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1ba7be3fc6edb08f0328b7fa543918cc
+_md5_=65c9e37b00f55410ddb5ab4cf38ecb05
diff --git a/metadata/md5-cache/app-misc/matew-1.9 b/metadata/md5-cache/app-misc/matew-1.9
index e354510f5013..3cbaa6c7e61c 100644
--- a/metadata/md5-cache/app-misc/matew-1.9
+++ b/metadata/md5-cache/app-misc/matew-1.9
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Make Album The Easy Way (Matew) is an HTML/CSS generator for static image albums
 EAPI=0
 HOMEPAGE=http://inquisb.github.io/matew/
-KEYWORDS=~x86 ~ppc ~amd64
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=media-gfx/imagemagick app-shells/bash sys-apps/coreutils
 SLOT=0
 SRC_URI=mirror://sourceforge/matew/matew-1.9.tar.bz2
-_md5_=89128e3c6bea218136896f97b04424d7
+_md5_=797a4a17fd30cd1aa43ad3b36ef087b8
diff --git a/metadata/md5-cache/app-misc/mencal-3.0 b/metadata/md5-cache/app-misc/mencal-3.0
index f2ca2b45861b..d1eb5aa897e6 100644
--- a/metadata/md5-cache/app-misc/mencal-3.0
+++ b/metadata/md5-cache/app-misc/mencal-3.0
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Calendar to track menstruation cycles
 EAPI=6
 HOMEPAGE=http://www.kyberdigi.cz/projects/mencal/english.html
-KEYWORDS=amd64 ~ppc sparc ~mips alpha ~hppa ia64 ~ppc64 x86
+KEYWORDS=alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=http://www.kyberdigi.cz/projects/mencal/files/mencal-3.0.tar.gz
-_md5_=d5b09c20d58f531f94589d9a6f974eef
+_md5_=4afdc0554f89c85443b10f9ce13f2dc2
diff --git a/metadata/md5-cache/app-mobilephone/smstools-3.1.15-r2 b/metadata/md5-cache/app-mobilephone/smstools-3.1.15-r2
index 821e4dc00b52..e8ea647fa7be 100644
--- a/metadata/md5-cache/app-mobilephone/smstools-3.1.15-r2
+++ b/metadata/md5-cache/app-mobilephone/smstools-3.1.15-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Send and receive short messages through GSM modems
 EAPI=5
 HOMEPAGE=http://smstools3.kekekasvi.com/
 IUSE=stats
-KEYWORDS=~x86 ~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-process/procps stats? ( >=dev-libs/mm-1.4.0 )
 SLOT=0
 SRC_URI=http://smstools3.kekekasvi.com/packages/smstools3-3.1.15.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	e68863263b1e8611dacf381bec5c8b2b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b453c81794f53abaf3539312dba2bbd9
+_md5_=2e8d37c4131d50dad008b8cbc676009a
diff --git a/metadata/md5-cache/app-mobilephone/smstools-3.1.21-r1 b/metadata/md5-cache/app-mobilephone/smstools-3.1.21-r1
index 1e2760f43d53..ef35dee3d903 100644
--- a/metadata/md5-cache/app-mobilephone/smstools-3.1.21-r1
+++ b/metadata/md5-cache/app-mobilephone/smstools-3.1.21-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Send and receive short messages through GSM modems
 EAPI=6
 HOMEPAGE=http://smstools3.kekekasvi.com/
 IUSE=stats
-KEYWORDS=~x86 ~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-process/procps stats? ( >=dev-libs/mm-1.4.0 )
 SLOT=0
 SRC_URI=http://smstools3.kekekasvi.com/packages/smstools3-3.1.21.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	e68863263b1e8611dacf381bec5c8b2b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2d79953e8d22c58cd9f78ef2f498d3f9
+_md5_=cca6247bad516b99e0ee76e35a4be809
diff --git a/metadata/md5-cache/app-shells/localshell-1.3.4-r1 b/metadata/md5-cache/app-shells/localshell-1.3.4-r1
index 24a2a8549cbb..8da7989c1f30 100644
--- a/metadata/md5-cache/app-shells/localshell-1.3.4-r1
+++ b/metadata/md5-cache/app-shells/localshell-1.3.4-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install postinst prepare unpack
 DESCRIPTION=Localshell allows per-user/group local control of shell execution
 EAPI=5
 HOMEPAGE=http://git.orbis-terrarum.net/?p=infrastructure/localshellc.git;a=summary
-KEYWORDS=amd64 ppc x86 ~ppc64
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://git.orbis-terrarum.net/?p=infrastructure/localshellc.git;a=summary/localshell-1.3.4.tar.bz2
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c73e63472cdf376926f0fb5096242139
+_md5_=ef7bebb3408f829c2f9acfc048fc65da
diff --git a/metadata/md5-cache/app-shells/soapbox-0.3.1-r2 b/metadata/md5-cache/app-shells/soapbox-0.3.1-r2
index c1b2aa1d58ff..85783c0f38c1 100644
--- a/metadata/md5-cache/app-shells/soapbox-0.3.1-r2
+++ b/metadata/md5-cache/app-shells/soapbox-0.3.1-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A preload (sandbox) library to restrict filesystem writes
 EAPI=5
 HOMEPAGE=http://dag.wieers.com/home-made/soapbox/
-KEYWORDS=amd64 x86 ~ppc ~ppc64
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://dag.wieers.com/home-made/soapbox/soapbox-0.3.1.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=54f53e3c0eff9a376412b90e1a544588
+_md5_=36a06d45419f089f767a64de7f041cce
diff --git a/metadata/md5-cache/app-text/binfind-0.0.3 b/metadata/md5-cache/app-text/binfind-0.0.3
index 5d6122cf19a2..a1b40b3c2cc4 100644
--- a/metadata/md5-cache/app-text/binfind-0.0.3
+++ b/metadata/md5-cache/app-text/binfind-0.0.3
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=binfind searches files for a byte sequence specified on the command line
 EAPI=0
 HOMEPAGE=http://www.lith.at/binfind
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.lith.at/binfind/binfind-0.0.3.tar.gz
-_md5_=5841125651d3fa8925f69f424b6c2ab5
+_md5_=7a3a97608b745464623038ce771d6cef
diff --git a/metadata/md5-cache/app-text/spellutils-0.7 b/metadata/md5-cache/app-text/spellutils-0.7
index 6cd6ddfbc779..9e984c1bf321 100644
--- a/metadata/md5-cache/app-text/spellutils-0.7
+++ b/metadata/md5-cache/app-text/spellutils-0.7
@@ -4,9 +4,9 @@ DESCRIPTION=spellutils includes 'newsbody' (useful for spellchecking in mails, e
 EAPI=5
 HOMEPAGE=http://home.worldonline.dk/byrial/spellutils/
 IUSE=nls
-KEYWORDS=x86 ppc ~sparc alpha ~mips ~hppa amd64
+KEYWORDS=alpha amd64 ~hppa ~mips ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://home.worldonline.dk/byrial/spellutils/spellutils-0.7.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fdb7a8ace7fd5cc03bd6677aa19290ce
+_md5_=84b8610c878a638fb2561c3b92700f79
diff --git a/metadata/md5-cache/app-vim/info-1.7-r2 b/metadata/md5-cache/app-vim/info-1.7-r2
index ba18ac004fe8..9246600faf3f 100644
--- a/metadata/md5-cache/app-vim/info-1.7-r2
+++ b/metadata/md5-cache/app-vim/info-1.7-r2
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: GNU info documentation browser
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=21
-KEYWORDS=x86 alpha sparc ia64 ppc s390 amd64
+KEYWORDS=alpha amd64 ia64 ppc s390 sparc x86
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/info-1.7.tar.bz2 https://dev.gentoo.org/~radhermit/vim/info-1.7.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=455bf123669a333ccebf10543364542d
+_md5_=706ade970910f15d80c98840e7e03227
diff --git a/metadata/md5-cache/app-vim/ri-browser-1.2-r1 b/metadata/md5-cache/app-vim/ri-browser-1.2-r1
index 3c63429f4a81..188307c6e44a 100644
--- a/metadata/md5-cache/app-vim/ri-browser-1.2-r1
+++ b/metadata/md5-cache/app-vim/ri-browser-1.2-r1
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: interface for browsing ri/ruby documentation
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=494
-KEYWORDS=~amd64 ~ppc ~x86 ~sparc
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=public-domain
 RDEPEND=dev-lang/ruby || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ri-browser-1.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ri-browser-1.2.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=89deb7ae680b6dc8c7ae329699d56255
+_md5_=ec77108fa505ec00e6811dd0ba23d9cb
diff --git a/metadata/md5-cache/app-vim/searchcomplete-1.1-r1 b/metadata/md5-cache/app-vim/searchcomplete-1.1-r1
index 44d43e4a1e99..e30ecf32dbf3 100644
--- a/metadata/md5-cache/app-vim/searchcomplete-1.1-r1
+++ b/metadata/md5-cache/app-vim/searchcomplete-1.1-r1
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: tab completion in searches
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=474
-KEYWORDS=alpha sparc x86 ia64 ppc amd64
+KEYWORDS=alpha amd64 ia64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/searchcomplete-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/searchcomplete-1.1.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=1a1c90ea449aae4266893b70b85063e8
+_md5_=1337d7da2f944145952a706ae933ccf9
diff --git a/metadata/md5-cache/app-vim/tmpl-0.1-r1 b/metadata/md5-cache/app-vim/tmpl-0.1-r1
index 8982e669789a..bd40a0a58bd2 100644
--- a/metadata/md5-cache/app-vim/tmpl-0.1-r1
+++ b/metadata/md5-cache/app-vim/tmpl-0.1-r1
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Syntax for Sam Tregar's HTML::Template
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=254
-KEYWORDS=x86 alpha ia64 sparc amd64 ppc
+KEYWORDS=alpha amd64 ia64 ppc sparc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/tmpl-0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/tmpl-0.1.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=93aef8027e08a50dceddbed66438181e
+_md5_=1a1b3805a79d9d46012a2e4684c4b14f
diff --git a/metadata/md5-cache/app-vim/vim-spell-de-20080213-r1 b/metadata/md5-cache/app-vim/vim-spell-de-20080213-r1
index dc00a8ae6ac3..48a24c2712a6 100644
--- a/metadata/md5-cache/app-vim/vim-spell-de-20080213-r1
+++ b/metadata/md5-cache/app-vim/vim-spell-de-20080213-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=vim spell files: German (de)
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ppc sparc x86 ~arm ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/vim-spell-de-20080213.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-spell	dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=cddb55e740a589751db97d7d41df22a6
+_md5_=2a5af3fdbf3e1c307dadc1b5050dd07e
diff --git a/metadata/md5-cache/app-vim/vim-tmux-3.0.0 b/metadata/md5-cache/app-vim/vim-tmux-3.0.0
index 325ac9061bff..25c01614f4d2 100644
--- a/metadata/md5-cache/app-vim/vim-tmux-3.0.0
+++ b/metadata/md5-cache/app-vim/vim-tmux-3.0.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: tmux support for vim
 EAPI=6
 HOMEPAGE=https://github.com/tmux-plugins/vim-tmux
-KEYWORDS=~alpha alpha amd64 ~arm arm ~arm64 ~hppa ia64 ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd
 LICENSE=public-domain MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tmux-plugins/vim-tmux/archive/v3.0.0.tar.gz -> vim-tmux-3.0.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=ac61a78c2b131cea65d1897a8e3ce721
+_md5_=c2c28f966c9eca20f8c1daa5d62d0833
diff --git a/metadata/md5-cache/dev-db/libzdb-2.11.2 b/metadata/md5-cache/dev-db/libzdb-2.11.2
index 9bdb30b7d47a..0cd40ebfba11 100644
--- a/metadata/md5-cache/dev-db/libzdb-2.11.2
+++ b/metadata/md5-cache/dev-db/libzdb-2.11.2
@@ -4,7 +4,7 @@ DESCRIPTION=A thread safe high level multi-database connection pool library
 EAPI=4
 HOMEPAGE=http://www.tildeslash.com/libzdb/
 IUSE=debug doc mysql postgres +sqlite ssl static-libs
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] ) ssl? ( dev-libs/openssl )
 REQUIRED_USE=|| ( postgres mysql sqlite )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.tildeslash.com/libzdb/dist/libzdb-2.11.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=daf4a427611fb283af52d09a14a5a113
+_md5_=2e6abcf0ae64266fc7e26e6492444e84
diff --git a/metadata/md5-cache/dev-db/libzdb-2.11.3 b/metadata/md5-cache/dev-db/libzdb-2.11.3
index 29a12e019795..db0c4ea6c8ab 100644
--- a/metadata/md5-cache/dev-db/libzdb-2.11.3
+++ b/metadata/md5-cache/dev-db/libzdb-2.11.3
@@ -4,7 +4,7 @@ DESCRIPTION=A thread safe high level multi-database connection pool library
 EAPI=4
 HOMEPAGE=http://www.tildeslash.com/libzdb/
 IUSE=debug doc mysql postgres +sqlite ssl static-libs
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] ) ssl? ( dev-libs/openssl )
 REQUIRED_USE=|| ( postgres mysql sqlite )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.tildeslash.com/libzdb/dist/libzdb-2.11.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=daf4a427611fb283af52d09a14a5a113
+_md5_=2e6abcf0ae64266fc7e26e6492444e84
diff --git a/metadata/md5-cache/dev-db/libzdb-3.0 b/metadata/md5-cache/dev-db/libzdb-3.0
index cb9d70d63acc..7bb3ab8a5de4 100644
--- a/metadata/md5-cache/dev-db/libzdb-3.0
+++ b/metadata/md5-cache/dev-db/libzdb-3.0
@@ -4,7 +4,7 @@ DESCRIPTION=A thread safe high level multi-database connection pool library
 EAPI=4
 HOMEPAGE=http://www.tildeslash.com/libzdb/
 IUSE=debug doc mysql postgres +sqlite ssl static-libs
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] ) ssl? ( dev-libs/openssl )
 REQUIRED_USE=|| ( postgres mysql sqlite )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.tildeslash.com/libzdb/dist/libzdb-3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=daf4a427611fb283af52d09a14a5a113
+_md5_=2e6abcf0ae64266fc7e26e6492444e84
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-basic-12 b/metadata/md5-cache/dev-db/oracle-instantclient-basic-12
index 0eda654217dc..63756aaaa2a1 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-basic-12
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-basic-12
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Transition package moving to single dev-db/oracle-instantclient package
 EAPI=6
 HOMEPAGE=https://bugs.gentoo.org/show_bug.cgi?id=524922#c12
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=dev-db/oracle-instantclient-12[sdk]
 SLOT=0
-_md5_=44117f11650738441e331266656b49c4
+_md5_=9d5a1795e06be9e114934ca481d3098b
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-12 b/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-12
index 09b9d8555788..bcddf1a8c97d 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-12
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-12
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Transition package moving to single dev-db/oracle-instantclient package
 EAPI=6
 HOMEPAGE=https://bugs.gentoo.org/show_bug.cgi?id=524922#c12
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=dev-db/oracle-instantclient-basic-12 >=dev-db/oracle-instantclient-12[jdbc]
 SLOT=0
-_md5_=f55f0afdbd172c03905df226c00b2455
+_md5_=c4523475f8f50658e9f86cab7d3b0e40
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-odbc-12 b/metadata/md5-cache/dev-db/oracle-instantclient-odbc-12
index 2e7fc08d3ced..bd9955dcc510 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-odbc-12
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-odbc-12
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Transition package moving to single dev-db/oracle-instantclient package
 EAPI=6
 HOMEPAGE=https://bugs.gentoo.org/show_bug.cgi?id=524922#c12
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=dev-db/oracle-instantclient-basic-12 >=dev-db/oracle-instantclient-12[odbc]
 SLOT=0
-_md5_=8a541d1fa03a4a2593557e84981992b5
+_md5_=2ea74a9b703e5b04dacedf5d54141e0a
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-12 b/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-12
index b238fae2a7eb..4283e50243bf 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-12
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-12
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Transition package moving to single dev-db/oracle-instantclient package
 EAPI=6
 HOMEPAGE=https://bugs.gentoo.org/show_bug.cgi?id=524922#c12
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=dev-db/oracle-instantclient-basic-12 >=dev-db/oracle-instantclient-12[sqlplus]
 SLOT=0
-_md5_=290631d9357e5735918e61e691117897
+_md5_=d228138d8fef80b978775733bb891152
diff --git a/metadata/md5-cache/dev-embedded/gnap-2.0 b/metadata/md5-cache/dev-embedded/gnap-2.0
index d08c19db00f1..caf582113666 100644
--- a/metadata/md5-cache/dev-embedded/gnap-2.0
+++ b/metadata/md5-cache/dev-embedded/gnap-2.0
@@ -3,9 +3,9 @@ DESCRIPTION=Gentoo-based Network Appliance building system
 EAPI=0
 HOMEPAGE=https://embedded.gentoo.org/gnap.xml
 IUSE=minimal
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-cdr/cdrtools sys-fs/dosfstools <sys-boot/syslinux-5
 SLOT=0
 SRC_URI=mirror://gentoo/gnap-tools-2.0.tar.bz2 !minimal? ( mirror://gentoo/gnap-core-2.0.tar )
-_md5_=1324a7b155fcf7f44cee09d346b1f0ef
+_md5_=3f771240838e95c232cfaf31a2227f64
diff --git a/metadata/md5-cache/dev-embedded/jtag-0.5.1-r1 b/metadata/md5-cache/dev-embedded/jtag-0.5.1-r1
index 53720e247ec5..36b0385b9520 100644
--- a/metadata/md5-cache/dev-embedded/jtag-0.5.1-r1
+++ b/metadata/md5-cache/dev-embedded/jtag-0.5.1-r1
@@ -3,10 +3,10 @@ DEPEND=dev-embedded/include
 DESCRIPTION=Tool for working with JTAG-aware devices and boards through JTAG adapter
 EAPI=4
 HOMEPAGE=http://openwince.sourceforge.net/jtag/
-KEYWORDS=x86 sparc ~ppc
+KEYWORDS=~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-embedded/include !dev-embedded/urjtag
 SLOT=0
 SRC_URI=mirror://sourceforge/openwince/jtag-0.5.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f4cff1d47b6c59fddbed3a28a3c6eba0
+_md5_=849822650074fce224e507c90bc000fe
diff --git a/metadata/md5-cache/dev-embedded/parapin-1.0.0 b/metadata/md5-cache/dev-embedded/parapin-1.0.0
index 2d2540046409..4225ba206bfd 100644
--- a/metadata/md5-cache/dev-embedded/parapin-1.0.0
+++ b/metadata/md5-cache/dev-embedded/parapin-1.0.0
@@ -4,9 +4,9 @@ DESCRIPTION=A parallel port pin programming library
 EAPI=0
 HOMEPAGE=http://parapin.sourceforge.net/
 IUSE=doc
-KEYWORDS=x86 ~amd64
+KEYWORDS=~amd64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/parapin/parapin-1.0.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=996274ddbf04b4fcd434d1e53c3fefdf
+_md5_=4a0e78363bd8baeb0b512e8c9e46d511
diff --git a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.5 b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.5
index 567306d6d05f..9beff406a433 100644
--- a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.5
+++ b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.5
@@ -4,10 +4,10 @@ DESCRIPTION=Data encoding library
 EAPI=5
 HOMEPAGE=http://www.haskell.org/haskellwiki/Library/Data_encoding
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-fbsd ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.14.0.5
 SRC_URI=mirror://hackage/packages/archive/dataenc/0.14.0.5/dataenc-0.14.0.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8089195c34f412127a3b7a46d241ac94
+_md5_=0c6993a1b9ee2a41befbfc8feaa75557
diff --git a/metadata/md5-cache/dev-haskell/http-4000.2.8 b/metadata/md5-cache/dev-haskell/http-4000.2.8
index fd2d17534009..afdaeed5e519 100644
--- a/metadata/md5-cache/dev-haskell/http-4000.2.8
+++ b/metadata/md5-cache/dev-haskell/http-4000.2.8
@@ -4,11 +4,11 @@ DESCRIPTION=A library for client-side HTTP
 EAPI=5
 HOMEPAGE=https://github.com/haskell/HTTP
 IUSE=doc hscolour profile test
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-fbsd ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=<dev-haskell/network-2.5:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
 RESTRICT=test
 SLOT=0/4000.2.8
 SRC_URI=mirror://hackage/packages/archive/HTTP/4000.2.8/HTTP-4000.2.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=509638fb77e3a10330b1ee146a824979
+_md5_=97052132b1b3c3559d2d3519ea0b0205
diff --git a/metadata/md5-cache/dev-haskell/stack-bin-1.5.1 b/metadata/md5-cache/dev-haskell/stack-bin-1.5.1
index 0f9503aed832..122e107b8c5d 100644
--- a/metadata/md5-cache/dev-haskell/stack-bin-1.5.1
+++ b/metadata/md5-cache/dev-haskell/stack-bin-1.5.1
@@ -3,9 +3,9 @@ DESCRIPTION=The Haskell Tool Stack (Binary)
 EAPI=6
 HOMEPAGE=https://github.com/commercialhaskell/stack
 IUSE=symlink
-KEYWORDS=~amd64 ~x86 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 RDEPEND=sys-libs/zlib dev-libs/gmp:0 symlink? ( !dev-haskell/stack )
 SLOT=0
 SRC_URI=arm? ( https://github.com/commercialhaskell/stack/releases/download/v1.5.1/stack-1.5.1-linux-arm.tar.gz ) x86? ( https://github.com/commercialhaskell/stack/releases/download/v1.5.1/stack-1.5.1-linux-i386.tar.gz ) amd64? ( https://github.com/commercialhaskell/stack/releases/download/v1.5.1/stack-1.5.1-linux-x86_64.tar.gz )
-_md5_=8984adae787aa0a22d6c79fb3a0ded3b
+_md5_=26538f15acb3451045cba6a4165d457c
diff --git a/metadata/md5-cache/dev-haskell/stack-bin-1.6.1 b/metadata/md5-cache/dev-haskell/stack-bin-1.6.1
index 4040bb3770cb..ba343edc7105 100644
--- a/metadata/md5-cache/dev-haskell/stack-bin-1.6.1
+++ b/metadata/md5-cache/dev-haskell/stack-bin-1.6.1
@@ -3,9 +3,9 @@ DESCRIPTION=The Haskell Tool Stack (Binary)
 EAPI=6
 HOMEPAGE=https://github.com/commercialhaskell/stack
 IUSE=symlink
-KEYWORDS=~amd64 ~x86 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 RDEPEND=sys-libs/zlib dev-libs/gmp:0 symlink? ( !dev-haskell/stack )
 SLOT=0
 SRC_URI=arm? ( https://github.com/commercialhaskell/stack/releases/download/v1.6.1/stack-1.6.1-linux-arm.tar.gz ) x86? ( https://github.com/commercialhaskell/stack/releases/download/v1.6.1/stack-1.6.1-linux-i386.tar.gz ) amd64? ( https://github.com/commercialhaskell/stack/releases/download/v1.6.1/stack-1.6.1-linux-x86_64.tar.gz )
-_md5_=8984adae787aa0a22d6c79fb3a0ded3b
+_md5_=26538f15acb3451045cba6a4165d457c
diff --git a/metadata/md5-cache/dev-haskell/stack-bin-1.7.1 b/metadata/md5-cache/dev-haskell/stack-bin-1.7.1
index 23fcf8a70821..dcfdb8014b35 100644
--- a/metadata/md5-cache/dev-haskell/stack-bin-1.7.1
+++ b/metadata/md5-cache/dev-haskell/stack-bin-1.7.1
@@ -3,9 +3,9 @@ DESCRIPTION=The Haskell Tool Stack (Binary)
 EAPI=7
 HOMEPAGE=https://github.com/commercialhaskell/stack
 IUSE=symlink
-KEYWORDS=~amd64 ~x86 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 RDEPEND=sys-libs/zlib dev-libs/gmp:0 symlink? ( !dev-haskell/stack )
 SLOT=0
 SRC_URI=arm? ( https://github.com/commercialhaskell/stack/releases/download/v1.7.1/stack-1.7.1-linux-arm.tar.gz ) x86? ( https://github.com/commercialhaskell/stack/releases/download/v1.7.1/stack-1.7.1-linux-i386.tar.gz ) amd64? ( https://github.com/commercialhaskell/stack/releases/download/v1.7.1/stack-1.7.1-linux-x86_64.tar.gz )
-_md5_=22f07a6931fed0a0de3ae17e02de6251
+_md5_=f64e9827b91f04a8403f7efac8dcd65f
diff --git a/metadata/md5-cache/dev-java/gradle-bin-3.3 b/metadata/md5-cache/dev-java/gradle-bin-3.3
index ebae8913b970..6efc6df5b800 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-3.3
+++ b/metadata/md5-cache/dev-java/gradle-bin-3.3
@@ -4,10 +4,10 @@ DESCRIPTION=A project automation and build tool with a Groovy based DSL
 EAPI=6
 HOMEPAGE=http://www.gradle.org/
 IUSE=source doc examples elibc_FreeBSD
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=3.3
 SRC_URI=http://services.gradle.org/distributions/gradle-3.3-all.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=65cc8ffcef61a9b17d739aeb4455b16a
+_md5_=a76d21ac280a40b0a72ed046681657bd
diff --git a/metadata/md5-cache/dev-java/gradle-bin-3.4.1 b/metadata/md5-cache/dev-java/gradle-bin-3.4.1
index e21e1b20334f..8fd9bd2b3824 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-3.4.1
+++ b/metadata/md5-cache/dev-java/gradle-bin-3.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=A project automation and build tool with a Groovy based DSL
 EAPI=6
 HOMEPAGE=http://www.gradle.org/
 IUSE=source doc examples elibc_FreeBSD
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=3.4.1
 SRC_URI=http://services.gradle.org/distributions/gradle-3.4.1-all.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=930ef5ac3c1f13a3b806dcb46b50b2b1
+_md5_=7763d1fb3bd6af217b864b497341ada5
diff --git a/metadata/md5-cache/dev-java/joda-convert-1.3.1 b/metadata/md5-cache/dev-java/joda-convert-1.3.1
index 23f15a19e047..99482f96265d 100644
--- a/metadata/md5-cache/dev-java/joda-convert-1.3.1
+++ b/metadata/md5-cache/dev-java/joda-convert-1.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=Java library for conversion between Object and String
 EAPI=5
 HOMEPAGE=http://www.joda.org/joda-convert/
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86 ppc64
+KEYWORDS=amd64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/joda-convert/joda-convert-1.3.1-dist.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ab500aadb8005badef0d7beaa9e949d1
+_md5_=e1ddcf0f087a62ef8b440d4501eadb9a
diff --git a/metadata/md5-cache/dev-java/joda-time-2.7 b/metadata/md5-cache/dev-java/joda-time-2.7
index a350a0ff5a01..45db5563510b 100644
--- a/metadata/md5-cache/dev-java/joda-time-2.7
+++ b/metadata/md5-cache/dev-java/joda-time-2.7
@@ -4,11 +4,11 @@ DESCRIPTION=A quality open-source replacement for the Java Date and Time classes
 EAPI=5
 HOMEPAGE=http://www.joda.org/joda-time/ https://github.com/JodaOrg/joda-time/
 IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 x86 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/JodaOrg/joda-time/releases/download/v2.7/joda-time-2.7-dist.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c4df77829ce5df2a9a8d4cac94369ef8
+_md5_=fcd4bc84f1f2de188e090c43edf8daab
diff --git a/metadata/md5-cache/dev-lang/opendylan-bin-2011.1 b/metadata/md5-cache/dev-lang/opendylan-bin-2011.1
index c0aac2e40570..8657e4759e82 100644
--- a/metadata/md5-cache/dev-lang/opendylan-bin-2011.1
+++ b/metadata/md5-cache/dev-lang/opendylan-bin-2011.1
@@ -3,9 +3,9 @@ DEPEND=dev-libs/boehm-gc
 DESCRIPTION=OpenDylan language runtime environment (prebuilt)
 EAPI=4
 HOMEPAGE=http://opendylan.org
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Opendylan
 RDEPEND=dev-libs/boehm-gc
 SLOT=0
 SRC_URI=amd64? ( http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86_64-linux.tar.bz2 ) x86? ( http://opendylan.org/downloads/opendylan/2011.1/opendylan-2011.1-x86-linux.tar.bz2 )
-_md5_=106cbd573cbb0e715244644d58f96e9a
+_md5_=3c4eafb91f7021de911363bb51eb87a0
diff --git a/metadata/md5-cache/dev-lang/opendylan-bin-2012.1 b/metadata/md5-cache/dev-lang/opendylan-bin-2012.1
index d50ca0adc81c..e8806a331447 100644
--- a/metadata/md5-cache/dev-lang/opendylan-bin-2012.1
+++ b/metadata/md5-cache/dev-lang/opendylan-bin-2012.1
@@ -3,9 +3,9 @@ DEPEND=dev-libs/boehm-gc
 DESCRIPTION=OpenDylan language runtime environment (prebuilt)
 EAPI=4
 HOMEPAGE=http://opendylan.org
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Opendylan
 RDEPEND=dev-libs/boehm-gc
 SLOT=0
 SRC_URI=amd64? ( http://opendylan.org/downloads/opendylan/2012.1/opendylan-2012.1-x86_64-linux.tar.bz2 ) x86? ( http://opendylan.org/downloads/opendylan/2012.1/opendylan-2012.1-x86-linux.tar.bz2 )
-_md5_=68f369ffab467559d149af61a9c91f4a
+_md5_=59534af3598f92e54ef2eb11dcf334f8
diff --git a/metadata/md5-cache/dev-lang/opendylan-bin-2013.1 b/metadata/md5-cache/dev-lang/opendylan-bin-2013.1
index b03fd1c8bd76..19fa1ebe61a1 100644
--- a/metadata/md5-cache/dev-lang/opendylan-bin-2013.1
+++ b/metadata/md5-cache/dev-lang/opendylan-bin-2013.1
@@ -3,9 +3,9 @@ DEPEND=dev-libs/boehm-gc
 DESCRIPTION=OpenDylan language runtime environment (prebuilt)
 EAPI=4
 HOMEPAGE=http://opendylan.org
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Opendylan
 RDEPEND=dev-libs/boehm-gc
 SLOT=0
 SRC_URI=amd64? ( http://opendylan.org/downloads/opendylan/2013.1/opendylan-2013.1-x86_64-linux.tar.bz2 ) x86? ( http://opendylan.org/downloads/opendylan/2013.1/opendylan-2013.1-x86-linux.tar.bz2 )
-_md5_=ab194ea37182c8e54f00b7212434af83
+_md5_=d005f08beb33c714a3cf30b9b31dafb9
diff --git a/metadata/md5-cache/dev-lang/opendylan-bin-2013.2 b/metadata/md5-cache/dev-lang/opendylan-bin-2013.2
index b53b7567ee3b..58415796dc1e 100644
--- a/metadata/md5-cache/dev-lang/opendylan-bin-2013.2
+++ b/metadata/md5-cache/dev-lang/opendylan-bin-2013.2
@@ -3,9 +3,9 @@ DEPEND=dev-libs/boehm-gc
 DESCRIPTION=OpenDylan language runtime environment (prebuilt)
 EAPI=4
 HOMEPAGE=http://opendylan.org
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Opendylan
 RDEPEND=dev-libs/boehm-gc
 SLOT=0
 SRC_URI=amd64? ( http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2 ) x86? ( http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2 )
-_md5_=d44d7ae8afc6ad85036d4aea7ba28c41
+_md5_=d7c2b54c38af2f32e7fd976914495183
diff --git a/metadata/md5-cache/dev-lang/opendylan-bin-2014.1 b/metadata/md5-cache/dev-lang/opendylan-bin-2014.1
index 3af484fd5c37..46bc29c16cda 100644
--- a/metadata/md5-cache/dev-lang/opendylan-bin-2014.1
+++ b/metadata/md5-cache/dev-lang/opendylan-bin-2014.1
@@ -3,9 +3,9 @@ DEPEND=dev-libs/boehm-gc
 DESCRIPTION=OpenDylan language runtime environment (prebuilt)
 EAPI=5
 HOMEPAGE=http://opendylan.org
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Opendylan
 RDEPEND=dev-libs/boehm-gc
 SLOT=0
 SRC_URI=amd64? ( http://opendylan.org/downloads/opendylan/2014.1/opendylan-2014.1-x86_64-linux.tar.bz2 ) x86? ( http://opendylan.org/downloads/opendylan/2014.1/opendylan-2014.1-x86-linux.tar.bz2 )
-_md5_=40b1c9d80898167d058295c474ea3644
+_md5_=ebbc4cf3d090fbbf3eed825f4180e3df
diff --git a/metadata/md5-cache/dev-lang/opendylan-bin-2019.1 b/metadata/md5-cache/dev-lang/opendylan-bin-2019.1
index 15c9c2dd9080..e32ca5d9727e 100644
--- a/metadata/md5-cache/dev-lang/opendylan-bin-2019.1
+++ b/metadata/md5-cache/dev-lang/opendylan-bin-2019.1
@@ -3,9 +3,9 @@ DEPEND=dev-libs/boehm-gc sys-libs/libunwind
 DESCRIPTION=OpenDylan language runtime environment (prebuilt)
 EAPI=7
 HOMEPAGE=http://opendylan.org
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Opendylan
 RDEPEND=dev-libs/boehm-gc sys-libs/libunwind
 SLOT=0
 SRC_URI=amd64? ( http://opendylan.org/downloads/opendylan/2019.1/opendylan-2019.1-x86_64-linux.tar.bz2 ) x86? ( http://opendylan.org/downloads/opendylan/2019.1/opendylan-2019.1-x86-linux.tar.bz2 )
-_md5_=4c66ed29222d98786517c11db3b856a8
+_md5_=6a47e64760422afcee6889f2a8a28251
diff --git a/metadata/md5-cache/dev-lang/pcc-1.1.0-r1 b/metadata/md5-cache/dev-lang/pcc-1.1.0-r1
index 4235b668a659..1633441b31fb 100644
--- a/metadata/md5-cache/dev-lang/pcc-1.1.0-r1
+++ b/metadata/md5-cache/dev-lang/pcc-1.1.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/pcc-libs-1.1.0 >=app-portage/elt-patches-20170815 !<sys-devel/
 DESCRIPTION=pcc portable c compiler
 EAPI=5
 HOMEPAGE=http://pcc.ludd.ltu.se
-KEYWORDS=~x86 ~amd64 ~amd64-fbsd
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd
 LICENSE=BSD
 RDEPEND=>=dev-libs/pcc-libs-1.1.0
 SLOT=0
 SRC_URI=ftp://pcc.ludd.ltu.se/pub/pcc-releases/pcc-1.1.0.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7ee8c5658ddc4f63415c9b6eeeda8379
+_md5_=3ea64112259683e8eb41d6ed4b5ab8db
diff --git a/metadata/md5-cache/dev-lang/pcc-9999 b/metadata/md5-cache/dev-lang/pcc-9999
index 818ca899c4f0..0d09270880bc 100644
--- a/metadata/md5-cache/dev-lang/pcc-9999
+++ b/metadata/md5-cache/dev-lang/pcc-9999
@@ -7,4 +7,4 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/pcc-libs-9999
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cvs	c57fc648b829862b38ad2a8b8c1c02e8	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=59a4517c42c222987e318b03a8895e01
+_md5_=47b00db7faa8de197b75bf7ac4d368c1
diff --git a/metadata/md5-cache/dev-lang/srf-1.0-r2 b/metadata/md5-cache/dev-lang/srf-1.0-r2
index f7ad238e200b..967d4d11627f 100644
--- a/metadata/md5-cache/dev-lang/srf-1.0-r2
+++ b/metadata/md5-cache/dev-lang/srf-1.0-r2
@@ -3,9 +3,9 @@ DEPEND=sys-devel/flex virtual/yacc
 DESCRIPTION=The Simple Recursive Functions programming language
 EAPI=6
 HOMEPAGE=http://www.stratigery.com/srf.html
-KEYWORDS=~x86 ~x86-linux ~ppc-macos ~amd64
+KEYWORDS=~amd64 ~x86 ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.stratigery.com/srf.html/srf-1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=73152801c63f060215321ceae45576b6
+_md5_=a5dc74669fcfe3eacf09796a6e05c107
diff --git a/metadata/md5-cache/dev-libs/cpl-stratego-0.4 b/metadata/md5-cache/dev-libs/cpl-stratego-0.4
index e60064c7da29..92430503c92c 100644
--- a/metadata/md5-cache/dev-libs/cpl-stratego-0.4
+++ b/metadata/md5-cache/dev-libs/cpl-stratego-0.4
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Choice library mostly used by Stratego
 EAPI=0
 HOMEPAGE=http://www.stratego-language.org
-KEYWORDS=x86 sparc ppc alpha ia64
+KEYWORDS=alpha ia64 ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.stratego-language.org/pub/stratego/stratego/cpl-stratego-0.4.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=030177ed8ad6aac7fbc83ef9c11f4b31
+_md5_=3c0de81787dac00624f6efa1732a1504
diff --git a/metadata/md5-cache/dev-libs/libnfc-1.4.2 b/metadata/md5-cache/dev-libs/libnfc-1.4.2
index db5ecc4ca88e..c441a5eab59b 100644
--- a/metadata/md5-cache/dev-libs/libnfc-1.4.2
+++ b/metadata/md5-cache/dev-libs/libnfc-1.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Near Field Communications (NFC) library
 EAPI=4
 HOMEPAGE=http://www.libnfc.org/
 IUSE=doc
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND=sys-apps/pcsc-lite virtual/libusb:0
 SLOT=0
 SRC_URI=https://github.com/nfc-tools/libnfc/releases/download/libnfc-1.4.2/libnfc-1.4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e3876bef279febf845a556a2e972476c
+_md5_=181c658a44bd4b1c81bda5d148a32c5b
diff --git a/metadata/md5-cache/dev-libs/libucl-0.7.3 b/metadata/md5-cache/dev-libs/libucl-0.7.3
index 7c60beeab182..ff5ce4085395 100644
--- a/metadata/md5-cache/dev-libs/libucl-0.7.3
+++ b/metadata/md5-cache/dev-libs/libucl-0.7.3
@@ -4,10 +4,10 @@ DESCRIPTION=Universal configuration library parser
 EAPI=6
 HOMEPAGE=https://github.com/vstakhov/libucl
 IUSE=lua +regex signatures static-libs urlfetch utils
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=!!dev-libs/ucl lua? ( >=dev-lang/lua-5.1:= ) signatures? ( dev-libs/openssl:0 ) urlfetch? ( net-misc/curl )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/libucl/archive/0.7.3.tar.gz -> libucl-0.7.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=c14a2b6b460ec47d976784bb8ed712a7
+_md5_=f5d840b4e43fc72927f46e3887e338bb
diff --git a/metadata/md5-cache/dev-libs/npth-1.5 b/metadata/md5-cache/dev-libs/npth-1.5
index 33c73ad5f77b..4698f4898c14 100644
--- a/metadata/md5-cache/dev-libs/npth-1.5
+++ b/metadata/md5-cache/dev-libs/npth-1.5
@@ -4,9 +4,9 @@ DESCRIPTION=New GNU Portable Threads Library
 EAPI=6
 HOMEPAGE=https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=mirror://gnupg/npth/npth-1.5.tar.bz2
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=0816a73c8a458b87930dedf8bc8b50da
+_md5_=c8ee39f793ae7c4ac05e4efd0a0c8099
diff --git a/metadata/md5-cache/dev-libs/npth-1.6 b/metadata/md5-cache/dev-libs/npth-1.6
index 81fdf3c334a9..c4fe6ef64c84 100644
--- a/metadata/md5-cache/dev-libs/npth-1.6
+++ b/metadata/md5-cache/dev-libs/npth-1.6
@@ -4,9 +4,9 @@ DESCRIPTION=New GNU Portable Threads Library
 EAPI=6
 HOMEPAGE=https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=mirror://gnupg/npth/npth-1.6.tar.bz2
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=aefae917f13ae69a491c4a719cead573
+_md5_=e957435e2844175a6bef9c720467a32a
diff --git a/metadata/md5-cache/dev-libs/pcc-libs-1.1.0 b/metadata/md5-cache/dev-libs/pcc-libs-1.1.0
index 4b739fdcb4f5..df4a2609162f 100644
--- a/metadata/md5-cache/dev-libs/pcc-libs-1.1.0
+++ b/metadata/md5-cache/dev-libs/pcc-libs-1.1.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=pcc compiler support libs
 EAPI=5
 HOMEPAGE=http://pcc.ludd.ltu.se
-KEYWORDS=~x86 ~amd64 ~amd64-fbsd
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=ftp://pcc.ludd.ltu.se/pub/pcc-releases/pcc-libs-1.1.0.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0d802886fbbd4a64f6ca93439db42b35
+_md5_=1df9e536dd18039ec9cac586979588c7
diff --git a/metadata/md5-cache/dev-libs/pcc-libs-9999 b/metadata/md5-cache/dev-libs/pcc-libs-9999
index 395b8529260c..f17af53a5725 100644
--- a/metadata/md5-cache/dev-libs/pcc-libs-9999
+++ b/metadata/md5-cache/dev-libs/pcc-libs-9999
@@ -6,4 +6,4 @@ HOMEPAGE=http://pcc.ludd.ltu.se
 LICENSE=BSD
 SLOT=0
 _eclasses_=cvs	c57fc648b829862b38ad2a8b8c1c02e8	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1f9b72cf53a31249df5bab4f273c38c3
+_md5_=ff526d463e23918d323c99766ca2d78b
diff --git a/metadata/md5-cache/dev-libs/vanessa-adt-0.0.6 b/metadata/md5-cache/dev-libs/vanessa-adt-0.0.6
index fe9e5317aaea..2a7c3506b72e 100644
--- a/metadata/md5-cache/dev-libs/vanessa-adt-0.0.6
+++ b/metadata/md5-cache/dev-libs/vanessa-adt-0.0.6
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/vanessa-logger-0.0.6
 DESCRIPTION=Abstract Data Types. Includes queue, dynamic array, hash and key value ADT
 EAPI=0
 HOMEPAGE=http://horms.net/projects/vanessa/
-KEYWORDS=x86 ~ppc
+KEYWORDS=~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/vanessa-logger-0.0.6
 SLOT=0
 SRC_URI=http://horms.net/projects/vanessa/download/vanessa_adt/0.0.6/vanessa_adt-0.0.6.tar.gz
-_md5_=f68fcce5c60bfe12b3c910ed86630881
+_md5_=e513437530973343de4d58b83fd88cd6
diff --git a/metadata/md5-cache/dev-lua/luarocks-2.0.12 b/metadata/md5-cache/dev-lua/luarocks-2.0.12
index e8ea9fbae506..fde6dea8729c 100644
--- a/metadata/md5-cache/dev-lua/luarocks-2.0.12
+++ b/metadata/md5-cache/dev-lua/luarocks-2.0.12
@@ -4,10 +4,10 @@ DESCRIPTION=A deployment and management system for Lua modules
 EAPI=4
 HOMEPAGE=http://www.luarocks.org
 IUSE=curl openssl
-KEYWORDS=~x86 ~amd64 ~ppc
+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.0.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=167451fdbeea5706c377cfa620e9ed67
+_md5_=662d6e52debd2cdd5eb42decafcb653a
diff --git a/metadata/md5-cache/dev-lua/luarocks-2.0.7.1 b/metadata/md5-cache/dev-lua/luarocks-2.0.7.1
index 708577f41a2c..699be2647ee8 100644
--- a/metadata/md5-cache/dev-lua/luarocks-2.0.7.1
+++ b/metadata/md5-cache/dev-lua/luarocks-2.0.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=A deployment and management system for Lua modules
 EAPI=4
 HOMEPAGE=http://www.luarocks.org
 IUSE=curl openssl
-KEYWORDS=~x86 ~amd64 ~ppc
+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.0.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=177e898e5f3bb65f9311436ebb7468e4
+_md5_=db25d94f7da0b9ee221d6cc0a9ffabe2
diff --git a/metadata/md5-cache/dev-lua/luarocks-2.0.8 b/metadata/md5-cache/dev-lua/luarocks-2.0.8
index 6d9bad61dd05..0056e1dbaccd 100644
--- a/metadata/md5-cache/dev-lua/luarocks-2.0.8
+++ b/metadata/md5-cache/dev-lua/luarocks-2.0.8
@@ -4,10 +4,10 @@ DESCRIPTION=A deployment and management system for Lua modules
 EAPI=4
 HOMEPAGE=http://www.luarocks.org
 IUSE=curl openssl
-KEYWORDS=~x86 ~amd64 ~ppc
+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.0.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=806dae19d89d21f382e183ecc3a7bfe5
+_md5_=24851d9cb2f5c12c3818bce6911be83f
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.10 b/metadata/md5-cache/dev-python/alabaster-0.7.10
index b2d721a56703..d5964e4fc562 100644
--- a/metadata/md5-cache/dev-python/alabaster-0.7.10
+++ b/metadata/md5-cache/dev-python/alabaster-0.7.10
@@ -4,11 +4,11 @@ DESCRIPTION=A configurable sidebar-enabled Sphinx theme
 EAPI=6
 HOMEPAGE=https://github.com/bitprophet/alabaster
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-solaris ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/alabaster/alabaster-0.7.10.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b701765b78ef51b788453df40ede2097
+_md5_=c00aebcb327260aa76ce652592e25649
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.11 b/metadata/md5-cache/dev-python/alabaster-0.7.11
index e7a203734c4c..a8b5820b21a6 100644
--- a/metadata/md5-cache/dev-python/alabaster-0.7.11
+++ b/metadata/md5-cache/dev-python/alabaster-0.7.11
@@ -4,11 +4,11 @@ DESCRIPTION=A configurable sidebar-enabled Sphinx theme
 EAPI=6
 HOMEPAGE=https://github.com/bitprophet/alabaster
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-solaris ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/alabaster/alabaster-0.7.11.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=60fa0a49e9e997482eb787e10b83a8bf
+_md5_=fbf3dcaf10a8d20054c128656f6976ed
diff --git a/metadata/md5-cache/dev-python/cryptography-2.2.2-r1 b/metadata/md5-cache/dev-python/cryptography-2.2.2-r1
index d1dc69426b03..ffde8cef313f 100644
--- a/metadata/md5-cache/dev-python/cryptography-2.2.2-r1
+++ b/metadata/md5-cache/dev-python/cryptography-2.2.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Library providing cryptographic recipes and primitives
 EAPI=6
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
 IUSE=libressl test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] >=dev-libs/openssl-1.0.2o-r6:0 ) ) ) libressl? ( dev-libs/libressl:0= ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-2.2.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=54aa62889f012d8ade4a4c7004dfc1da
+_md5_=d21998f3f1fc9e3a470fbd26ac4a8d0a
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-2.2.2 b/metadata/md5-cache/dev-python/cryptography-vectors-2.2.2
index 9574f95ac7e2..881aa2f6d777 100644
--- a/metadata/md5-cache/dev-python/cryptography-vectors-2.2.2
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-2.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=Test vectors for the cryptography package
 EAPI=6
 HOMEPAGE=https://pypi.org/project/cryptography-vectors/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-2.2.2.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3c4e3e074e89b303e7c87d01dec3bfc2
+_md5_=6450d1df4f60460615731f962591a25e
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-2.3 b/metadata/md5-cache/dev-python/cryptography-vectors-2.3
index 4ba80ee8c134..9e956917fa68 100644
--- a/metadata/md5-cache/dev-python/cryptography-vectors-2.3
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-2.3
@@ -4,11 +4,11 @@ DESCRIPTION=Test vectors for the cryptography package
 EAPI=6
 HOMEPAGE=https://pypi.org/project/cryptography-vectors/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-2.3.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=42e8213bff962c17ec92b1b41b019724
+_md5_=0bce30db257255e9fbcde26e62cd0991
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-2.3.1 b/metadata/md5-cache/dev-python/cryptography-vectors-2.3.1
index 1ac703175a9b..3357af9b6f51 100644
--- a/metadata/md5-cache/dev-python/cryptography-vectors-2.3.1
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-2.3.1
@@ -5,11 +5,11 @@ DESCRIPTION=Test vectors for the cryptography package
 EAPI=7
 HOMEPAGE=https://pypi.org/project/cryptography-vectors/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~amd64-fbsd ~amd64-linux ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x64-macos ~x64-solaris ~x86 ~x86-fbsd ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-2.3.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=84bcadbf2841ce208b4873ad90bfdec9
+_md5_=f49bf5dc334bc344a5f75d0e8a1b3714
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-2.4.2 b/metadata/md5-cache/dev-python/cryptography-vectors-2.4.2
index 671a17ddf4f0..a3f4b5d971f1 100644
--- a/metadata/md5-cache/dev-python/cryptography-vectors-2.4.2
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-2.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=Test vectors for the cryptography package
 EAPI=6
 HOMEPAGE=https://pypi.org/project/cryptography-vectors/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-2.4.2.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=42e8213bff962c17ec92b1b41b019724
+_md5_=0bce30db257255e9fbcde26e62cd0991
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-2.5 b/metadata/md5-cache/dev-python/cryptography-vectors-2.5
index 1c0c9ddfac8b..fc47a0536209 100644
--- a/metadata/md5-cache/dev-python/cryptography-vectors-2.5
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-2.5
@@ -4,11 +4,11 @@ DESCRIPTION=Test vectors for the cryptography package
 EAPI=6
 HOMEPAGE=https://pypi.org/project/cryptography-vectors/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-2.5.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=42e8213bff962c17ec92b1b41b019724
+_md5_=0bce30db257255e9fbcde26e62cd0991
diff --git a/metadata/md5-cache/dev-python/cssselect-1.0.1 b/metadata/md5-cache/dev-python/cssselect-1.0.1
index a43b9df1182d..2055df3bc1f2 100644
--- a/metadata/md5-cache/dev-python/cssselect-1.0.1
+++ b/metadata/md5-cache/dev-python/cssselect-1.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=parses CSS3 Selectors and translates them to XPath 1.0
 EAPI=6
 HOMEPAGE=https://cssselect.readthedocs.io/en/latest/ https://pypi.org/project/cssselect/
 IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/cssselect/cssselect-1.0.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f65573655620d3d027ace70f0404aca4
+_md5_=98f421c604976382c9bb8c225525c663
diff --git a/metadata/md5-cache/dev-python/cssselect-1.0.3 b/metadata/md5-cache/dev-python/cssselect-1.0.3
index 99c62973916d..75afd72a5834 100644
--- a/metadata/md5-cache/dev-python/cssselect-1.0.3
+++ b/metadata/md5-cache/dev-python/cssselect-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=parses CSS3 Selectors and translates them to XPath 1.0
 EAPI=6
 HOMEPAGE=https://cssselect.readthedocs.io/en/latest/ https://pypi.org/project/cssselect/ https://github.com/scrapy/cssselect
 IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/scrapy/cssselect/archive/v1.0.3.tar.gz -> cssselect-1.0.3.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=44276be65255ca2c6378a17a7a028a42
+_md5_=ed47c8448e5047f8181116f0efbe0eeb
diff --git a/metadata/md5-cache/dev-python/gdmodule-0.56-r2 b/metadata/md5-cache/dev-python/gdmodule-0.56-r2
index d357eb5b52b3..691ae2856938 100644
--- a/metadata/md5-cache/dev-python/gdmodule-0.56-r2
+++ b/metadata/md5-cache/dev-python/gdmodule-0.56-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Python extensions for gd
 EAPI=5
 HOMEPAGE=https://github.com/Solomoriah/gdmodule
 IUSE=jpeg png truetype xpm python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x86-linux
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=media-libs/gd[jpeg?,png?,truetype?,xpm?] media-libs/giflib jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) truetype? ( media-libs/freetype:2 ) xpm? ( x11-libs/libXpm ) 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 )
 SLOT=0
 SRC_URI=http://newcenturycomputers.net/projects/download.cgi/gdmodule-0.56.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b57ebf170cbe572fd51a32b6e11c9d8a
+_md5_=45fa738df0cec535faccd0997425507c
diff --git a/metadata/md5-cache/dev-python/hgdistver-0.25 b/metadata/md5-cache/dev-python/hgdistver-0.25
index c77bd761b30e..0a037a417576 100644
--- a/metadata/md5-cache/dev-python/hgdistver-0.25
+++ b/metadata/md5-cache/dev-python/hgdistver-0.25
@@ -4,11 +4,11 @@ DESCRIPTION=utility lib to generate python package version infos from mercurial
 EAPI=5
 HOMEPAGE=https://pypi.org/project/hgdistver/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hgdistver/hgdistver-0.25.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fe8728e84294d28af4d9711cab16afce
+_md5_=f9960a6a2e74dfa8fd24d8053b22ef0a
diff --git a/metadata/md5-cache/dev-python/imageio-1.5 b/metadata/md5-cache/dev-python/imageio-1.5
index 656c453803c5..85e924f33586 100644
--- a/metadata/md5-cache/dev-python/imageio-1.5
+++ b/metadata/md5-cache/dev-python/imageio-1.5
@@ -4,11 +4,11 @@ DESCRIPTION=Python library for reading and writing image data
 EAPI=6
 HOMEPAGE=https://imageio.github.io/
 IUSE=python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] media-libs/freeimage python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/imageio/imageio/archive/v1.5.tar.gz -> imageio-1.5.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d88f0e3c9ef503750302f88c56839453
+_md5_=c5190fda01b93febbc607d3bc6e41ce1
diff --git a/metadata/md5-cache/dev-python/imageio-1.6 b/metadata/md5-cache/dev-python/imageio-1.6
index b1a42e5c09c2..315348e1cd51 100644
--- a/metadata/md5-cache/dev-python/imageio-1.6
+++ b/metadata/md5-cache/dev-python/imageio-1.6
@@ -4,11 +4,11 @@ DESCRIPTION=Python library for reading and writing image data
 EAPI=6
 HOMEPAGE=https://imageio.github.io/
 IUSE=python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] media-libs/freeimage python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/imageio/imageio/archive/v1.6.tar.gz -> imageio-1.6.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d88f0e3c9ef503750302f88c56839453
+_md5_=c5190fda01b93febbc607d3bc6e41ce1
diff --git a/metadata/md5-cache/dev-python/imageio-2.0.1 b/metadata/md5-cache/dev-python/imageio-2.0.1
index 9ba4255c148e..4bd805782696 100644
--- a/metadata/md5-cache/dev-python/imageio-2.0.1
+++ b/metadata/md5-cache/dev-python/imageio-2.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python library for reading and writing image data
 EAPI=6
 HOMEPAGE=https://imageio.github.io/
 IUSE=python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] media-libs/freeimage python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/imageio/imageio/archive/v2.0.1.tar.gz -> imageio-2.0.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d88f0e3c9ef503750302f88c56839453
+_md5_=c5190fda01b93febbc607d3bc6e41ce1
diff --git a/metadata/md5-cache/dev-python/oauth2client-4.1.2 b/metadata/md5-cache/dev-python/oauth2client-4.1.2
index 56de783173c8..60371f0c50b5 100644
--- a/metadata/md5-cache/dev-python/oauth2client-4.1.2
+++ b/metadata/md5-cache/dev-python/oauth2client-4.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Library for accessing resources protected by OAuth 2.0
 EAPI=6
 HOMEPAGE=https://github.com/google/oauth2client
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~arm amd64 ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-modules-0.0.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) !<=dev-python/google-api-python-client-1.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/google/oauth2client/archive/v4.1.2.tar.gz -> oauth2client-4.1.2.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=465ffa6fddd69ecdfb9ee85f2b6d2240
+_md5_=7cf04b8d81b08d0d13fdc40f7e4c24f2
diff --git a/metadata/md5-cache/dev-python/pycipher-0.2-r1 b/metadata/md5-cache/dev-python/pycipher-0.2-r1
index 95df9b827dd2..8d0892f3575e 100644
--- a/metadata/md5-cache/dev-python/pycipher-0.2-r1
+++ b/metadata/md5-cache/dev-python/pycipher-0.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Python module that implements several well-known classical cipher
 EAPI=6
 HOMEPAGE=http://pycipher.sourceforge.net
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pycipher/pycipher-0.2.py
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=48997c7d5f7b824e4f56c2dd22e00365
+_md5_=bf8d531b0e250260462d41665dfa5f67
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.13.0 b/metadata/md5-cache/dev-python/pyrsistent-0.13.0
index 014e0e4c8f11..340dbdb2979c 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.13.0
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.13.0
@@ -4,11 +4,11 @@ DESCRIPTION=Persistent/Functional/Immutable data structures
 EAPI=6
 HOMEPAGE=https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyrsistent/pyrsistent-0.13.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9bf002efde3f3c0f500f360df72fe487
+_md5_=ada82c1e3af4762d9cb59d3b4755b345
diff --git a/metadata/md5-cache/dev-python/python-gflags-3.1.1 b/metadata/md5-cache/dev-python/python-gflags-3.1.1
index bec36bb03fec..bf1603dc8db3 100644
--- a/metadata/md5-cache/dev-python/python-gflags-3.1.1
+++ b/metadata/md5-cache/dev-python/python-gflags-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Google's Python argument parsing library
 EAPI=6
 HOMEPAGE=https://github.com/google/python-gflags
 IUSE=python_targets_pypy python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~sparc ~s390 ~sh x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gflags/python-gflags-3.1.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=16e86e6a7916504496efe158c8256c82
+_md5_=a724041044be9756d138732666225198
diff --git a/metadata/md5-cache/dev-python/secretstorage-2.3.1 b/metadata/md5-cache/dev-python/secretstorage-2.3.1
index 90d70d7a509e..4f4111cf322f 100644
--- a/metadata/md5-cache/dev-python/secretstorage-2.3.1
+++ b/metadata/md5-cache/dev-python/secretstorage-2.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings to FreeDesktop.org Secret Service API.
 EAPI=6
 HOMEPAGE=https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~arm amd64 ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SecretStorage/SecretStorage-2.3.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8fb9852de3eb2737bb403053486eb515
+_md5_=c6b36065ce2926da530d0c9bef2fd308
diff --git a/metadata/md5-cache/dev-python/uncertainties-3.0.1 b/metadata/md5-cache/dev-python/uncertainties-3.0.1
index cb1649aa9ae8..464ab54f5c44 100644
--- a/metadata/md5-cache/dev-python/uncertainties-3.0.1
+++ b/metadata/md5-cache/dev-python/uncertainties-3.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python module for calculations with uncertainties
 EAPI=6
 HOMEPAGE=https://pythonhosted.org/uncertainties/
 IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/u/uncertainties/uncertainties-3.0.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=0f8fe9a45d933bc5ecc84fbcf9ca8f79
+_md5_=0cbbcf0b4dbe89aeecf0e2bd768b8fce
diff --git a/metadata/md5-cache/dev-python/uvloop-0.12.2 b/metadata/md5-cache/dev-python/uvloop-0.12.2
new file mode 100644
index 000000000000..75a5e117a93e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/uvloop-0.12.2
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libuv-1.11.0:= dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pyopenssl[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Ultra-fast implementation of asyncio event loop on top of libuv
+EAPI=7
+HOMEPAGE=https://github.com/magicstack/uvloop
+IUSE=doc examples test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/libuv-1.11.0:= python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/u/uvloop/uvloop-0.12.2.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=c9ea2ff572d5bf4c9a4de4cc3edefb44
diff --git a/metadata/md5-cache/dev-python/wehjit-0.2.2-r1 b/metadata/md5-cache/dev-python/wehjit-0.2.2-r1
index accad3d1501d..c254c1e35d83 100644
--- a/metadata/md5-cache/dev-python/wehjit-0.2.2-r1
+++ b/metadata/md5-cache/dev-python/wehjit-0.2.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Python web-widget library
 EAPI=5
 HOMEPAGE=http://jderose.fedorapeople.org/wehjit
 IUSE=test python_targets_python2_7
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/genshi dev-python/assets[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[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 )
 SLOT=0
 SRC_URI=http://jderose.fedorapeople.org/wehjit/0.2.2/wehjit-0.2.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4d689c8c99dccdae05774b42bb0feb98
+_md5_=50a54a988572f9b2b86b212be007b2ce
diff --git a/metadata/md5-cache/dev-scheme/scheme48-1.9.2-r1 b/metadata/md5-cache/dev-scheme/scheme48-1.9.2-r1
index dbf02d3c245d..2be5e226ed98 100644
--- a/metadata/md5-cache/dev-scheme/scheme48-1.9.2-r1
+++ b/metadata/md5-cache/dev-scheme/scheme48-1.9.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Scheme48 is an implementation of the Scheme Programming Language
 EAPI=5
 HOMEPAGE=http://www.s48.org/
 IUSE=doc emacs
-KEYWORDS=~x86 ~amd64 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=http://www.s48.org/1.9.2/scheme48-1.9.2.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a5c43c7c32b5815d97c58b6bbb38b414
+_md5_=f72ad7d00ec417a372980455c0eda115
diff --git a/metadata/md5-cache/dev-tcltk/scwoop-4.1 b/metadata/md5-cache/dev-tcltk/scwoop-4.1
index 49d83d4e0da3..7d263f77fcc8 100644
--- a/metadata/md5-cache/dev-tcltk/scwoop-4.1
+++ b/metadata/md5-cache/dev-tcltk/scwoop-4.1
@@ -3,9 +3,9 @@ DEPEND=dev-tcltk/tcllib
 DESCRIPTION=Simple Composite Widget Object Oriented Package
 EAPI=0
 HOMEPAGE=http://jfontain.free.fr/scwoop41.htm
-KEYWORDS=x86 amd64 ~ppc
+KEYWORDS=amd64 ~ppc x86
 LICENSE=jfontain
 RDEPEND=dev-tcltk/tcllib
 SLOT=0
 SRC_URI=http://jfontain.free.fr/scwoop-4.1.tar.gz
-_md5_=952d8e0fd603e3e9e753af7b7ff592d4
+_md5_=0b313a5ba7d8e2bb39e24744404e8351
diff --git a/metadata/md5-cache/dev-tcltk/tkzinc-3.3.6 b/metadata/md5-cache/dev-tcltk/tkzinc-3.3.6
index 04228e4aad28..3c25daa9947d 100644
--- a/metadata/md5-cache/dev-tcltk/tkzinc-3.3.6
+++ b/metadata/md5-cache/dev-tcltk/tkzinc-3.3.6
@@ -4,10 +4,10 @@ DESCRIPTION=A Tk widget library
 EAPI=6
 HOMEPAGE=http://www.tkzinc.org
 IUSE=debug doc threads
-KEYWORDS=~amd64 ~x86 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2
 RDEPEND=dev-lang/tk:= media-libs/glew:= virtual/opengl doc? ( virtual/latex-base )
 SLOT=0
 SRC_URI=http://www.tkzinc.org/Packages/Tkzinc-3.3.6plus.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=48f6cdc3c2ee97f8e0c46a1c164ab9b8
+_md5_=6389ce681cab91dc65e4e6ca73e52f09
diff --git a/metadata/md5-cache/dev-tex/cdcover-1.3b b/metadata/md5-cache/dev-tex/cdcover-1.3b
index 2f128d0340c2..3c498d7693af 100644
--- a/metadata/md5-cache/dev-tex/cdcover-1.3b
+++ b/metadata/md5-cache/dev-tex/cdcover-1.3b
@@ -3,10 +3,10 @@ DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX package used to create CD case covers
 EAPI=0
 HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/cd-cover/
-KEYWORDS=x86 amd64 ~sparc
+KEYWORDS=amd64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/cdcover-1.3b.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	latex-package	17f13abe0de88340745e52e6b627aee7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=802c1aca46869bed3e2cc147df025f80
+_md5_=18a9a575488516772517414b5b9734af
diff --git a/metadata/md5-cache/dev-tex/latex-calendar-3.1 b/metadata/md5-cache/dev-tex/latex-calendar-3.1
index de066c13817a..6f15881315fa 100644
--- a/metadata/md5-cache/dev-tex/latex-calendar-3.1
+++ b/metadata/md5-cache/dev-tex/latex-calendar-3.1
@@ -3,10 +3,10 @@ DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX package used to create Calendars. Very flexible and robust
 EAPI=0
 HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/calendar/
-KEYWORDS=x86 sparc ppc amd64
+KEYWORDS=amd64 ppc sparc x86
 LICENSE=LaTeX-Calendar
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/latex-calendar-3.1.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	latex-package	17f13abe0de88340745e52e6b627aee7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=97b203cf092e73880869e16829943eb2
+_md5_=dded82b0212517e7928a3b2888d3d233
diff --git a/metadata/md5-cache/dev-tex/quotchap-0.9f b/metadata/md5-cache/dev-tex/quotchap-0.9f
index a99f0b4061b2..26fca2f3963b 100644
--- a/metadata/md5-cache/dev-tex/quotchap-0.9f
+++ b/metadata/md5-cache/dev-tex/quotchap-0.9f
@@ -3,10 +3,10 @@ DEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX package used to add quotes to chapters
 EAPI=0
 HOMEPAGE=ftp://ftp.dante.de/tex-archive/help/Catalogue/entries/quotchap.html
-KEYWORDS=x86 ppc ~amd64
+KEYWORDS=~amd64 ppc x86
 LICENSE=LPPL-1.2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/quotchap-0.9f.zip
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	latex-package	17f13abe0de88340745e52e6b627aee7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8be728947b67869948207a372b2504ac
+_md5_=f1a46d54ce1f4b4166419f34727fd62a
diff --git a/metadata/md5-cache/dev-tex/rcsinfo-1.11 b/metadata/md5-cache/dev-tex/rcsinfo-1.11
index 54aeff529989..f8f58687b986 100644
--- a/metadata/md5-cache/dev-tex/rcsinfo-1.11
+++ b/metadata/md5-cache/dev-tex/rcsinfo-1.11
@@ -3,10 +3,10 @@ DEPEND=dev-tex/latex2html app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4
 DESCRIPTION=A LaTeX module to acces RCS/CVS version info
 EAPI=0
 HOMEPAGE=http://www.ctan.org/pkg/rcsinfo
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=LPPL-1.2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/rcsinfo-1.11.zip
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	latex-package	17f13abe0de88340745e52e6b627aee7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0dee30629657133147efcde686b7df85
+_md5_=7d437de75d4407ad8bd6429174da70d7
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-4.16.0-r1 b/metadata/md5-cache/dev-util/artifactory-bin-4.16.0-r1
index 84c7e737faa4..3e0850e2aef2 100644
--- a/metadata/md5-cache/dev-util/artifactory-bin-4.16.0-r1
+++ b/metadata/md5-cache/dev-util/artifactory-bin-4.16.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The world's most advanced repository manager for maven
 EAPI=6
 HOMEPAGE=http://www.jfrog.org/products.php
 IUSE=ssl
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+
 RDEPEND=>=virtual/jre-1.8
 SLOT=0
 SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-4.16.0.zip -> artifactory-4.16.0.zip
 _eclasses_=user	e68863263b1e8611dacf381bec5c8b2b
-_md5_=b4484668b2047f40133f9f19250cd485
+_md5_=bbb8325ab79209449630d95c83c06da0
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-4.16.1 b/metadata/md5-cache/dev-util/artifactory-bin-4.16.1
index 0b7179e1538d..60d586ca073f 100644
--- a/metadata/md5-cache/dev-util/artifactory-bin-4.16.1
+++ b/metadata/md5-cache/dev-util/artifactory-bin-4.16.1
@@ -4,10 +4,10 @@ DESCRIPTION=The world's most advanced repository manager for maven
 EAPI=6
 HOMEPAGE=http://www.jfrog.org/products.php
 IUSE=ssl
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+
 RDEPEND=>=virtual/jre-1.8
 SLOT=0
 SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-4.16.1.zip -> artifactory-4.16.1.zip
 _eclasses_=user	e68863263b1e8611dacf381bec5c8b2b
-_md5_=b4484668b2047f40133f9f19250cd485
+_md5_=bbb8325ab79209449630d95c83c06da0
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-5.11.2 b/metadata/md5-cache/dev-util/artifactory-bin-5.11.2
index eca2695e48cd..cff7de6df83e 100644
--- a/metadata/md5-cache/dev-util/artifactory-bin-5.11.2
+++ b/metadata/md5-cache/dev-util/artifactory-bin-5.11.2
@@ -4,10 +4,10 @@ DESCRIPTION=The world's most advanced repository manager for maven
 EAPI=6
 HOMEPAGE=http://www.jfrog.org/products.php
 IUSE=ssl
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+
 RDEPEND=>=virtual/jre-1.8
 SLOT=0
 SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.11.2.zip -> artifactory-5.11.2.zip
 _eclasses_=user	e68863263b1e8611dacf381bec5c8b2b
-_md5_=388d380498dfee81261779cbca27f742
+_md5_=7e0c1025c3cc30e1b9d930cfc91d9cc7
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-5.3.2 b/metadata/md5-cache/dev-util/artifactory-bin-5.3.2
index 95937d4f9a2d..7a1e8141573c 100644
--- a/metadata/md5-cache/dev-util/artifactory-bin-5.3.2
+++ b/metadata/md5-cache/dev-util/artifactory-bin-5.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=The world's most advanced repository manager for maven
 EAPI=6
 HOMEPAGE=http://www.jfrog.org/products.php
 IUSE=ssl
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+
 RDEPEND=>=virtual/jre-1.8
 SLOT=0
 SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.3.2.zip -> artifactory-5.3.2.zip
 _eclasses_=user	e68863263b1e8611dacf381bec5c8b2b
-_md5_=26a42f94f47f8eba0a417b9297b2793c
+_md5_=7e0c1025c3cc30e1b9d930cfc91d9cc7
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-5.4.4 b/metadata/md5-cache/dev-util/artifactory-bin-5.4.4
index 7dc5d415870e..a5e7399c049b 100644
--- a/metadata/md5-cache/dev-util/artifactory-bin-5.4.4
+++ b/metadata/md5-cache/dev-util/artifactory-bin-5.4.4
@@ -4,10 +4,10 @@ DESCRIPTION=The world's most advanced repository manager for maven
 EAPI=6
 HOMEPAGE=http://www.jfrog.org/products.php
 IUSE=ssl
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+
 RDEPEND=>=virtual/jre-1.8
 SLOT=0
 SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.4.4.zip -> artifactory-5.4.4.zip
 _eclasses_=user	e68863263b1e8611dacf381bec5c8b2b
-_md5_=26a42f94f47f8eba0a417b9297b2793c
+_md5_=7e0c1025c3cc30e1b9d930cfc91d9cc7
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-5.4.6 b/metadata/md5-cache/dev-util/artifactory-bin-5.4.6
index 8792310e29aa..9d6ee7a966c2 100644
--- a/metadata/md5-cache/dev-util/artifactory-bin-5.4.6
+++ b/metadata/md5-cache/dev-util/artifactory-bin-5.4.6
@@ -4,10 +4,10 @@ DESCRIPTION=The world's most advanced repository manager for maven
 EAPI=6
 HOMEPAGE=http://www.jfrog.org/products.php
 IUSE=ssl
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+
 RDEPEND=>=virtual/jre-1.8
 SLOT=0
 SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.4.6.zip -> artifactory-5.4.6.zip
 _eclasses_=user	e68863263b1e8611dacf381bec5c8b2b
-_md5_=26a42f94f47f8eba0a417b9297b2793c
+_md5_=7e0c1025c3cc30e1b9d930cfc91d9cc7
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-5.5.1 b/metadata/md5-cache/dev-util/artifactory-bin-5.5.1
index 80a21b46523f..83001bc5b340 100644
--- a/metadata/md5-cache/dev-util/artifactory-bin-5.5.1
+++ b/metadata/md5-cache/dev-util/artifactory-bin-5.5.1
@@ -4,10 +4,10 @@ DESCRIPTION=The world's most advanced repository manager for maven
 EAPI=6
 HOMEPAGE=http://www.jfrog.org/products.php
 IUSE=ssl
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+
 RDEPEND=>=virtual/jre-1.8
 SLOT=0
 SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.5.1.zip -> artifactory-5.5.1.zip
 _eclasses_=user	e68863263b1e8611dacf381bec5c8b2b
-_md5_=26a42f94f47f8eba0a417b9297b2793c
+_md5_=7e0c1025c3cc30e1b9d930cfc91d9cc7
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-5.5.2 b/metadata/md5-cache/dev-util/artifactory-bin-5.5.2
index dbffea5f4862..6d4a6adf006d 100644
--- a/metadata/md5-cache/dev-util/artifactory-bin-5.5.2
+++ b/metadata/md5-cache/dev-util/artifactory-bin-5.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=The world's most advanced repository manager for maven
 EAPI=6
 HOMEPAGE=http://www.jfrog.org/products.php
 IUSE=ssl
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+
 RDEPEND=>=virtual/jre-1.8
 SLOT=0
 SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.5.2.zip -> artifactory-5.5.2.zip
 _eclasses_=user	e68863263b1e8611dacf381bec5c8b2b
-_md5_=26a42f94f47f8eba0a417b9297b2793c
+_md5_=7e0c1025c3cc30e1b9d930cfc91d9cc7
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-5.6.2 b/metadata/md5-cache/dev-util/artifactory-bin-5.6.2
index 932e157c8b59..925c1f8a6d95 100644
--- a/metadata/md5-cache/dev-util/artifactory-bin-5.6.2
+++ b/metadata/md5-cache/dev-util/artifactory-bin-5.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=The world's most advanced repository manager for maven
 EAPI=6
 HOMEPAGE=http://www.jfrog.org/products.php
 IUSE=ssl
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+
 RDEPEND=>=virtual/jre-1.8
 SLOT=0
 SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.6.2.zip -> artifactory-5.6.2.zip
 _eclasses_=user	e68863263b1e8611dacf381bec5c8b2b
-_md5_=26a42f94f47f8eba0a417b9297b2793c
+_md5_=7e0c1025c3cc30e1b9d930cfc91d9cc7
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-5.6.3 b/metadata/md5-cache/dev-util/artifactory-bin-5.6.3
index 389b73616dc0..6211720e3c9d 100644
--- a/metadata/md5-cache/dev-util/artifactory-bin-5.6.3
+++ b/metadata/md5-cache/dev-util/artifactory-bin-5.6.3
@@ -4,10 +4,10 @@ DESCRIPTION=The world's most advanced repository manager for maven
 EAPI=6
 HOMEPAGE=http://www.jfrog.org/products.php
 IUSE=ssl
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+
 RDEPEND=>=virtual/jre-1.8
 SLOT=0
 SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.6.3.zip -> artifactory-5.6.3.zip
 _eclasses_=user	e68863263b1e8611dacf381bec5c8b2b
-_md5_=26a42f94f47f8eba0a417b9297b2793c
+_md5_=7e0c1025c3cc30e1b9d930cfc91d9cc7
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-6.3.3 b/metadata/md5-cache/dev-util/artifactory-bin-6.3.3
index 81846ff870aa..0d3a313a82ae 100644
--- a/metadata/md5-cache/dev-util/artifactory-bin-6.3.3
+++ b/metadata/md5-cache/dev-util/artifactory-bin-6.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=The world's most advanced repository manager for maven
 EAPI=6
 HOMEPAGE=http://www.jfrog.org/products.php
 IUSE=ssl
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+
 RDEPEND=>=virtual/jre-1.8
 SLOT=0
 SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-6.3.3.zip -> artifactory-6.3.3.zip
 _eclasses_=user	e68863263b1e8611dacf381bec5c8b2b
-_md5_=388d380498dfee81261779cbca27f742
+_md5_=7e0c1025c3cc30e1b9d930cfc91d9cc7
diff --git a/metadata/md5-cache/dev-util/hxd-0.70.02-r2 b/metadata/md5-cache/dev-util/hxd-0.70.02-r2
index 469c5b1038f6..b6e76eda69e7 100644
--- a/metadata/md5-cache/dev-util/hxd-0.70.02-r2
+++ b/metadata/md5-cache/dev-util/hxd-0.70.02-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Binary to hexadecimal converter
 EAPI=6
 HOMEPAGE=http://www-tet.ee.tu-berlin.de/solyga/linux/
-KEYWORDS=~amd64 ~x86 ~sparc ~mips ~ppc
+KEYWORDS=~amd64 ~mips ~ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://linux.xulin.de/c/hxd-0.70.02.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ead7880c2d6631b53a35bfe625c03baf
+_md5_=577cf4b3f81a8f91ef459a9020678a04
diff --git a/metadata/md5-cache/dev-util/its4-1.1.1 b/metadata/md5-cache/dev-util/its4-1.1.1
index 5b9da69771d8..7c26b4984c6f 100644
--- a/metadata/md5-cache/dev-util/its4-1.1.1
+++ b/metadata/md5-cache/dev-util/its4-1.1.1
@@ -3,9 +3,9 @@ DEPEND=sys-devel/gcc
 DESCRIPTION=ITS4: Software Security Tool
 EAPI=0
 HOMEPAGE=http://www.cigital.com/its4/
-KEYWORDS=x86 ppc
+KEYWORDS=ppc x86
 LICENSE=ITS4
 RDEPEND=sys-devel/gcc
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/its4-1.1.1.tgz
-_md5_=2b01c958953a6648ae6e202658eba9b3
+_md5_=c97492cab66aa6d4ea8ee2609ad8c2dc
diff --git a/metadata/md5-cache/dev-util/its4-1.1.1-r1 b/metadata/md5-cache/dev-util/its4-1.1.1-r1
index 708958389647..4f6eda816965 100644
--- a/metadata/md5-cache/dev-util/its4-1.1.1-r1
+++ b/metadata/md5-cache/dev-util/its4-1.1.1-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=ITS4: Software Security Tool
 EAPI=5
 HOMEPAGE=http://www.cigital.com/its4/
-KEYWORDS=~x86 ~ppc ~amd64
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=ITS4
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/its4-1.1.1.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dc6a5f66a29bdd61ae8e276ad1ea14db
+_md5_=0bbf397df9a7809af5b1f2d23a4b3250
diff --git a/metadata/md5-cache/dev-util/makepp-1.18 b/metadata/md5-cache/dev-util/makepp-1.18
index 4d1cf0f833be..66a066b9d18e 100644
--- a/metadata/md5-cache/dev-util/makepp-1.18
+++ b/metadata/md5-cache/dev-util/makepp-1.18
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/perl-5.6.0
 DESCRIPTION=GNU make replacement
 EAPI=0
 HOMEPAGE=http://makepp.sourceforge.net/
-KEYWORDS=~x86 ~ppc ~sparc alpha
+KEYWORDS=alpha ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.6.0
 SLOT=0
 SRC_URI=mirror://sourceforge/makepp/makepp-1.18.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=308aa3c6d6d8622c70ec378936796e3f
+_md5_=f68dae84e699f0a992cb99bc0b15f7a5
diff --git a/metadata/md5-cache/dev-util/mpatch-0.8-r1 b/metadata/md5-cache/dev-util/mpatch-0.8-r1
index 0c57a6c0253b..39ff21b1bd58 100644
--- a/metadata/md5-cache/dev-util/mpatch-0.8-r1
+++ b/metadata/md5-cache/dev-util/mpatch-0.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Patch-like tool which can resolve common causes of patch rejects whe
 EAPI=5
 HOMEPAGE=http://oss.oracle.com/~mason/mpatch/
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://oss.oracle.com/~mason/mpatch/mpatch-0.8.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=519506b095888ca07b794196065fcd3e
+_md5_=8fa6986df90e8b99c431d282cbec3a9f
diff --git a/metadata/md5-cache/dev-util/mutrace-0.2-r1 b/metadata/md5-cache/dev-util/mutrace-0.2-r1
index c8b4dae8258c..8b2167e79f59 100644
--- a/metadata/md5-cache/dev-util/mutrace-0.2-r1
+++ b/metadata/md5-cache/dev-util/mutrace-0.2-r1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/binutils-libs:=
 DESCRIPTION=A mutex tracer/profiler
 EAPI=5
 HOMEPAGE=http://0pointer.de/blog/projects/mutrace.html
-KEYWORDS=~x86 ~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2 LGPL-3
 RDEPEND=sys-libs/binutils-libs:=
 SLOT=0
 SRC_URI=http://0pointer.de/public/mutrace-0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b195eb97a0a67b65564ae7cfd9430921
+_md5_=9c1d66bd5779511cf50faaa809141c95
diff --git a/metadata/md5-cache/dev-util/treecc-0.3.10-r1 b/metadata/md5-cache/dev-util/treecc-0.3.10-r1
index 8ca1dc35ec5c..9c255a33cddd 100644
--- a/metadata/md5-cache/dev-util/treecc-0.3.10-r1
+++ b/metadata/md5-cache/dev-util/treecc-0.3.10-r1
@@ -4,8 +4,8 @@ DESCRIPTION=Compiler-compiler tool for aspect-oriented programming
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/dotgnu
 IUSE=doc examples
-KEYWORDS=~alpha ~amd64 ~amd64-linux ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~sparc-solaris ~x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/dotgnu-pnet/treecc-0.3.10.tar.gz
-_md5_=0f24b6cb6a2625c081010ff13476196c
+_md5_=a23a830ce29fc7b1e440e11b106823de
diff --git a/metadata/md5-cache/dev-util/xdelta-3.0.11 b/metadata/md5-cache/dev-util/xdelta-3.0.11
index 69d4d16d55d0..e8cd4a69e156 100644
--- a/metadata/md5-cache/dev-util/xdelta-3.0.11
+++ b/metadata/md5-cache/dev-util/xdelta-3.0.11
@@ -4,9 +4,9 @@ DESCRIPTION=Computes changes between binary or text files and creates deltas
 EAPI=6
 HOMEPAGE=http://xdelta.org/
 IUSE=examples lzma
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-fbsd
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=lzma? ( app-arch/xz-utils:= )
 SLOT=3
 SRC_URI=https://github.com/jmacd/xdelta-gpl/releases/download/v3.0.11/xdelta3-3.0.11.tar.gz
-_md5_=62c0a7dcd3d85916f7cce39848a668da
+_md5_=a2de11e960f6d8087fe02eb456ee212e
diff --git a/metadata/md5-cache/dev-util/xesam-tools-0.7.0-r1 b/metadata/md5-cache/dev-util/xesam-tools-0.7.0-r1
index 68430086fe7b..81646944006f 100644
--- a/metadata/md5-cache/dev-util/xesam-tools-0.7.0-r1
+++ b/metadata/md5-cache/dev-util/xesam-tools-0.7.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Development tools and examples for the Xesam desktop search API
 EAPI=5
 HOMEPAGE=http://xesam.org/people/kamstrup/xesam-tools
 IUSE=examples python_targets_python2_7
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://xesam.org/people/kamstrup/xesam-tools/xesam-tools-0.7.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=08672d8b5060b81f344a2187d14c528e
+_md5_=357f1df342869b8409a179e0efe6b38b
diff --git a/metadata/md5-cache/dev-vcs/git-mailz-0.12 b/metadata/md5-cache/dev-vcs/git-mailz-0.12
index facdb9827143..8a57849d24b4 100644
--- a/metadata/md5-cache/dev-vcs/git-mailz-0.12
+++ b/metadata/md5-cache/dev-vcs/git-mailz-0.12
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Send a collection of patches as emails
 EAPI=5
 HOMEPAGE=https://github.com/roman-neuhauser/git-mailz/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=virtual/mta dev-vcs/git app-shells/zsh
 SLOT=0
 SRC_URI=http://codex.sigpipe.cz/git-mailz/git-mailz-0.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=50df76590216ef0e633e871b1c011c7c
+_md5_=81deac4483b1d2f0c6dc3284debd51ce
diff --git a/metadata/md5-cache/dev-vcs/git-mailz-0.14 b/metadata/md5-cache/dev-vcs/git-mailz-0.14
index 7523719bc19f..c878458c0a10 100644
--- a/metadata/md5-cache/dev-vcs/git-mailz-0.14
+++ b/metadata/md5-cache/dev-vcs/git-mailz-0.14
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Send a collection of patches as emails
 EAPI=5
 HOMEPAGE=https://github.com/roman-neuhauser/git-mailz/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=virtual/mta dev-vcs/git app-shells/zsh
 SLOT=0
 SRC_URI=http://codex.sigpipe.cz/git-mailz/git-mailz-0.14.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=50df76590216ef0e633e871b1c011c7c
+_md5_=81deac4483b1d2f0c6dc3284debd51ce
diff --git a/metadata/md5-cache/games-roguelike/dwarf-fortress-0.43.05 b/metadata/md5-cache/games-roguelike/dwarf-fortress-0.43.05
index 8d0a258dac0c..e5ab37adefbe 100644
--- a/metadata/md5-cache/games-roguelike/dwarf-fortress-0.43.05
+++ b/metadata/md5-cache/games-roguelike/dwarf-fortress-0.43.05
@@ -4,11 +4,11 @@ DESCRIPTION=A single-player fantasy game
 EAPI=6
 HOMEPAGE=http://www.bay12games.com/dwarves
 IUSE=debug
-KEYWORDS=~amd64 ~x86 -*
+KEYWORDS=-* ~amd64 ~x86
 LICENSE=free-noncomm BSD BitstreamVera
 RDEPEND=media-libs/glew:0 media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-ttf sys-libs/zlib virtual/glu x11-libs/gtk+:2
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( http://www.bay12games.com/dwarves/df_43_05_linux.tar.bz2 ) x86? ( http://www.bay12games.com/dwarves/df_43_05_linux32.tar.bz2 )
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=102c5922c0c4cd66a46474ac37fbd2e6
+_md5_=48b0888f9f7102ce8a6597f34b1cd441
diff --git a/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.12 b/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.12
index 0269658086ad..3f2d40c40730 100644
--- a/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.12
+++ b/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.12
@@ -4,11 +4,11 @@ DESCRIPTION=A single-player fantasy game
 EAPI=6
 HOMEPAGE=http://www.bay12games.com/dwarves
 IUSE=debug
-KEYWORDS=~amd64 ~x86 -*
+KEYWORDS=-* ~amd64 ~x86
 LICENSE=free-noncomm BSD BitstreamVera
 RDEPEND=media-libs/glew:0 media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-ttf sys-libs/zlib virtual/glu x11-libs/gtk+:2
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( http://www.bay12games.com/dwarves/df_44_12_linux.tar.bz2 ) x86? ( http://www.bay12games.com/dwarves/df_44_12_linux32.tar.bz2 )
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=102c5922c0c4cd66a46474ac37fbd2e6
+_md5_=48b0888f9f7102ce8a6597f34b1cd441
diff --git a/metadata/md5-cache/games-util/uglygs-0_rc11-r1 b/metadata/md5-cache/games-util/uglygs-0_rc11-r1
index 99520cb90cdc..155ce055dfc1 100644
--- a/metadata/md5-cache/games-util/uglygs-0_rc11-r1
+++ b/metadata/md5-cache/games-util/uglygs-0_rc11-r1
@@ -3,9 +3,9 @@ DEPEND=net-analyzer/rrdtool[graph] dev-lang/perl
 DESCRIPTION=Quickly searches the network for game servers
 EAPI=6
 HOMEPAGE=http://uglygs.uglypunk.com/
-KEYWORDS=~amd64 ~alpha ~hppa ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~x86
 LICENSE=GPL-2
 RDEPEND=net-analyzer/rrdtool[graph] dev-lang/perl
 SLOT=0
 SRC_URI=ftp://ftp.uglypunk.com/uglygs/current/uglygs-rc11.tar.gz
-_md5_=1e54e366634cdab26ff210fcff85abba
+_md5_=db45e961b5be353a57c93a579e1ff2de
diff --git a/metadata/md5-cache/media-fonts/comic-neue-2.2 b/metadata/md5-cache/media-fonts/comic-neue-2.2
index 2b79178439db..f8c5a9a9637a 100644
--- a/metadata/md5-cache/media-fonts/comic-neue-2.2
+++ b/metadata/md5-cache/media-fonts/comic-neue-2.2
@@ -4,9 +4,9 @@ DESCRIPTION=Typographically savvy casual script typeface
 EAPI=5
 HOMEPAGE=http://comicneue.com/
 IUSE=X
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~mips
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://comicneue.com/comic-neue-2.2.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	641b5065e2f20fe6e35ec386d8826107	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bb7a3b9f3d47c1c12b638e78dd29e4f0
+_md5_=0bbc30403072062e5842645d3e20c092
diff --git a/metadata/md5-cache/media-fonts/freefont-20120503 b/metadata/md5-cache/media-fonts/freefont-20120503
index e804df355d7e..1a4fee33618e 100644
--- a/metadata/md5-cache/media-fonts/freefont-20120503
+++ b/metadata/md5-cache/media-fonts/freefont-20120503
@@ -4,10 +4,10 @@ DESCRIPTION=OpenType and TrueType Unicode fonts from the Free UCS Outline Fonts
 EAPI=5
 HOMEPAGE=https://savannah.nongnu.org/projects/freefont/
 IUSE=X
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-fbsd ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://gnu/freefont/freefont-ttf-20120503.zip mirror://gnu/freefont/freefont-otf-20120503.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	641b5065e2f20fe6e35ec386d8826107	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=98125d9a319c948e17a767c4fb7438d3
+_md5_=17eefb363333cfc7cc07de1c43664d98
diff --git a/metadata/md5-cache/media-fonts/iosevka-1.14.1 b/metadata/md5-cache/media-fonts/iosevka-1.14.1
index 4f65f5176b67..fb60102daf43 100644
--- a/metadata/md5-cache/media-fonts/iosevka-1.14.1
+++ b/metadata/md5-cache/media-fonts/iosevka-1.14.1
@@ -4,9 +4,9 @@ DESCRIPTION=Slender typeface for code, from code
 EAPI=6
 HOMEPAGE=https://be5invis.github.io/Iosevka/
 IUSE=X
-KEYWORDS=~x86 ~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/be5invis/iosevka/releases/download/v1.14.1/01-iosevka-1.14.1.zip https://github.com/be5invis/iosevka/releases/download/v1.14.1/02-iosevka-term-1.14.1.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	641b5065e2f20fe6e35ec386d8826107	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=becae4c313c42583cd2e923fb0057732
+_md5_=a315257f100b1c4e24d2e76d889a46c0
diff --git a/metadata/md5-cache/media-fonts/vdrsymbols-ttf-20100612 b/metadata/md5-cache/media-fonts/vdrsymbols-ttf-20100612
index 6869042b2b00..8536fd5a5ae7 100644
--- a/metadata/md5-cache/media-fonts/vdrsymbols-ttf-20100612
+++ b/metadata/md5-cache/media-fonts/vdrsymbols-ttf-20100612
@@ -4,9 +4,9 @@ DESCRIPTION=Font that contains symbols needed for VDR
 EAPI=0
 HOMEPAGE=http://andreas.vdr-developer.org/fonts/
 IUSE=X
-KEYWORDS=~arm amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BitstreamVera
 SLOT=0
 SRC_URI=http://andreas.vdr-developer.org/fonts/download/vdrsymbols-ttf-20100612.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	641b5065e2f20fe6e35ec386d8826107	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9ed3deaa67bc1105d62cd372d3d0590a
+_md5_=a5547ac7753e2ca12ddff4b40f41d5d1
diff --git a/metadata/md5-cache/media-gfx/crwinfo-0.2 b/metadata/md5-cache/media-gfx/crwinfo-0.2
index 0438d394a999..2075936f1bf1 100644
--- a/metadata/md5-cache/media-gfx/crwinfo-0.2
+++ b/metadata/md5-cache/media-gfx/crwinfo-0.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Canon raw image (CRW) information and thumbnail extractor
 EAPI=4
 HOMEPAGE=http://freshmeat.net/projects/crwinfo/
-KEYWORDS=x86 ppc sparc amd64 alpha ia64 hppa ppc64
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://neuemuenze.heim1.tu-clausthal.de/~sven/crwinfo/CRWInfo-0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=233d4d65d49ff26a0219ca2516d9ddcf
+_md5_=1b616c05e95adca890456080ea6373d8
diff --git a/metadata/md5-cache/media-gfx/hp2xx-3.4.4 b/metadata/md5-cache/media-gfx/hp2xx-3.4.4
index 162056e749d5..e87bcbae0bac 100644
--- a/metadata/md5-cache/media-gfx/hp2xx-3.4.4
+++ b/metadata/md5-cache/media-gfx/hp2xx-3.4.4
@@ -3,10 +3,10 @@ DEPEND=media-libs/libpng media-libs/tiff sys-libs/zlib virtual/jpeg
 DESCRIPTION=Convert Hewlett-Packard's HP-GL plotter language to other graphics formats
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/hp2xx/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng media-libs/tiff sys-libs/zlib virtual/jpeg
 SLOT=0
 SRC_URI=mirror://gnu/hp2xx/hp2xx-3.4.4.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9a2598b99759ccad56212b2d1e5223a8
+_md5_=efaf6806ad4c0e3456970266522f6063
diff --git a/metadata/md5-cache/media-libs/openmoiv-1.0.3a b/metadata/md5-cache/media-libs/openmoiv-1.0.3a
index b793b899bc6d..e3a048b765dd 100644
--- a/metadata/md5-cache/media-libs/openmoiv-1.0.3a
+++ b/metadata/md5-cache/media-libs/openmoiv-1.0.3a
@@ -3,10 +3,10 @@ DEPEND=media-libs/coin sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Object-oriented 3D toolkit for rendering and interaction of chemical systems
 EAPI=6
 HOMEPAGE=http://www.tecn.upf.es/openMOIV/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=media-libs/coin
 SLOT=0
 SRC_URI=http://www.tecn.upf.es/openMOIV/download/1.0.3/OpenMOIV.src.1.0.3a.tar.bz2
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4ec0088163c7a0f71b97ed2f7150b2b7
+_md5_=063e8edadb0f3f2043efeed36b87fe2b
diff --git a/metadata/md5-cache/media-libs/raspberrypi-userland-bin-1.20170303 b/metadata/md5-cache/media-libs/raspberrypi-userland-bin-1.20170303
index 1c6c8b4b2eb7..2a738b707f51 100644
--- a/metadata/md5-cache/media-libs/raspberrypi-userland-bin-1.20170303
+++ b/metadata/md5-cache/media-libs/raspberrypi-userland-bin-1.20170303
@@ -3,11 +3,11 @@ DESCRIPTION=Raspberry Pi userspace tools and libraries
 EAPI=5
 HOMEPAGE=https://github.com/raspberrypi/firmware
 IUSE=+hardfp examples
-KEYWORDS=~arm -*
+KEYWORDS=-* ~arm
 LICENSE=BSD GPL-2 raspberrypi-videocore-bin
 RDEPEND=!media-libs/raspberrypi-userland
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://github.com/raspberrypi/firmware/archive/1.20170303.tar.gz -> raspberrypi-firmware-1.20170303.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=8faacec0e66d0f17e60e8c123afa1960
+_md5_=c8255cd3e8110e1320a19ce40d7d9e3c
diff --git a/metadata/md5-cache/media-plugins/vco-plugins-0.3.0 b/metadata/md5-cache/media-plugins/vco-plugins-0.3.0
index 2cdf8e487bae..347424755b61 100644
--- a/metadata/md5-cache/media-plugins/vco-plugins-0.3.0
+++ b/metadata/md5-cache/media-plugins/vco-plugins-0.3.0
@@ -3,10 +3,10 @@ DEPEND=media-libs/ladspa-sdk
 DESCRIPTION=SAW-VCO ladspa plugin package. Anti-aliased oscillators
 EAPI=4
 HOMEPAGE=http://www.kokkinizita.net/linuxaudio/
-KEYWORDS=x86 amd64 ~ppc
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/ladspa-sdk
 SLOT=0
 SRC_URI=http://www.kokkinizita.net/linuxaudio/downloads/VCO-plugins-0.3.0.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=67ba9fb4b6c3fba345208b2e7eda87d0
+_md5_=b1a24b2cc801a8b0dc120d7c7190d6b2
diff --git a/metadata/md5-cache/media-plugins/vdr-browse-0.2.0 b/metadata/md5-cache/media-plugins/vdr-browse-0.2.0
index 43ca020b4c38..166c4085a0c8 100644
--- a/metadata/md5-cache/media-plugins/vdr-browse-0.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-browse-0.2.0
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.3.36 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linu
 DESCRIPTION=VDR plugin: browse now/next epg info while keep watching the current channel
 EAPI=4
 HOMEPAGE=http://www.fepg.org/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.36 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.fepg.org/files/vdr-browse-0.2.0.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=bc2e5b2c8e3c0285154373503003b1f3
+_md5_=6a53e87904e2d6ae86a92c3b464e1a32
diff --git a/metadata/md5-cache/media-plugins/vdr-console-0.6.0 b/metadata/md5-cache/media-plugins/vdr-console-0.6.0
index a0280ac6014a..857c81fccc86 100644
--- a/metadata/md5-cache/media-plugins/vdr-console-0.6.0
+++ b/metadata/md5-cache/media-plugins/vdr-console-0.6.0
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linux
 DESCRIPTION=vdr Plugin: Shows linux console on vdr's output device
 EAPI=5
 HOMEPAGE=http://ricomp.de/vdr/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://ricomp.de/vdr/vdr-console-0.6.0.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=d995d70e8d372f3e7d4b93317e3ca808
+_md5_=2966724bb034e59800342b005532f498
diff --git a/metadata/md5-cache/media-plugins/vdr-exec-0.0.3 b/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
index 8430922569ff..a8a3d7d3230a 100644
--- a/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linux
 DESCRIPTION=VDR plugin: Exec commands like timers at defined times
 EAPI=5
 HOMEPAGE=http://wirbel.htpc-forum.de/exec/index2.html
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://wirbel.htpc-forum.de/exec/vdr-exec-0.0.3.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=82710cf8dba01451e1384d1cfaf941c6
+_md5_=38c0b67c50aee6556318c4018c0f16f8
diff --git a/metadata/md5-cache/media-plugins/vdr-extb-0.3.1 b/metadata/md5-cache/media-plugins/vdr-extb-0.3.1
index bb5975e9444b..0290b2503b0a 100644
--- a/metadata/md5-cache/media-plugins/vdr-extb-0.3.1
+++ b/metadata/md5-cache/media-plugins/vdr-extb-0.3.1
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.6.0 app-misc/lirc >=media-tv/gentoo-vdr-scripts-0.4.2
 DESCRIPTION=VDR Plugin: used to control the VDR Extension Board
 EAPI=5
 HOMEPAGE=http://www.deltab.de/content/view/74/76/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 app-misc/lirc >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.deltab.de/component/option,com_docman/task,doc_download/gid,102/ -> vdr-extb-0.3.1.tar.gz mirror://vdrfiles/vdr-extb/extb_firmware_1.08_lircd.conf.zip mirror://vdrfiles/vdr-extb/extb.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=c83fa20eb705ef760ea2334408207ef0
+_md5_=20cd75cdfd40574618db0b1d9ccfc910
diff --git a/metadata/md5-cache/media-plugins/vdr-graphlcd-0.1.9 b/metadata/md5-cache/media-plugins/vdr-graphlcd-0.1.9
index bcd08e90e34c..d5512636894c 100644
--- a/metadata/md5-cache/media-plugins/vdr-graphlcd-0.1.9
+++ b/metadata/md5-cache/media-plugins/vdr-graphlcd-0.1.9
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.6 >=app-misc/graphlcd-base-0.1.9 >=media-tv/gentoo-vd
 DESCRIPTION=VDR Plugin: support output on Graphical LCD
 EAPI=5
 HOMEPAGE=https://projects.vdr-developer.org/projects/graphlcd
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6 >=app-misc/graphlcd-base-0.1.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/502/vdr-graphlcd-0.1.9.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=fb1b8f09eecf7de8c442bb578f33d8ae
+_md5_=cb8b3e13719b0adc89b40e3300f8f8a0
diff --git a/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3 b/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
index 134a8a9e7900..d69b06fe011d 100644
--- a/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.4.6 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linux
 DESCRIPTION=VDR plugin: allows using a joystick as a remote control for VDR
 EAPI=5
 HOMEPAGE=http://www.powarman.de/vdr_plugins.htm
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://home.arcor.de/andreas.regel/files/joystick/vdr-joystick-0.0.3.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=bce51eb7fe9ed784602a799a03572a13
+_md5_=f303912f0308fa877bd005f4a40bba2a
diff --git a/metadata/md5-cache/media-plugins/vdr-kvdrmon-0.6 b/metadata/md5-cache/media-plugins/vdr-kvdrmon-0.6
index 3a4467f59d01..ca4d75d9a2bb 100644
--- a/metadata/md5-cache/media-plugins/vdr-kvdrmon-0.6
+++ b/metadata/md5-cache/media-plugins/vdr-kvdrmon-0.6
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.3.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linux
 DESCRIPTION=VDR Plugin: monitors on KDE Kickerapplet kvdrmon
 EAPI=5
 HOMEPAGE=http://vdr-statusleds.sf.net/kvdrmon
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://sourceforge/vdr-statusleds/vdr-kvdrmon-0.6.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=153732b47d929b7e750e7cad191e2994
+_md5_=1d194b09aafa443b70f27af676ff2666
diff --git a/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4 b/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4
index f73144c89092..bbc77e29fbcd 100644
--- a/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.3.7 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linux
 DESCRIPTION=VDR Plugin: launch other plugins - even when their menu-entry is hidden
 EAPI=5
 HOMEPAGE=http://people.freenet.de/cwieninger/html/vdr-launcher.html
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/launcher/downloads/vdr-launcher-0.0.4.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=97bc0b18db9573a8f219562b8243304e
+_md5_=5101afef103b2497293d0b292015d901
diff --git a/metadata/md5-cache/media-plugins/vdr-mount-0.0.2 b/metadata/md5-cache/media-plugins/vdr-mount-0.0.2
index 192f37cc31d1..2f2da784b3ca 100644
--- a/metadata/md5-cache/media-plugins/vdr-mount-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-mount-0.0.2
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.2.6 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linux
 DESCRIPTION=VDR plugin: (Un)Mount removable media via osd
 EAPI=5
 HOMEPAGE=http://www.vdr-wiki.de/wiki/index.php/Mount-plugin
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://homepages.physik.uni-muenchen.de/~Felix.Rauscher/vdr-mount-0.0.2.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=c738922125dac3a0bf1c199d222093b5
+_md5_=af25172f2cad4cde2c7d303b1eaccdf0
diff --git a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2 b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2
index 74662915e8f3..12de2dc5cda0 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.4.6 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linux
 DESCRIPTION=VDR plugin: VDR OSD access for ext. programs through a TCP/IP socket connection
 EAPI=5
 HOMEPAGE=http://www.udo-richter.de/vdr/osdserver.en.html
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.udo-richter.de/vdr/files/vdr-osdserver-0.1.2.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=2b208c71c6151d8bbfb5a2fc407e407e
+_md5_=1a00ffc8ca56ebc1a5ae96498f7bcba4
diff --git a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3 b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
index a3769ecbe3ec..0ef63ef36b36 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.7.20 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linu
 DESCRIPTION=VDR plugin: VDR OSD access for ext. programs through a TCP/IP socket connection
 EAPI=6
 HOMEPAGE=http://www.udo-richter.de/vdr/osdserver.en.html
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.udo-richter.de/vdr/files/vdr-osdserver-0.1.3.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=0a7ff78af1bba1af53351dd1670a76b3
+_md5_=a36e171feaa0efd3ba49d599d3e98897
diff --git a/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1 b/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
index 09a1331c1395..c524686d7a6c 100644
--- a/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
+++ b/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.4.1 media-libs/alsa-lib >=media-tv/gentoo-vdr-scripts
 DESCRIPTION=VDR plugin: Control the vol level of diff controls of your sound- card according to the settings of VDR
 EAPI=5
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-sndctl
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.1 media-libs/alsa-lib >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.vdr-portal.de/board/attachment.php?attachmentid=25497 -> vdr-sndctl-0.1.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=11cab65e14a15f2f8916ea459c6ca500
+_md5_=35959ac8f3823ba51891d63b6124e5f4
diff --git a/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1 b/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1
index c6a1d82132fc..856f8c59bbd6 100644
--- a/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1
@@ -3,10 +3,10 @@ DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-h
 DESCRIPTION=VDR Plugin: Show still image instead of live tv to safe cpu
 EAPI=6
 HOMEPAGE=http://phivdr.dyndns.org/vdr/vdr-suspendoutput/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://phivdr.dyndns.org/vdr/vdr-suspendoutput/vdr-suspendoutput-2.0.1.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=ff6c75e17e7f7b97f201443dc72dc780
+_md5_=d0a76258d68d6e92759d6ab23c921c6a
diff --git a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1 b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1
index 6f5d17fb5473..53e0e71d3b2e 100644
--- a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.4.7 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linux
 DESCRIPTION=VDR Plugin: systeminfo
 EAPI=5
 HOMEPAGE=http://firefly.vdr-developer.org/systeminfo/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/lm_sensors app-admin/hddtemp >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/systeminfo/vdr-systeminfo-0.1.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=2e5111de8f9ba0760f518dc9dc37ab1c
+_md5_=5fa13de0909758431e2e92c7633e35b1
diff --git a/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14 b/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
index 6b26fab5680f..e3d181200f0e 100644
--- a/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
+++ b/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
@@ -4,10 +4,10 @@ DESCRIPTION=VDR Plugin: remote programming VDR using VDR-Manager running on Andr
 EAPI=6
 HOMEPAGE=https://projects.vdr-developer.org/projects/vdr-manager/wiki
 IUSE=gzip +ssl -stream zlib ssl
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=stream? ( media-plugins/vdr-streamdev[server] ) zlib? ( sys-libs/zlib ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1971/vdr-vdrmanager-0.14.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=1d8a95e39a8c33cd6020ef8540fc71ef
+_md5_=13570a47f3bec4db5f03df2ef6dc870e
diff --git a/metadata/md5-cache/media-plugins/vdr-wapd-0.9 b/metadata/md5-cache/media-plugins/vdr-wapd-0.9
index 0b1359ce5667..ba46434c9a07 100644
--- a/metadata/md5-cache/media-plugins/vdr-wapd-0.9
+++ b/metadata/md5-cache/media-plugins/vdr-wapd-0.9
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.3.44 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linu
 DESCRIPTION=VDR plugin: lets VDR listen to WAP requests to allow remote control by WML enabled browsers
 EAPI=5
 HOMEPAGE=http://www.heiligenmann.de/vdr/vdr/plugins/wapd.html
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.heiligenmann.de/vdr/download/vdr-wapd-0.9.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=e1a4d1124143a158dbd4364ef36eb905
+_md5_=a3a2b1745a5abe1b43599ddb1e66cb89
diff --git a/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1 b/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1
index 3613692429cb..c2b09d6c6a63 100644
--- a/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1
+++ b/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.3.44 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linu
 DESCRIPTION=VDR plugin: lets VDR listen to WAP requests to allow remote control by WML enabled browsers
 EAPI=5
 HOMEPAGE=http://www.heiligenmann.de/vdr/vdr/plugins/wapd.html
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.heiligenmann.de/vdr/download/vdr-wapd-0.9.tgz http://www.heiligenmann.de/vdr/download/wapd-0.9-patch1.diff.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=43f32a997cfd4e9848a6a4ad13d4bd9b
+_md5_=e9856abe1a6db5d7eabe922f5e82e20e
diff --git a/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1-r1 b/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1-r1
index 517fd38019a5..722cf87f67ea 100644
--- a/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1-r1
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.3.44 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linu
 DESCRIPTION=VDR plugin: lets VDR listen to WAP requests to allow remote control by WML enabled browsers
 EAPI=5
 HOMEPAGE=http://www.heiligenmann.de/vdr/vdr/plugins/wapd.html
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.heiligenmann.de/vdr/download/vdr-wapd-0.9.tgz http://www.heiligenmann.de/vdr/download/wapd-0.9-patch1.diff.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=e1e37bf6c2771e4b63788c3e81fa5ca7
+_md5_=db811248a8ae444769bf1fdea62e9be0
diff --git a/metadata/md5-cache/media-sound/fmdrv-1.0.7 b/metadata/md5-cache/media-sound/fmdrv-1.0.7
index 025712ea2678..256eb1798349 100644
--- a/metadata/md5-cache/media-sound/fmdrv-1.0.7
+++ b/metadata/md5-cache/media-sound/fmdrv-1.0.7
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install postinst prepare
 DESCRIPTION=Console mode MIDI player with builtin userland OPL2 driver
 EAPI=5
 HOMEPAGE=https://bisqwit.iki.fi/source/fmdrv.html
-KEYWORDS=x86 amd64
+KEYWORDS=amd64 x86
 LICENSE=fmdrv GPL-2
 SLOT=0
 SRC_URI=https://bisqwit.iki.fi/src/arch/fmdrv-1.0.7.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=223e6bab0944767c5834a268f1f70c79
+_md5_=39a23ac2ee3531487ee1b8948c9a22ba
diff --git a/metadata/md5-cache/media-sound/wmsound-data-1.0.0 b/metadata/md5-cache/media-sound/wmsound-data-1.0.0
index b1488550a7f1..0925de853207 100644
--- a/metadata/md5-cache/media-sound/wmsound-data-1.0.0
+++ b/metadata/md5-cache/media-sound/wmsound-data-1.0.0
@@ -3,9 +3,9 @@ DEPEND=>=x11-wm/windowmaker-0.80.2-r2
 DESCRIPTION=A bunch of sounds for WindowMaker Sound Server
 EAPI=0
 HOMEPAGE=http://largo.windowmaker.org/
-KEYWORDS=x86 ~ppc amd64 sparc
+KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-wm/windowmaker-0.80.2-r2
 SLOT=0
 SRC_URI=http://largo.windowmaker.org/files/worms2sounds.tar.gz http://largo.windowmaker.org/files/wmsdefault.tar.gz
-_md5_=ea422227d4d00b70f77bf92d8ccac772
+_md5_=7d710b1b8c9ee8c401531cd816b9d378
diff --git a/metadata/md5-cache/media-tv/nvtv-0.4.7-r3 b/metadata/md5-cache/media-tv/nvtv-0.4.7-r3
index 5a37f72fa97d..1ae9157ea3fb 100644
--- a/metadata/md5-cache/media-tv/nvtv-0.4.7-r3
+++ b/metadata/md5-cache/media-tv/nvtv-0.4.7-r3
@@ -4,10 +4,10 @@ DESCRIPTION=TV-Out for NVidia cards
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/nv-tv-out/
 IUSE=X gtk
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils[-zlib] gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm )
 SLOT=0
 SRC_URI=mirror://sourceforge/nv-tv-out/nvtv-0.4.7.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=b00d46a85edbed35c3a66d1c96b4e3cc
+_md5_=43b6219149289bd105b4129a7c8dd12b
diff --git a/metadata/md5-cache/media-video/frameworks-0.3.7-r1 b/metadata/md5-cache/media-video/frameworks-0.3.7-r1
index dd98eaba55b1..f248c2640a33 100644
--- a/metadata/md5-cache/media-video/frameworks-0.3.7-r1
+++ b/metadata/md5-cache/media-video/frameworks-0.3.7-r1
@@ -3,10 +3,10 @@ DEPEND=>=gnome-base/libglade-2 x11-libs/gtk+:2 virtual/pkgconfig >=app-portage/e
 DESCRIPTION=A small v4l frame capture utility especially suited for stop motion animation
 EAPI=6
 HOMEPAGE=http://frameworks.polycrystal.org
-KEYWORDS=~ppc ~x86 ~amd64
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=gnome-base/libglade-2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://frameworks.polycrystal.org/release/frameworks-0.3.7.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=21efa1c2cb47add5ff3f56e5bed7977e
+_md5_=7a5ee5fc436c85d88d8232e7867bd495
diff --git a/metadata/md5-cache/media-video/mjpg-streamer-0_pre20120421 b/metadata/md5-cache/media-video/mjpg-streamer-0_pre20120421
index 5588e6965753..d9992c3a5e47 100644
--- a/metadata/md5-cache/media-video/mjpg-streamer-0_pre20120421
+++ b/metadata/md5-cache/media-video/mjpg-streamer-0_pre20120421
@@ -4,11 +4,11 @@ DESCRIPTION=MJPG-streamer takes JPGs from Linux-UVC compatible webcams
 EAPI=4
 HOMEPAGE=https://sourceforge.net/projects/mjpg-streamer
 IUSE=input_testpicture input_control input_file input_uvc output_file output_udp output_http output_autofocus output_rtsp +input_file +output_http www v4l
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg v4l? ( input_uvc? ( media-libs/libv4l ) )
 REQUIRED_USE=|| ( input_testpicture input_control input_file input_uvc ) || ( output_file output_udp output_http output_autofocus output_rtsp ) v4l? ( input_uvc )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=02760dc50d5de850e657a3dd9d8146f7
+_md5_=65b3fe56acf1165c281acc7dcb4661e6
diff --git a/metadata/md5-cache/media-video/mjpg-streamer-0_pre20120621 b/metadata/md5-cache/media-video/mjpg-streamer-0_pre20120621
index df1a64f27606..602ee862e4f4 100644
--- a/metadata/md5-cache/media-video/mjpg-streamer-0_pre20120621
+++ b/metadata/md5-cache/media-video/mjpg-streamer-0_pre20120621
@@ -4,11 +4,11 @@ DESCRIPTION=MJPG-streamer takes JPGs from Linux-UVC compatible webcams
 EAPI=4
 HOMEPAGE=https://sourceforge.net/projects/mjpg-streamer
 IUSE=input_testpicture input_control +input_file input_uvc output_file output_udp +output_http output_autofocus output_rtsp www v4l
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg v4l? ( input_uvc? ( media-libs/libv4l ) )
 REQUIRED_USE=|| ( input_testpicture input_control input_file input_uvc ) || ( output_file output_udp output_http output_autofocus output_rtsp ) v4l? ( input_uvc )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b40ae29cb4293bc6bedb97720fc8370e
+_md5_=0188e666dc5009d4f60b2ce90d4cc29d
diff --git a/metadata/md5-cache/media-video/mjpg-streamer-0_pre20120621-r1 b/metadata/md5-cache/media-video/mjpg-streamer-0_pre20120621-r1
index 0921840c33bd..7e3c7eb695b8 100644
--- a/metadata/md5-cache/media-video/mjpg-streamer-0_pre20120621-r1
+++ b/metadata/md5-cache/media-video/mjpg-streamer-0_pre20120621-r1
@@ -4,11 +4,11 @@ DESCRIPTION=MJPG-streamer takes JPGs from Linux-UVC compatible webcams
 EAPI=4
 HOMEPAGE=https://sourceforge.net/projects/mjpg-streamer
 IUSE=input_testpicture input_control +input_file input_uvc output_file output_udp +output_http output_autofocus output_rtsp www v4l
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg v4l? ( input_uvc? ( media-libs/libv4l ) )
 REQUIRED_USE=|| ( input_testpicture input_control input_file input_uvc ) || ( output_file output_udp output_http output_autofocus output_rtsp ) v4l? ( input_uvc )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c0132082c809a81b6ba9d436c26cd01d
+_md5_=2e444a84232ac8ce8488482933b8639f
diff --git a/metadata/md5-cache/media-video/mplay-sh-0.5.3-r1 b/metadata/md5-cache/media-video/mplay-sh-0.5.3-r1
index 2e55ea840fae..d85347028dd8 100644
--- a/metadata/md5-cache/media-video/mplay-sh-0.5.3-r1
+++ b/metadata/md5-cache/media-video/mplay-sh-0.5.3-r1
@@ -3,10 +3,10 @@ DEPEND=media-tv/gentoo-vdr-scripts
 DESCRIPTION=mplayer wrapper script as backend for vdr-mplayer
 EAPI=0
 HOMEPAGE=http://www.vdr-portal.de/board/thread.php?threadid=62306
-KEYWORDS=x86 ~amd64
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/mplayer-0.90_rc4
 SLOT=0
 SRC_URI=mirror://gentoo/mplay-0.5.3.tgz https://dev.gentoo.org/~zzam/distfiles/mplay-0.5.3.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6f36951322b3ef161404a5c70e92ef94
+_md5_=3a74a486d282212c1b45585650e8726a
diff --git a/metadata/md5-cache/media-video/mplayer-sh-0.8.6-r2 b/metadata/md5-cache/media-video/mplayer-sh-0.8.6-r2
index 76ec4877c12b..1b19620ea4d9 100644
--- a/metadata/md5-cache/media-video/mplayer-sh-0.8.6-r2
+++ b/metadata/md5-cache/media-video/mplayer-sh-0.8.6-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Video Disk Recorder Mplayer API Script
 EAPI=5
 HOMEPAGE=http://batleth.sapienti-sat.org/
-KEYWORDS=x86 ~amd64
+KEYWORDS=~amd64 x86
 LICENSE=all-rights-reserved
 RDEPEND=>=media-video/mplayer-0.90_rc4
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://batleth.sapienti-sat.org/projects/VDR/mplayer.sh-0.8.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=efc61bfe6ba37c231ddc96d496d266f9
+_md5_=99a1b7fc98fec517850c7df1d832b9b2
diff --git a/metadata/md5-cache/media-video/mplayer-sh-0.8.7 b/metadata/md5-cache/media-video/mplayer-sh-0.8.7
index b2220cf03a64..841fd9c9c0da 100644
--- a/metadata/md5-cache/media-video/mplayer-sh-0.8.7
+++ b/metadata/md5-cache/media-video/mplayer-sh-0.8.7
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Video Disk Recorder Mplayer API Script
 EAPI=5
 HOMEPAGE=http://batleth.sapienti-sat.org/projects/VDR/
-KEYWORDS=x86 ~amd64
+KEYWORDS=~amd64 x86
 LICENSE=all-rights-reserved
 RDEPEND=>=media-video/mplayer-0.1.20070321
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://batleth.sapienti-sat.org/projects/VDR/versions/mplayer.sh-0.8.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a5e688576560563450c992c6d67d413e
+_md5_=2eb58a35cecf39f7112c11befcb8134a
diff --git a/metadata/md5-cache/media-video/streamdvd-0.4-r1 b/metadata/md5-cache/media-video/streamdvd-0.4-r1
index de189d07231c..29f787c0e1b7 100644
--- a/metadata/md5-cache/media-video/streamdvd-0.4-r1
+++ b/metadata/md5-cache/media-video/streamdvd-0.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=fast tool to backup Video DVDs 'on the fly'
 EAPI=0
 HOMEPAGE=http://www.badabum.de/streamdvd.html
 IUSE=X
-KEYWORDS=~x86 ~ppc ~amd64
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libdvdread media-video/lsdvd X? ( dev-perl/Tk dev-perl/Tk-JPEG-Lite virtual/cdrtools >=media-video/dvdauthor-0.6.5 >=app-cdr/dvd+rw-tools-5.13.4.7.4 )
 SLOT=0
 SRC_URI=http://www.badabum.de/down/streamdvd-0.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fa53c43432977eb8a199b1ca8efc2b01
+_md5_=d48d58c2c27c14d428ed429bb9156835
diff --git a/metadata/md5-cache/media-video/vdrsync-0.1.3_pre050322-r1 b/metadata/md5-cache/media-video/vdrsync-0.1.3_pre050322-r1
index 8026e13f6c27..d0a4eae35638 100644
--- a/metadata/md5-cache/media-video/vdrsync-0.1.3_pre050322-r1
+++ b/metadata/md5-cache/media-video/vdrsync-0.1.3_pre050322-r1
@@ -3,10 +3,10 @@ DESCRIPTION=converting vdr-recordings to mpeg2, dvd or other similar formats
 EAPI=0
 HOMEPAGE=http://vdrsync.vdr-portal.de/
 IUSE=dvdr
-KEYWORDS=x86 ~amd64
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.8.0 media-fonts/corefonts dvdr? ( >=media-libs/gd-2.0.15 >=dev-perl/GD-2.0.7 >=dev-perl/GDTextUtil-0.86 >=media-video/dvdauthor-0.6.8 )
 SLOT=0
 SRC_URI=http://vdrsync.vdr-portal.de/releases/vdrsync-050322.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d39cf79264c37800ce33adcdeb38cc74
+_md5_=72afbd25e7c4074006b77cdd33a90d60
diff --git a/metadata/md5-cache/net-analyzer/dhcp_probe-1.3.0-r4 b/metadata/md5-cache/net-analyzer/dhcp_probe-1.3.0-r4
index 33e87953b4bd..46f2ec627c52 100644
--- a/metadata/md5-cache/net-analyzer/dhcp_probe-1.3.0-r4
+++ b/metadata/md5-cache/net-analyzer/dhcp_probe-1.3.0-r4
@@ -3,10 +3,10 @@ DEPEND=net-libs/libpcap >=net-libs/libnet-1.1.2.1-r2
 DESCRIPTION=discover DHCP and BootP servers on a directly-attached Ethernet network
 EAPI=6
 HOMEPAGE=https://www.net.princeton.edu/software/dhcp_probe/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap >=net-libs/libnet-1.1.2.1-r2
 SLOT=0
 SRC_URI=https://www.net.princeton.edu/software/dhcp_probe/dhcp_probe-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=400db0a89a5c83abc6497d3b6db93d7b
+_md5_=ade38f23cf5cae27c0959b0f742b2cfd
diff --git a/metadata/md5-cache/net-analyzer/dhcpdump-1.8 b/metadata/md5-cache/net-analyzer/dhcpdump-1.8
index fd1221943073..bfb3609a3ffb 100644
--- a/metadata/md5-cache/net-analyzer/dhcpdump-1.8
+++ b/metadata/md5-cache/net-analyzer/dhcpdump-1.8
@@ -3,10 +3,10 @@ DEPEND=net-libs/libpcap dev-lang/perl
 DESCRIPTION=DHCP Packet Analyzer/tcpdump postprocessor
 EAPI=5
 HOMEPAGE=https://www.mavetju.org/unix/general.php
-KEYWORDS=amd64 ~mips x86 arm
+KEYWORDS=amd64 arm ~mips x86
 LICENSE=BSD-2
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=https://www.mavetju.org/download/dhcpdump-1.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=adab4d7b0be79b6391c5430d7d177585
+_md5_=d6f6f3bbd4e9e9413e29e15322511226
diff --git a/metadata/md5-cache/net-analyzer/icinga-web-1.14.1 b/metadata/md5-cache/net-analyzer/icinga-web-1.14.1
index 610920c13592..d378b1b5334a 100644
--- a/metadata/md5-cache/net-analyzer/icinga-web-1.14.1
+++ b/metadata/md5-cache/net-analyzer/icinga-web-1.14.1
@@ -4,10 +4,10 @@ DESCRIPTION=Icinga Web - new Web Interface
 EAPI=5
 HOMEPAGE=http://www.icinga.org/
 IUSE=apache2 mysql pnp postgres apache2
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-php/phing dev-db/libdbi-drivers[mysql?,postgres?] || ( >=net-analyzer/icinga-1.10.0 >=net-analyzer/icinga2-2.1.1 ) dev-lang/php:=[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml] pnp? ( net-analyzer/pnp4nagios ) apache2? ( =www-servers/apache-2* )
 SLOT=0
 SRC_URI=https://github.com/icinga/icinga-web/archive/v1.14.1/icinga-web-1.14.1.tar.gz
 _eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	e68863263b1e8611dacf381bec5c8b2b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1fc565c1da90b6d0df38d1a203b98bea
+_md5_=d484a7a26645919ec50d2cef3b387f48
diff --git a/metadata/md5-cache/net-analyzer/iplog-2.2.3-r2 b/metadata/md5-cache/net-analyzer/iplog-2.2.3-r2
index 875510cd0e22..f5f76547d4fe 100644
--- a/metadata/md5-cache/net-analyzer/iplog-2.2.3-r2
+++ b/metadata/md5-cache/net-analyzer/iplog-2.2.3-r2
@@ -3,10 +3,10 @@ DEPEND=net-libs/libpcap
 DESCRIPTION=iplog is a TCP/IP traffic logger
 EAPI=5
 HOMEPAGE=http://ojnk.sourceforge.net/
-KEYWORDS=alpha ~mips ppc sparc x86 ~amd64
+KEYWORDS=alpha ~amd64 ~mips ppc sparc x86
 LICENSE=|| ( GPL-2 FDL-1.1 )
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/ojnk/iplog-2.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cae9c681ba8db1f187a85da8be22696d
+_md5_=4e578e6e5af5286e7f3513af55582c29
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_dnssec-0.1_p28 b/metadata/md5-cache/net-analyzer/nagios-check_dnssec-0.1_p28
index 4e24c1888d91..a27aead14821 100644
--- a/metadata/md5-cache/net-analyzer/nagios-check_dnssec-0.1_p28
+++ b/metadata/md5-cache/net-analyzer/nagios-check_dnssec-0.1_p28
@@ -3,10 +3,10 @@ DEPEND=|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins ) net-li
 DESCRIPTION=check_dnssec is a set of Nagios plugins to monitor DNSSEC services
 EAPI=4
 HOMEPAGE=https://svn.durchmesser.ch/trac/check_dnssec
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins ) net-libs/ldns
 SLOT=0
 SRC_URI=mirror://gentoo/check_dnssec-0.1_p28.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4b30741824af2ac167b5aca265735354
+_md5_=42aa36df800acf4cf747841e654b7024
diff --git a/metadata/md5-cache/net-analyzer/nikto-2.1.6_p20180122 b/metadata/md5-cache/net-analyzer/nikto-2.1.6_p20180122
index 0b673ed6a8d4..1ffd10aa8040 100644
--- a/metadata/md5-cache/net-analyzer/nikto-2.1.6_p20180122
+++ b/metadata/md5-cache/net-analyzer/nikto-2.1.6_p20180122
@@ -3,9 +3,9 @@ DESCRIPTION=Web server vulnerability scanner
 EAPI=6
 HOMEPAGE=http://www.cirt.net/Nikto2
 IUSE=ssl
-KEYWORDS=~x86 ~amd64 ~ppc ~sparc ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-JSON-PP net-analyzer/nmap ssl? ( dev-libs/openssl:0= dev-perl/Net-SSLeay )
 SLOT=0
 SRC_URI=https://github.com/sullo/nikto/archive/b8454661c4dc9249cb515311cb2a80906a0a4b7a.tar.gz -> nikto-2.1.6_p20180122.tar.gz
-_md5_=246ec550ca769e0431a659f1b7655340
+_md5_=c01876c304267d172918b7490ae336c3
diff --git a/metadata/md5-cache/net-analyzer/nipper-0.12.0 b/metadata/md5-cache/net-analyzer/nipper-0.12.0
index d786a2b21ad6..20ecdfa21322 100644
--- a/metadata/md5-cache/net-analyzer/nipper-0.12.0
+++ b/metadata/md5-cache/net-analyzer/nipper-0.12.0
@@ -3,10 +3,10 @@ DEPEND=>=net-libs/libnipper-0.12 sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Router configuration security analysis tool
 EAPI=6
 HOMEPAGE=http://nipper.titania.co.uk/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=net-libs/libnipper-0.12
 SLOT=0
 SRC_URI=mirror://sourceforge/nipper/nipper-cli-0.12.0.tgz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=de3bc7c486280f2e5ddfe6fcd86b3663
+_md5_=00ebddc633639d16f4ebc2cbf39326de
diff --git a/metadata/md5-cache/net-firewall/fwanalog-0.6.4 b/metadata/md5-cache/net-firewall/fwanalog-0.6.4
index 348639236a1f..32d08e10f4d4 100644
--- a/metadata/md5-cache/net-firewall/fwanalog-0.6.4
+++ b/metadata/md5-cache/net-firewall/fwanalog-0.6.4
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Script to parse firewall logs and analyze them with Analog
 EAPI=0
 HOMEPAGE=http://tud.at/programm/fwanalog/
-KEYWORDS=~amd64 x86 ppc sparc
+KEYWORDS=~amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=app-shells/bash sys-apps/grep virtual/awk sys-apps/sed app-arch/gzip sys-apps/diffutils dev-lang/perl >=app-admin/analog-5.31
 SLOT=0
 SRC_URI=http://tud.at/programm/fwanalog/fwanalog-0.6.4.tar.gz
-_md5_=647c366e1e0b8cb4b231626b60efaaf9
+_md5_=cf34c137104765a13c82a6e05a52e7b7
diff --git a/metadata/md5-cache/net-im/coturn-4.5.0.7 b/metadata/md5-cache/net-im/coturn-4.5.0.7
index 219c29028757..3726449a4db2 100644
--- a/metadata/md5-cache/net-im/coturn-4.5.0.7
+++ b/metadata/md5-cache/net-im/coturn-4.5.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=coturn TURN server project
 EAPI=6
 HOMEPAGE=https://github.com/coturn/coturn
 IUSE=mongodb mysql postgres redis sqlite
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=|| ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:* ) redis? ( dev-libs/hiredis ) sqlite? ( dev-db/sqlite ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/coturn/coturn/archive/4.5.0.7.tar.gz -> coturn-4.5.0.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	e68863263b1e8611dacf381bec5c8b2b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7a71e20d8fc7465be504a6c46ff7bed6
+_md5_=ca2d84487773d324ecdda86302f1a8c7
diff --git a/metadata/md5-cache/net-im/coturn-4.5.0.8 b/metadata/md5-cache/net-im/coturn-4.5.0.8
index 2336edd96634..b139dde89b70 100644
--- a/metadata/md5-cache/net-im/coturn-4.5.0.8
+++ b/metadata/md5-cache/net-im/coturn-4.5.0.8
@@ -4,10 +4,10 @@ DESCRIPTION=coturn TURN server project
 EAPI=6
 HOMEPAGE=https://github.com/coturn/coturn
 IUSE=mongodb mysql postgres redis sqlite
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=|| ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:* ) redis? ( dev-libs/hiredis ) sqlite? ( dev-db/sqlite ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/coturn/coturn/archive/4.5.0.8.tar.gz -> coturn-4.5.0.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	e68863263b1e8611dacf381bec5c8b2b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dc80b12c47e66da3d4130fa135d97ee1
+_md5_=ca2d84487773d324ecdda86302f1a8c7
diff --git a/metadata/md5-cache/net-im/coturn-9999 b/metadata/md5-cache/net-im/coturn-9999
index 52ce7ebc12f7..020f64f48adc 100644
--- a/metadata/md5-cache/net-im/coturn-9999
+++ b/metadata/md5-cache/net-im/coturn-9999
@@ -8,4 +8,4 @@ LICENSE=BSD
 RDEPEND=|| ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:* ) redis? ( dev-libs/hiredis ) sqlite? ( dev-db/sqlite ) virtual/tmpfiles
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	e68863263b1e8611dacf381bec5c8b2b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7a71e20d8fc7465be504a6c46ff7bed6
+_md5_=ca2d84487773d324ecdda86302f1a8c7
diff --git a/metadata/md5-cache/net-im/gitter-bin-3.1.0 b/metadata/md5-cache/net-im/gitter-bin-3.1.0
index 68ed7102067c..eab347994685 100644
--- a/metadata/md5-cache/net-im/gitter-bin-3.1.0
+++ b/metadata/md5-cache/net-im/gitter-bin-3.1.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm preinst prepare unpack
 DESCRIPTION=Chat and network platform
 EAPI=6
 HOMEPAGE=http://www.gitter.im/
-KEYWORDS=~amd64 ~x86 -*
+KEYWORDS=-* ~amd64 ~x86
 LICENSE=MIT no-source-code
 RDEPEND=dev-libs/expat:0 dev-libs/glib:2 dev-libs/nspr:0 dev-libs/nss:0 gnome-base/gconf:2 media-libs/alsa-lib:0 media-libs/fontconfig:1.0 media-libs/freetype:2 sys-apps/dbus:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 x11-libs/libX11:0 x11-libs/libXcomposite:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXi:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXtst:0 x11-libs/pango:0
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://update.gitter.im/linux64/gitter_3.1.0_amd64.deb ) x86? ( https://update.gitter.im/linux32/gitter_3.1.0_i386.deb )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2d9d87df1d4398711a060a8c45181c3a
+_md5_=301b73723c403db303261cf05003b4c8
diff --git a/metadata/md5-cache/net-im/slack-bin-3.1.1 b/metadata/md5-cache/net-im/slack-bin-3.1.1
index 078e33e6a04c..38dc2f5c046a 100644
--- a/metadata/md5-cache/net-im/slack-bin-3.1.1
+++ b/metadata/md5-cache/net-im/slack-bin-3.1.1
@@ -3,7 +3,7 @@ DESCRIPTION=Team collaboration tool
 EAPI=6
 HOMEPAGE=http://www.slack.com/
 IUSE=ayatana gnome-keyring pax_kernel abi_x86_64
-KEYWORDS=~amd64 -*
+KEYWORDS=-* ~amd64
 LICENSE=all-rights-reserved
 RDEPEND=dev-libs/atk:0[abi_x86_64(-)?] dev-libs/expat:0[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr:0[abi_x86_64(-)?] dev-libs/nss:0[abi_x86_64(-)?] gnome-base/gconf:2[abi_x86_64(-)?] media-libs/alsa-lib:0[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] net-misc/curl:0[abi_x86_64(-)?] net-print/cups:0[abi_x86_64(-)?] sys-apps/dbus:0[abi_x86_64(-)?] x11-libs/cairo:0[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:2[abi_x86_64(-)?] x11-libs/libX11:0[abi_x86_64(-)?] x11-libs/libxcb:0/1.12[abi_x86_64(-)?] x11-libs/libXcomposite:0[abi_x86_64(-)?] x11-libs/libXcursor:0[abi_x86_64(-)?] x11-libs/libXdamage:0[abi_x86_64(-)?] x11-libs/libXext:0[abi_x86_64(-)?] x11-libs/libXfixes:0[abi_x86_64(-)?] x11-libs/libXi:0[abi_x86_64(-)?] x11-libs/libxkbfile:0[abi_x86_64(-)?] x11-libs/libXrandr:0[abi_x86_64(-)?] x11-libs/libXrender:0[abi_x86_64(-)?] x11-libs/libXScrnSaver:0[abi_x86_64(-)?] x11-libs/libXtst:0[abi_x86_64(-)?] x11-libs/pango:0[abi_x86_64(-)?] ayatana? ( dev-libs/libappindicator:2[abi_x86_64(-)?] ) gnome-keyring? ( app-crypt/libsecret:0[abi_x86_64(-)?] )
 REQUIRED_USE=|| ( abi_x86_64 )
@@ -11,4 +11,4 @@ RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-3.1.1-amd64.deb
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a9d1b6d49f82113bb1d0b74590e64e14
+_md5_=3c82f2608e3625910d28e77f4d24e132
diff --git a/metadata/md5-cache/net-irc/psybnc-2.3.2.9-r3 b/metadata/md5-cache/net-irc/psybnc-2.3.2.9-r3
index 6e401ad9aee4..e814c8e12329 100644
--- a/metadata/md5-cache/net-irc/psybnc-2.3.2.9-r3
+++ b/metadata/md5-cache/net-irc/psybnc-2.3.2.9-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A multi-user and multi-server gateway to IRC networks
 EAPI=7
 HOMEPAGE=http://www.psybnc.at/index.html
 IUSE=ipv6 ssl oidentd scripting multinetwork
-KEYWORDS=~amd64 ~sparc ~x86 ~ppc
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.7d ) oidentd? ( >=net-misc/oidentd-2.0 )
 SLOT=0
 SRC_URI=http://www.psybnc.at/download/beta/psyBNC-2.3.2-9.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	e68863263b1e8611dacf381bec5c8b2b
-_md5_=1a0d0b2b0dc6d04c8d857bfd6a274c8a
+_md5_=bcd0b15aee5ff1f60c74611621461441
diff --git a/metadata/md5-cache/net-irc/ptlink-opm-1.3.1-r1 b/metadata/md5-cache/net-irc/ptlink-opm-1.3.1-r1
index e607580f9a1a..c55f5d829242 100644
--- a/metadata/md5-cache/net-irc/ptlink-opm-1.3.1-r1
+++ b/metadata/md5-cache/net-irc/ptlink-opm-1.3.1-r1
@@ -3,9 +3,9 @@ DEPEND=>=sys-apps/sed-4
 DESCRIPTION=PTlink Open Proxy Monitor
 EAPI=6
 HOMEPAGE=http://www.ptlink.net/
-KEYWORDS=~x86 ~ppc
+KEYWORDS=~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.sunsite.dk/projects/ptlink/ptopm/PTlink.OPM1.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	e68863263b1e8611dacf381bec5c8b2b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a1d9dd8e6090822594cdc22b16e5cdd7
+_md5_=f2b5a96f5d6708ab6c4466b9d433352f
diff --git a/metadata/md5-cache/net-libs/gloox-1.0.21 b/metadata/md5-cache/net-libs/gloox-1.0.21
index bca6495fd405..a1b3aea55a36 100644
--- a/metadata/md5-cache/net-libs/gloox-1.0.21
+++ b/metadata/md5-cache/net-libs/gloox-1.0.21
@@ -4,10 +4,10 @@ DESCRIPTION=A portable high-level Jabber/XMPP library for C++
 EAPI=7
 HOMEPAGE=https://camaya.net/gloox/
 IUSE=debug gnutls idn libressl ssl static-libs test zlib
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~ia64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=idn? ( net-dns/libidn:= ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) zlib? ( sys-libs/zlib )
 RESTRICT=test
 SLOT=0/17
 SRC_URI=https://camaya.net/download/gloox-1.0.21.tar.bz2
-_md5_=e2ec8a0112afd412d5fbdbf80dcb61fa
+_md5_=9318f1fc4d5b2a77fb89c47808fda653
diff --git a/metadata/md5-cache/net-libs/gloox-1.0.22 b/metadata/md5-cache/net-libs/gloox-1.0.22
index 0a0439519ce4..e9be532944bb 100644
--- a/metadata/md5-cache/net-libs/gloox-1.0.22
+++ b/metadata/md5-cache/net-libs/gloox-1.0.22
@@ -4,10 +4,10 @@ DESCRIPTION=A portable high-level Jabber/XMPP library for C++
 EAPI=7
 HOMEPAGE=https://camaya.net/gloox/
 IUSE=debug gnutls idn libressl ssl static-libs test zlib
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~ia64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=idn? ( net-dns/libidn:= ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) zlib? ( sys-libs/zlib )
 RESTRICT=test
 SLOT=0/17
 SRC_URI=https://camaya.net/download/gloox-1.0.22.tar.bz2
-_md5_=48847ab3b07702d065a809c50edb5c8b
+_md5_=82e36c3b821c0f3051090a977c2cbc33
diff --git a/metadata/md5-cache/net-libs/gsnmp-0.3.0 b/metadata/md5-cache/net-libs/gsnmp-0.3.0
index 8d13b4397aeb..f9ddf4ca83e0 100644
--- a/metadata/md5-cache/net-libs/gsnmp-0.3.0
+++ b/metadata/md5-cache/net-libs/gsnmp-0.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=An SNMP library based on glib and gnet
 EAPI=5
 HOMEPAGE=https://github.com/schoenw/gsnmp
 IUSE=static-libs
-KEYWORDS=amd64 ~amd64-linux ~ppc x86
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 net-libs/gnet
 SLOT=0
 SRC_URI=ftp://ftp.ibr.cs.tu-bs.de/pub/local/gsnmp/gsnmp-0.3.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d11c1248a39e4ab99bc877832bfe49c9
+_md5_=5d7cc962b0a6697bf88b4fbe5662370c
diff --git a/metadata/md5-cache/net-libs/iax-0.2.2 b/metadata/md5-cache/net-libs/iax-0.2.2
index 3de025be5716..8b0c25a49cf5 100644
--- a/metadata/md5-cache/net-libs/iax-0.2.2
+++ b/metadata/md5-cache/net-libs/iax-0.2.2
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile install
 DESCRIPTION=IAX (Inter Asterisk eXchange) Library
 EAPI=0
 HOMEPAGE=https://www.digium.com/
-KEYWORDS=x86 ppc
+KEYWORDS=ppc x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=https://www.digium.com/pub/libiax/iax-0.2.2.tar.gz
-_md5_=a84c11fb0b805bffefa9d52cd800a9d8
+_md5_=a844890049f10c03e4ffa1384a40026b
diff --git a/metadata/md5-cache/net-libs/libsrsirc-0.0.14-r1 b/metadata/md5-cache/net-libs/libsrsirc-0.0.14-r1
index 71594f9893a4..7c1b002c0549 100644
--- a/metadata/md5-cache/net-libs/libsrsirc-0.0.14-r1
+++ b/metadata/md5-cache/net-libs/libsrsirc-0.0.14-r1
@@ -4,9 +4,9 @@ DESCRIPTION=A lightweight, cross-platform IRC library
 EAPI=6
 HOMEPAGE=https://github.com/fstd/libsrsirc
 IUSE=static-libs ssl
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://penenen.de/libsrsirc-0.0.14.tar.gz
-_md5_=62f58621c20a2a5bc66f4e73312d47e9
+_md5_=ff388d1ddb137ad1e0a21acbf077b97f
diff --git a/metadata/md5-cache/net-libs/libtelnet-0.21 b/metadata/md5-cache/net-libs/libtelnet-0.21
index 95943f9a10a9..e92c1aa60ad3 100644
--- a/metadata/md5-cache/net-libs/libtelnet-0.21
+++ b/metadata/md5-cache/net-libs/libtelnet-0.21
@@ -3,9 +3,9 @@ DEPEND=sys-devel/automake:1.11 >=app-portage/elt-patches-20170815 !<sys-devel/ge
 DESCRIPTION=Simple RFC-complient TELNET implementation as a C library
 EAPI=5
 HOMEPAGE=https://github.com/seanmiddleditch/libtelnet
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/seanmiddleditch/libtelnet/archive/0.21.tar.gz -> libtelnet-0.21.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2efa97dcafd278cac16412efedb004e0
+_md5_=efcc6e1314254fb2657539e26b089802
diff --git a/metadata/md5-cache/net-libs/libtelnet-9999 b/metadata/md5-cache/net-libs/libtelnet-9999
index b63bd1a2a160..22120536ea33 100644
--- a/metadata/md5-cache/net-libs/libtelnet-9999
+++ b/metadata/md5-cache/net-libs/libtelnet-9999
@@ -7,4 +7,4 @@ HOMEPAGE=https://github.com/seanmiddleditch/libtelnet
 LICENSE=public-domain
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4c67dd91a616f761ef47724d1d976e14
+_md5_=7d0f61eacfab176f727503e275cdfd7c
diff --git a/metadata/md5-cache/net-libs/nfqueue-bindings-0.5 b/metadata/md5-cache/net-libs/nfqueue-bindings-0.5
index 15bcd7f94f3d..1615c41e56c9 100644
--- a/metadata/md5-cache/net-libs/nfqueue-bindings-0.5
+++ b/metadata/md5-cache/net-libs/nfqueue-bindings-0.5
@@ -4,11 +4,11 @@ DESCRIPTION=High-level language bindings for libnetfilter_queue
 EAPI=5
 HOMEPAGE=https://github.com/chifflier/nfqueue-bindings
 IUSE=perl python examples kernel_linux python_targets_python2_7
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=python? ( dev-python/dpkt[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-lang/perl:=[-build(-)]
 REQUIRED_USE=|| ( perl python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/chifflier/nfqueue-bindings/archive/nfqueue-bindings-0.5.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=94d8f98b71f002e62fc0ad62829dd63d
+_md5_=1536861091fc22f7794d9ef1d4457dea
diff --git a/metadata/md5-cache/net-libs/nfqueue-bindings-0.6 b/metadata/md5-cache/net-libs/nfqueue-bindings-0.6
index 5eaf47200c4b..b9c8623c6819 100644
--- a/metadata/md5-cache/net-libs/nfqueue-bindings-0.6
+++ b/metadata/md5-cache/net-libs/nfqueue-bindings-0.6
@@ -4,11 +4,11 @@ DESCRIPTION=High-level language bindings for libnetfilter_queue
 EAPI=5
 HOMEPAGE=https://github.com/chifflier/nfqueue-bindings
 IUSE=perl python examples kernel_linux python_targets_python2_7
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=python? ( dev-python/dpkt[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-lang/perl:=[-build(-)]
 REQUIRED_USE=|| ( perl python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/chifflier/nfqueue-bindings/archive/v0.6.tar.gz -> nfqueue-bindings-0.6.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ed0b00c5ccb5d0709bf32d014e63156f
+_md5_=6d1acd9f51ad5d9e3bc31ae048676193
diff --git a/metadata/md5-cache/net-libs/roadrunner-0.9.1 b/metadata/md5-cache/net-libs/roadrunner-0.9.1
index 22169a4fe89c..859ede2e2bb8 100644
--- a/metadata/md5-cache/net-libs/roadrunner-0.9.1
+++ b/metadata/md5-cache/net-libs/roadrunner-0.9.1
@@ -4,9 +4,9 @@ DESCRIPTION=RoadRunner library provides API for using Blocks Extensible Exchange
 EAPI=0
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=doc
-KEYWORDS=x86 ppc
+KEYWORDS=ppc x86
 LICENSE=Sleepycat
 RDEPEND=>=dev-libs/glib-2.2.1 >=dev-libs/libxml2-2.5.11
 SLOT=0
 SRC_URI=mirror://gentoo/roadrunner-0.9.1.tar.gz
-_md5_=bc9f3cd3f7d20d86aca020c84f045cdf
+_md5_=50e6bf4bc71bfff42acc82cc133acc9d
diff --git a/metadata/md5-cache/net-libs/vanessa-mcast-1.0.0 b/metadata/md5-cache/net-libs/vanessa-mcast-1.0.0
index 0e904214e625..cea10afa5d97 100644
--- a/metadata/md5-cache/net-libs/vanessa-mcast-1.0.0
+++ b/metadata/md5-cache/net-libs/vanessa-mcast-1.0.0
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/vanessa-logger-0.0.6 >=net-libs/vanessa-socket-0.0.7
 DESCRIPTION=Multicast Helper Library
 EAPI=0
 HOMEPAGE=http://horms.net/projects/vanessa/
-KEYWORDS=~x86 ~ppc
+KEYWORDS=~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/vanessa-logger-0.0.6 >=net-libs/vanessa-socket-0.0.7
 SLOT=0
 SRC_URI=http://horms.net/projects/vanessa/download/vanessa_mcast/1.0.0/vanessa_mcast-1.0.0.tar.gz
-_md5_=cf06934fa38e5439ffd53eedbf67cc00
+_md5_=be7a814b6d405f5a1df032b86ce5be61
diff --git a/metadata/md5-cache/net-mail/fastforward-0.51-r1 b/metadata/md5-cache/net-mail/fastforward-0.51-r1
index de20f9cf1bcf..a87f075fced2 100644
--- a/metadata/md5-cache/net-mail/fastforward-0.51-r1
+++ b/metadata/md5-cache/net-mail/fastforward-0.51-r1
@@ -3,10 +3,10 @@ DEPEND=sys-apps/groff >=sys-apps/sed-4
 DESCRIPTION=handle qmail forwarding according to a cdb database
 EAPI=0
 HOMEPAGE=http://cr.yp.to/fastforward.html
-KEYWORDS=x86 sparc ~ppc
+KEYWORDS=~ppc sparc x86
 LICENSE=public-domain
 RDEPEND=sys-apps/groff
 SLOT=0
 SRC_URI=http://cr.yp.to/software/fastforward-0.51.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2ecbe30c7a9f9ec7d0d6df7482f25338
+_md5_=7a685068c6bed1989567942c27fa5db7
diff --git a/metadata/md5-cache/net-mail/qmail-qsanity-0.52 b/metadata/md5-cache/net-mail/qmail-qsanity-0.52
index 0f39b2729c54..cabc228918e2 100644
--- a/metadata/md5-cache/net-mail/qmail-qsanity-0.52
+++ b/metadata/md5-cache/net-mail/qmail-qsanity-0.52
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install unpack
 DESCRIPTION=qmail-qsanity checks your queue data structures for internal consistency
 EAPI=0
 HOMEPAGE=http://www.qmail.org/
-KEYWORDS=x86 ~ppc ~hppa
+KEYWORDS=~hppa ~ppc x86
 LICENSE=qmail-nelson
 RDEPEND=virtual/qmail dev-lang/perl
 SLOT=0
 SRC_URI=mirror://qmail/qmail-qsanity-0.52
-_md5_=7116ed62958df9868d1b4ce494d94d5b
+_md5_=f179fe06a66dbbb8958f94f0a96b6542
diff --git a/metadata/md5-cache/net-mail/qmailanalog-0.70-r1 b/metadata/md5-cache/net-mail/qmailanalog-0.70-r1
index aa41a531e27f..bb0c6e954d51 100644
--- a/metadata/md5-cache/net-mail/qmailanalog-0.70-r1
+++ b/metadata/md5-cache/net-mail/qmailanalog-0.70-r1
@@ -3,10 +3,10 @@ DEPEND=sys-apps/groff >=sys-apps/sed-4
 DESCRIPTION=collection of tools to help you analyze qmail's activity record
 EAPI=0
 HOMEPAGE=http://cr.yp.to/qmailanalog.html
-KEYWORDS=x86 sparc ~amd64
+KEYWORDS=~amd64 sparc x86
 LICENSE=freedist public-domain
 RDEPEND=sys-apps/groff
 SLOT=0
 SRC_URI=http://cr.yp.to/software/qmailanalog-0.70.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9de52d5b323029a4ff3c518b1501ecac
+_md5_=181735ce82d42b87cc1554c4f67c7a39
diff --git a/metadata/md5-cache/net-mail/signify-1.14 b/metadata/md5-cache/net-mail/signify-1.14
index aac62608ba39..7c0df5e30f40 100644
--- a/metadata/md5-cache/net-mail/signify-1.14
+++ b/metadata/md5-cache/net-mail/signify-1.14
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl
 DESCRIPTION=A (semi-)random e-mail signature rotator
 EAPI=6
 HOMEPAGE=http://signify.sf.net/
-KEYWORDS=ppc sparc x86 ~amd64
+KEYWORDS=~amd64 ppc sparc x86
 LICENSE=public-domain
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/signify/signify_1.14-1.tar.gz
-_md5_=735efe307b39e115752ad0d64aeb4c66
+_md5_=b532187bd38848f79cb7af9ef1a3ac87
diff --git a/metadata/md5-cache/net-misc/datapipe-1.0-r2 b/metadata/md5-cache/net-misc/datapipe-1.0-r2
index 5f346ba41ae9..6e7c790de866 100644
--- a/metadata/md5-cache/net-misc/datapipe-1.0-r2
+++ b/metadata/md5-cache/net-misc/datapipe-1.0-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=bind a local port and connect it to a remote socket
 EAPI=6
 HOMEPAGE=http://http.distributed.net/pub/dcti/unsupported/
-KEYWORDS=~x86 ~ppc ~arm ~amd64
+KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=ftp://ftp.distributed.net/pub/dcti/unsupported/datapipe-1.0.tar.gz http://http.distributed.net/pub/dcti/unsupported/datapipe-1.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=cc00e96edb3afb8c8d87397f1f075ca6
+_md5_=795cac09ef2fe4f4af4e412d21dd0e5d
diff --git a/metadata/md5-cache/net-misc/lambdamoo-1.8.1-r3 b/metadata/md5-cache/net-misc/lambdamoo-1.8.1-r3
index 2e5e268f7f31..3dd0cf89d2bf 100644
--- a/metadata/md5-cache/net-misc/lambdamoo-1.8.1-r3
+++ b/metadata/md5-cache/net-misc/lambdamoo-1.8.1-r3
@@ -3,9 +3,9 @@ DEPEND=sys-devel/bison >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.
 DESCRIPTION=networked mud that can be used for different types of collaborative software
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/lambdamoo/
-KEYWORDS=~x86 ~sparc
+KEYWORDS=~sparc ~x86
 LICENSE=LambdaMOO GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/lambdamoo/LambdaMOO-1.8.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=3aa54d5bd151d020c468eba7108b3f5f
+_md5_=d9b6253f74f59e8823ec590497c30514
diff --git a/metadata/md5-cache/net-misc/monmotha-2.3.8-r1 b/metadata/md5-cache/net-misc/monmotha-2.3.8-r1
index 24320bc8047e..e501aabd3016 100644
--- a/metadata/md5-cache/net-misc/monmotha-2.3.8-r1
+++ b/metadata/md5-cache/net-misc/monmotha-2.3.8-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst unpack
 DESCRIPTION=MonMotha IPTables-based firewall script
 EAPI=6
 HOMEPAGE=http://monmotha.mplug.org/firewall/
-KEYWORDS=x86 ~amd64
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.2.5
 SLOT=0
 SRC_URI=http://monmotha.mplug.org/~monmotha/firewall/firewall/2.3/rc.firewall-2.3.8
-_md5_=8a3c6c7b73a98a89a5c135a8a1ad9eed
+_md5_=513f9208921be7ddf91e5e2fbf7c1df9
diff --git a/metadata/md5-cache/net-misc/switzerland-0.1.0 b/metadata/md5-cache/net-misc/switzerland-0.1.0
index 4b923679b55e..796dc4407023 100644
--- a/metadata/md5-cache/net-misc/switzerland-0.1.0
+++ b/metadata/md5-cache/net-misc/switzerland-0.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Network Testing Tool
 EAPI=5
 HOMEPAGE=http://www.eff.org/testyourisp/switzerland/
 IUSE=python_targets_python2_7
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/switzerland/switzerland-0.1.0.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=79bf33217501556ea0a5f23158004fe7
+_md5_=94eb16a8bf40e653fa2f9ba32237f780
diff --git a/metadata/md5-cache/net-misc/vrrpd-1.0 b/metadata/md5-cache/net-misc/vrrpd-1.0
index 6045a13964e2..7d6f48ebdc5d 100644
--- a/metadata/md5-cache/net-misc/vrrpd-1.0
+++ b/metadata/md5-cache/net-misc/vrrpd-1.0
@@ -3,8 +3,8 @@ DEPEND=sys-devel/gcc
 DESCRIPTION=Virtual Router Redundancy Protocol Daemon
 EAPI=5
 HOMEPAGE=http://www.sourceforge.net/projects/vrrpd
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://sourceforge/vrrpd/vrrpd/1.0/vrrpd-1.0.tar.gz
-_md5_=9dcbf8671fdd05bbf93fb678d35cf825
+_md5_=7dd7a5b96d7ed93228e9aaeb99c33a96
diff --git a/metadata/md5-cache/net-misc/vrrpd-1.9 b/metadata/md5-cache/net-misc/vrrpd-1.9
index 88a908bb493a..81d94bf7e24a 100644
--- a/metadata/md5-cache/net-misc/vrrpd-1.9
+++ b/metadata/md5-cache/net-misc/vrrpd-1.9
@@ -3,9 +3,9 @@ DEPEND=sys-devel/gcc
 DESCRIPTION=Virtual Router Redundancy Protocol Daemon
 EAPI=5
 HOMEPAGE=http://numsys.eu/vrrp_art.php
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/fredbcode/Vrrpd/archive/v1.9.tar.gz -> vrrpd-1.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ca1a38d062aa6117203ab38ceabb178d
+_md5_=d00dd83b590f09ab80ccefb68a7908bf
diff --git a/metadata/md5-cache/net-nds/led-1.111 b/metadata/md5-cache/net-nds/led-1.111
index 4919210d3a1a..e99b82eb224b 100644
--- a/metadata/md5-cache/net-nds/led-1.111
+++ b/metadata/md5-cache/net-nds/led-1.111
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/perl-5.6.1 dev-perl/perl-ldap dev-perl/URI virtual/perl-Digest
 DESCRIPTION=led is a general purpose LDAP editor
 EAPI=0
 HOMEPAGE=http://led.sourceforge.net/
-KEYWORDS=~x86 ~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/perl-5.6.1 dev-perl/perl-ldap dev-perl/URI virtual/perl-Digest-MD5 dev-perl/Authen-SASL
 SLOT=0
 SRC_URI=mirror://sourceforge/led/led-1.111.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=887f800360c910835a053e0e6d98af9d
+_md5_=741f63eca68049814df394c88cbf183f
diff --git a/metadata/md5-cache/net-news/yencode-0.46 b/metadata/md5-cache/net-news/yencode-0.46
index ef2c947172aa..2771fcd6cc4b 100644
--- a/metadata/md5-cache/net-news/yencode-0.46
+++ b/metadata/md5-cache/net-news/yencode-0.46
@@ -3,8 +3,8 @@ DESCRIPTION=yEnc encoder/decoder package
 EAPI=0
 HOMEPAGE=http://www.yencode.org
 IUSE=nls
-KEYWORDS=x86 ppc ~sparc arm ~amd64
+KEYWORDS=~amd64 arm ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/yencode/yencode-0.46.tar.gz
-_md5_=ab7c0fd7f11110e419c63436dac93dc5
+_md5_=238563e488e4ba791ee8f0368f06392f
diff --git a/metadata/md5-cache/net-nntp/sn-0.3.8 b/metadata/md5-cache/net-nntp/sn-0.3.8
index c877e2e27077..9c6e1552dec5 100644
--- a/metadata/md5-cache/net-nntp/sn-0.3.8
+++ b/metadata/md5-cache/net-nntp/sn-0.3.8
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib >=sys-apps/sed-4
 DESCRIPTION=Hassle-free Usenet news system for small sites
 EAPI=4
 HOMEPAGE=http://infa.abo.fi/~patrik/sn/
-KEYWORDS=~amd64 x86 ~ppc
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://infa.abo.fi/~patrik/sn/files/sn-0.3.8.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=892f720364719d6de77281b7b2ed5f64
+_md5_=9af828c4e5259677df3d14567e504281
diff --git a/metadata/md5-cache/net-p2p/gnut-0.4.28-r1 b/metadata/md5-cache/net-p2p/gnut-0.4.28-r1
index 7638a936ab6b..290caf182f4a 100644
--- a/metadata/md5-cache/net-p2p/gnut-0.4.28-r1
+++ b/metadata/md5-cache/net-p2p/gnut-0.4.28-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Text-mode gnutella client
 EAPI=6
 HOMEPAGE=http://www.gnutelliums.com/linux_unix/gnut/
-KEYWORDS=x86 ppc
+KEYWORDS=ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://alge.anart.no/ftp/pub/gnutella/gnut-0.4.28.tar.gz mirror://gentoo/gnut-0.4.28-patches.tar.bz2
-_md5_=5fc000ca69af0405f81a009c9c6619e8
+_md5_=0f3df54f40a60ba66da63ff99e0735fb
diff --git a/metadata/md5-cache/net-p2p/smet2html-0.1 b/metadata/md5-cache/net-p2p/smet2html-0.1
index 2adc0e0d748c..cd20646b8bf1 100644
--- a/metadata/md5-cache/net-p2p/smet2html-0.1
+++ b/metadata/md5-cache/net-p2p/smet2html-0.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install unpack
 DESCRIPTION=Convert eDonkey2000 server.met to html
 EAPI=0
 HOMEPAGE=http://ed2k-tools.sourceforge.net/smet2html.shtml
-KEYWORDS=x86 ~ppc
+KEYWORDS=~ppc x86
 LICENSE=GPL-2
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/ed2k-tools/smet2html-0.1.tar.gz
-_md5_=4ce02249f2ea899741e1f58372d65a62
+_md5_=98f525f7b68b2ca8f48acc82459828a3
diff --git a/metadata/md5-cache/net-print/apsfilter-7.2.5 b/metadata/md5-cache/net-print/apsfilter-7.2.5
index 780a66c37c36..a909de7d5ee4 100644
--- a/metadata/md5-cache/net-print/apsfilter-7.2.5
+++ b/metadata/md5-cache/net-print/apsfilter-7.2.5
@@ -4,9 +4,9 @@ DESCRIPTION=Apsfilter Prints So Fine, It Leads To Extraordinary Results
 EAPI=0
 HOMEPAGE=http://www.apsfilter.org
 IUSE=cups
-KEYWORDS=x86 ppc alpha sparc
+KEYWORDS=alpha ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=|| ( net-print/cups net-print/lprng ) app-text/ghostscript-gpl >=app-text/psutils-1.17 >=media-gfx/imagemagick-5.4.5 >=app-text/a2ps-4.13b-r4 virtual/awk virtual/mta
 SLOT=0
 SRC_URI=http://www.apsfilter.org/download/apsfilter-7.2.5.tar.bz2
-_md5_=7a3ecb04079be66a71d248f79e2405b0
+_md5_=3cd9248772155fccb6cf46088bc9c7be
diff --git a/metadata/md5-cache/net-proxy/piper-1.14 b/metadata/md5-cache/net-proxy/piper-1.14
index 2131b783614c..dc817934f1d0 100644
--- a/metadata/md5-cache/net-proxy/piper-1.14
+++ b/metadata/md5-cache/net-proxy/piper-1.14
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Piper (a tool for manipulating SOCKS5 servers)
 EAPI=0
 HOMEPAGE=http://www.qwirx.com/
-KEYWORDS=~x86 ~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.qwirx.com/piper/piper-1.14.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0f91177b9f9e0035cc24caf1791e773a
+_md5_=3cc84256585e92507b484706a4c7cd7e
diff --git a/metadata/md5-cache/net-proxy/rejik-3.2.10 b/metadata/md5-cache/net-proxy/rejik-3.2.10
index 9bbb56cb2686..746c154714ac 100644
--- a/metadata/md5-cache/net-proxy/rejik-3.2.10
+++ b/metadata/md5-cache/net-proxy/rejik-3.2.10
@@ -4,10 +4,10 @@ DESCRIPTION=A squid redirector used for blocking unwanted content
 EAPI=4
 HOMEPAGE=http://rejik.ru/
 IUSE=banlists
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre dev-perl/Text-Iconv dev-perl/XML-Parser net-proxy/squid
 SLOT=0
 SRC_URI=http://rejik.ru/download/redirector-3.2.10.tgz banlists? ( http://rejik.ru/download/banlists-2.x.x.tgz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6155bf6842c2a366344e2076de357e34
+_md5_=62a4b57a2d94e959342f9e70593958c2
diff --git a/metadata/md5-cache/net-wireless/gr-scan-20160104 b/metadata/md5-cache/net-wireless/gr-scan-20160104
index fb5e884e4ad5..b912b82132c6 100644
--- a/metadata/md5-cache/net-wireless/gr-scan-20160104
+++ b/metadata/md5-cache/net-wireless/gr-scan-20160104
@@ -3,9 +3,9 @@ DEPEND=net-wireless/gnuradio net-wireless/gr-osmosdr
 DESCRIPTION=Frequency scanner for GNU Radio
 EAPI=5
 HOMEPAGE=http://git.zx2c4.com/gr-scan/about
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=net-wireless/gnuradio net-wireless/gr-osmosdr
 SLOT=0
 SRC_URI=http://git.zx2c4.com/gr-scan/snapshot/gr-scan-20160104.tar.xz
-_md5_=5b22b3d5ab75ec190115086452ee0249
+_md5_=aba64a8cd09dd686cc0f294261137687
diff --git a/metadata/md5-cache/sci-biology/bedtools-2.26.0 b/metadata/md5-cache/sci-biology/bedtools-2.26.0
index 6c0e4526bdf6..6c0b088c4068 100644
--- a/metadata/md5-cache/sci-biology/bedtools-2.26.0
+++ b/metadata/md5-cache/sci-biology/bedtools-2.26.0
@@ -4,10 +4,10 @@ DESCRIPTION=Tools for manipulation and analysis of BED, GFF/GTF, VCF, SAM/BAM fi
 EAPI=6
 HOMEPAGE=https://bedtools.readthedocs.io/
 IUSE=test
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/arq5x/bedtools2/releases/download/v2.26.0/bedtools-2.26.0.tar.gz https://dev.gentoo.org/~mgorny/dist/bedtools-2.26.0-fix-buildsystem.patch.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=527393aeac6bc5f96c5f2c1201b6e74b
+_md5_=93c7c9cb11de4ad32cab7183dc2e6512
diff --git a/metadata/md5-cache/sci-biology/poa-2-r1 b/metadata/md5-cache/sci-biology/poa-2-r1
index e0ee765cae36..ab577e7669d7 100644
--- a/metadata/md5-cache/sci-biology/poa-2-r1
+++ b/metadata/md5-cache/sci-biology/poa-2-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Fast multiple sequence alignments using partial-order graphs
 EAPI=5
 HOMEPAGE=http://bioinfo.mbi.ucla.edu/poa/
 IUSE=static-libs
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/poamsa/poaV2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4f0b8d6c2192465644af4890a995d48a
+_md5_=8c6d961d6aa6f18d30b6fb7dd995115f
diff --git a/metadata/md5-cache/sci-biology/vcftools-0.1.14 b/metadata/md5-cache/sci-biology/vcftools-0.1.14
index 1ac46f33098a..7eb349f6cfab 100644
--- a/metadata/md5-cache/sci-biology/vcftools-0.1.14
+++ b/metadata/md5-cache/sci-biology/vcftools-0.1.14
@@ -4,10 +4,10 @@ DESCRIPTION=Tools for working with VCF (Variant Call Format) files
 EAPI=6
 HOMEPAGE=http://vcftools.sourceforge.net/
 IUSE=lapack
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND=sys-libs/zlib dev-lang/perl:= lapack? ( virtual/lapack )
 SLOT=0
 SRC_URI=https://github.com/vcftools/vcftools/releases/download/v0.1.14/vcftools-0.1.14.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c40169dc993f3444a3e2f41ad69a920d
+_md5_=82adffd84f2a93745e683b498b79fbe8
diff --git a/metadata/md5-cache/sci-chemistry/jmol-12.2.27-r1 b/metadata/md5-cache/sci-chemistry/jmol-12.2.27-r1
index 3871158f25bf..bef4f410f0df 100644
--- a/metadata/md5-cache/sci-chemistry/jmol-12.2.27-r1
+++ b/metadata/md5-cache/sci-chemistry/jmol-12.2.27-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Java molecular viever for 3-D chemical structures
 EAPI=5
 HOMEPAGE=http://jmol.sourceforge.net/
 IUSE=+client-only vhosts elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-cli:1 dev-java/itext:0 sci-libs/jmol-acme:0 sci-libs/vecmath-objectclub:0 sci-libs/naga >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jmol/Jmol-12.2.27-full.tar.gz https://dev.gentoo.org/~jlec/distfiles/jmol-selfSignedCertificate.store.tar
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=de2dedca3cc13b31429da06c08257045
+_md5_=dd96053fe27646ae0427b3558cdddbb9
diff --git a/metadata/md5-cache/sci-chemistry/pymol-plugins-emovie-1.0.4 b/metadata/md5-cache/sci-chemistry/pymol-plugins-emovie-1.0.4
index ad3586dc6356..945e0dcd9a54 100644
--- a/metadata/md5-cache/sci-chemistry/pymol-plugins-emovie-1.0.4
+++ b/metadata/md5-cache/sci-chemistry/pymol-plugins-emovie-1.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=PyMOL plugin for convinient movie creation
 EAPI=5
 HOMEPAGE=http://www.weizmann.ac.il/ISPC/eMovie.html
 IUSE=python_targets_python2_7
-KEYWORDS=~x86 ~amd64 ~x86-linux ~amd64-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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >sci-chemistry/pymol-0.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.weizmann.ac.il/ISPC/eMovie_package.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=990ac19bca204dd80eea16ac13567dfa
+_md5_=d89f0bb140092b82ce29515f5d5f9698
diff --git a/metadata/md5-cache/sci-electronics/eagle-7.4.0 b/metadata/md5-cache/sci-electronics/eagle-7.4.0
index ae626a5a2c8f..458204228b3f 100644
--- a/metadata/md5-cache/sci-electronics/eagle-7.4.0
+++ b/metadata/md5-cache/sci-electronics/eagle-7.4.0
@@ -3,11 +3,11 @@ DESCRIPTION=CadSoft EAGLE schematic and printed circuit board (PCB) layout edito
 EAPI=5
 HOMEPAGE=http://www.cadsoft.de
 IUSE=doc
-KEYWORDS=~amd64 ~x86 -*
+KEYWORDS=-* ~amd64 ~x86
 LICENSE=cadsoft-2
 RDEPEND=sys-libs/glibc dev-libs/openssl:0 >=sys-libs/zlib-1.2.8-r1 >=media-libs/freetype-2.5.0.1 >=media-libs/fontconfig-2.10.92 x11-libs/libXext x11-libs/libX11 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXrandr-1.4.2 >=x11-libs/libXcursor-1.1.14 >=x11-libs/libXi-1.7.2 net-print/cups x11-libs/libxcb
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=x86? ( ftp://ftp.cadsoft.de/eagle/program/7.4/eagle-lin32-7.4.0.run ) amd64? ( ftp://ftp.cadsoft.de/eagle/program/7.4/eagle-lin64-7.4.0.run )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=90d08cfc092239b8936274e4cf7006b5
+_md5_=1572536c3464ae747f025461de2d50c3
diff --git a/metadata/md5-cache/sci-electronics/eagle-7.6.0 b/metadata/md5-cache/sci-electronics/eagle-7.6.0
index 15f66d5e45b0..59c252da9f11 100644
--- a/metadata/md5-cache/sci-electronics/eagle-7.6.0
+++ b/metadata/md5-cache/sci-electronics/eagle-7.6.0
@@ -3,11 +3,11 @@ DESCRIPTION=CadSoft EAGLE schematic and printed circuit board (PCB) layout edito
 EAPI=6
 HOMEPAGE=http://www.cadsoft.de
 IUSE=doc
-KEYWORDS=~amd64 ~x86 -*
+KEYWORDS=-* ~amd64 ~x86
 LICENSE=cadsoft-2
 RDEPEND=sys-libs/glibc dev-libs/openssl:0 >=sys-libs/zlib-1.2.8-r1 >=media-libs/freetype-2.5.0.1 >=media-libs/fontconfig-2.10.92 x11-libs/libXext x11-libs/libX11 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXrandr-1.4.2 >=x11-libs/libXcursor-1.1.14 >=x11-libs/libXi-1.7.2 net-print/cups x11-libs/libxcb
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=x86? ( ftp://ftp.cadsoft.de/eagle/program/7.6/eagle-lin32-7.6.0.run ) amd64? ( ftp://ftp.cadsoft.de/eagle/program/7.6/eagle-lin64-7.6.0.run )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=54a5e867461a504da7ad10fe783762bf
+_md5_=87627406b97451954cedb88145904d00
diff --git a/metadata/md5-cache/sci-electronics/eagle-7.7.0 b/metadata/md5-cache/sci-electronics/eagle-7.7.0
index b06f2e3934cf..29c62b4dc431 100644
--- a/metadata/md5-cache/sci-electronics/eagle-7.7.0
+++ b/metadata/md5-cache/sci-electronics/eagle-7.7.0
@@ -3,11 +3,11 @@ DESCRIPTION=CadSoft EAGLE schematic and printed circuit board (PCB) layout edito
 EAPI=6
 HOMEPAGE=http://www.cadsoft.de
 IUSE=doc
-KEYWORDS=~amd64 ~x86 -*
+KEYWORDS=-* ~amd64 ~x86
 LICENSE=cadsoft-2
 RDEPEND=sys-libs/glibc dev-libs/openssl:0 >=sys-libs/zlib-1.2.8-r1 >=media-libs/freetype-2.5.0.1 >=media-libs/fontconfig-2.10.92 x11-libs/libXext x11-libs/libX11 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXrandr-1.4.2 >=x11-libs/libXcursor-1.1.14 >=x11-libs/libXi-1.7.2 net-print/cups x11-libs/libxcb
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=x86? ( ftp://ftp.cadsoft.de/eagle/program/7.7/eagle-lin32-7.7.0.run ) amd64? ( ftp://ftp.cadsoft.de/eagle/program/7.7/eagle-lin64-7.7.0.run )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=54a5e867461a504da7ad10fe783762bf
+_md5_=87627406b97451954cedb88145904d00
diff --git a/metadata/md5-cache/sci-electronics/gplcver-2.11a b/metadata/md5-cache/sci-electronics/gplcver-2.11a
index fc2f85ae8564..49128a42c498 100644
--- a/metadata/md5-cache/sci-electronics/gplcver-2.11a
+++ b/metadata/md5-cache/sci-electronics/gplcver-2.11a
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile install test unpack
 DESCRIPTION=Verilog simulator
 EAPI=0
 HOMEPAGE=http://www.pragmatic-c.com/gpl-cver
-KEYWORDS=x86 ~ppc
+KEYWORDS=~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.pragmatic-c.com/gpl-cver/downloads/gplcver-2.11a.src.tar.bz2
-_md5_=92306deb3bd822fcf1908309a97f516d
+_md5_=e94acc379e73b46cc019ecb62f431b24
diff --git a/metadata/md5-cache/sci-libs/mmtk-2.7.9 b/metadata/md5-cache/sci-libs/mmtk-2.7.9
index d0772f0ad179..ef1cd9a7edd2 100644
--- a/metadata/md5-cache/sci-libs/mmtk-2.7.9
+++ b/metadata/md5-cache/sci-libs/mmtk-2.7.9
@@ -4,11 +4,11 @@ DESCRIPTION=Molecular Modeling ToolKit for Python
 EAPI=5
 HOMEPAGE=http://dirac.cnrs-orleans.fr/MMTK/
 IUSE=examples python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=CeCILL-2
 RDEPEND=dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/numpy-1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/scientificpython[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 )
 SLOT=0
 SRC_URI=http://sourcesup.cru.fr/frs/download.php/4324/MMTK-2.7.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d49c56f5778972f968382eaa947ebf59
+_md5_=b285608448c4d3100e238995c7e1e1c7
diff --git a/metadata/md5-cache/sci-libs/naga-2.1 b/metadata/md5-cache/sci-libs/naga-2.1
index 222efadaf92a..243942d3dd8f 100644
--- a/metadata/md5-cache/sci-libs/naga-2.1
+++ b/metadata/md5-cache/sci-libs/naga-2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Simplified Java NIO asynchronous sockets
 EAPI=4
 HOMEPAGE=https://code.google.com/p/naga/
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/naga-2.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=694049afd4ef2a3fde487af8a325b948
+_md5_=3b01671a5448e175f74b67fcee5395c2
diff --git a/metadata/md5-cache/sci-libs/nfft-3.3.2 b/metadata/md5-cache/sci-libs/nfft-3.3.2
index 49299101b0b1..cdbf7ce3e34d 100644
--- a/metadata/md5-cache/sci-libs/nfft-3.3.2
+++ b/metadata/md5-cache/sci-libs/nfft-3.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=library for nonequispaced discrete Fourier transformations
 EAPI=6
 HOMEPAGE=https://www-user.tu-chemnitz.de/~potts/nfft/
 IUSE=doc openmp static-libs
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sci-libs/fftw:3.0[threads,openmp?]
 SLOT=0
 SRC_URI=https://github.com/NFFT/nfft/releases/download/3.3.2/nfft-3.3.2.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=100120b92fe10892c17510526f3eabe4
+_md5_=fbfc437ff644b2a75af654dac20141f8
diff --git a/metadata/md5-cache/sci-mathematics/arb-2.11.1-r1 b/metadata/md5-cache/sci-mathematics/arb-2.11.1-r1
index 7ffa3421b6bc..63adcbaf5d6d 100644
--- a/metadata/md5-cache/sci-mathematics/arb-2.11.1-r1
+++ b/metadata/md5-cache/sci-mathematics/arb-2.11.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=C library for arbitrary-precision interval arithmetic
 EAPI=6
 HOMEPAGE=http://fredrikj.net/arb/
 IUSE=static-libs
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= >=sci-mathematics/flint-2.5.0:=
 SLOT=0/2
 SRC_URI=https://github.com/fredrik-johansson/arb/archive/2.11.1.tar.gz -> arb-2.11.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=81a6e94cbcb7509e7d060e29b4ef5ae8
+_md5_=e48aacd4fd1bb5fb30cc6a64ac9474af
diff --git a/metadata/md5-cache/sci-mathematics/arb-2.16.0 b/metadata/md5-cache/sci-mathematics/arb-2.16.0
index afedce99e6af..b002407afb40 100644
--- a/metadata/md5-cache/sci-mathematics/arb-2.16.0
+++ b/metadata/md5-cache/sci-mathematics/arb-2.16.0
@@ -4,10 +4,10 @@ DESCRIPTION=C library for arbitrary-precision interval arithmetic
 EAPI=6
 HOMEPAGE=http://fredrikj.net/arb/
 IUSE=static-libs
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= >=sci-mathematics/flint-2.5.0:=
 SLOT=0/2
 SRC_URI=https://github.com/fredrik-johansson/arb/archive/2.16.0.tar.gz -> arb-2.16.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aefc447a06cac04a7b685b50dc01a326
+_md5_=d67b9d239491d91cf6c439288ae450b8
diff --git a/metadata/md5-cache/sci-mathematics/octave-epstk-2.4 b/metadata/md5-cache/sci-mathematics/octave-epstk-2.4
index 3910fd3b4f44..eef87e128cbb 100644
--- a/metadata/md5-cache/sci-mathematics/octave-epstk-2.4
+++ b/metadata/md5-cache/sci-mathematics/octave-epstk-2.4
@@ -3,10 +3,10 @@ DESCRIPTION=Graphical output functions for Matlab and Octave
 EAPI=4
 HOMEPAGE=http://www.epstk.de/
 IUSE=doc
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sci-mathematics/octave app-text/ghostscript-gpl
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/octave-epstk/octave-epstk_2.4.orig.tar.bz2 mirror://debian/pool/main/o/octave-epstk/octave-epstk_2.4-1.debian.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c91ce7624e9f257d43eed5b055863bb7
+_md5_=eec10ee7155d89b064e2157fc69bfac3
diff --git a/metadata/md5-cache/sci-mathematics/rw-0.7-r2 b/metadata/md5-cache/sci-mathematics/rw-0.7-r2
index 9e77f5f532ff..d04cfd30d543 100644
--- a/metadata/md5-cache/sci-mathematics/rw-0.7-r2
+++ b/metadata/md5-cache/sci-mathematics/rw-0.7-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Compute rank-width decompositions of graphs
 EAPI=6
 HOMEPAGE=http://pholia.tdi.informatik.uni-frankfurt.de/~philipp/software/rw.shtml
 IUSE=+executable
-KEYWORDS=~amd64 ~amd64-linux ~x86 ~x86-linux ~ppc-macos ~x86-macos ~x64-macos
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=executable? ( >=dev-libs/igraph-0.6 ) !media-gfx/xpaint
 SLOT=0
 SRC_URI=http://pholia.tdi.informatik.uni-frankfurt.de/~philipp/software/rw-0.7.tar.gz
-_md5_=2de0637b9c5b9ad67f9462048e1a7b8c
+_md5_=1e5d2b8512b35a80e7d47cceb1ec64dd
diff --git a/metadata/md5-cache/sci-mathematics/sha1-polyml-5.5.0 b/metadata/md5-cache/sci-mathematics/sha1-polyml-5.5.0
index a2510117c578..ad7db26b3944 100644
--- a/metadata/md5-cache/sci-mathematics/sha1-polyml-5.5.0
+++ b/metadata/md5-cache/sci-mathematics/sha1-polyml-5.5.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare test
 DESCRIPTION=implementation of SHA1 is taken from the GNU coreutils package
 EAPI=5
 HOMEPAGE=http://isabelle.in.tum.de/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://isabelle.in.tum.de/components/polyml-5.5.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=13e53909483575793c77ca5b3ab7d7ee
+_md5_=549f4eafce90224bdb416841df1ff0dd
diff --git a/metadata/md5-cache/sci-mathematics/sha1-polyml-5.6_p1 b/metadata/md5-cache/sci-mathematics/sha1-polyml-5.6_p1
index 719e257abd8b..c02e567372b9 100644
--- a/metadata/md5-cache/sci-mathematics/sha1-polyml-5.6_p1
+++ b/metadata/md5-cache/sci-mathematics/sha1-polyml-5.6_p1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install test
 DESCRIPTION=implementation of SHA1 is taken from the GNU coreutils package
 EAPI=6
 HOMEPAGE=http://isabelle.in.tum.de/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://isabelle.in.tum.de/components/polyml-5.6-1.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=bbc8703ec86ceab3526a4f45c8fec307
+_md5_=6c88672b87768680c635f62de7187d50
diff --git a/metadata/md5-cache/sys-apps/ack-2.18-r1 b/metadata/md5-cache/sys-apps/ack-2.18-r1
index 6361a3739e79..b59e39335f7e 100644
--- a/metadata/md5-cache/sys-apps/ack-2.18-r1
+++ b/metadata/md5-cache/sys-apps/ack-2.18-r1
@@ -4,10 +4,10 @@ DESCRIPTION=ack is a tool like grep, optimized for programmers
 EAPI=6
 HOMEPAGE=https://beyondgrep.com
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~hppa x86 ~amd64-linux ~x86-linux ~x86-macos ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/File-Next-1.160.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/ack-2.18.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=30c69b70812c8e23cbbca4d8413eafc3
+_md5_=615b050d3c3ccaa4b269f64ab2427648
diff --git a/metadata/md5-cache/sys-apps/ack-2.22 b/metadata/md5-cache/sys-apps/ack-2.22
index 00146fb5719b..7fea0c5ebcca 100644
--- a/metadata/md5-cache/sys-apps/ack-2.22
+++ b/metadata/md5-cache/sys-apps/ack-2.22
@@ -4,10 +4,10 @@ DESCRIPTION=ack is a tool like grep, optimized for programmers
 EAPI=6
 HOMEPAGE=https://beyondgrep.com
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux ~x86-macos ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/File-Next-1.160.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/ack-2.22.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=8cfa588040a4e54d957cbe3e053ccbfc
+_md5_=f5773714aeedf0d873e0a58f86227b1f
diff --git a/metadata/md5-cache/sys-apps/fwcrv-0.1.0 b/metadata/md5-cache/sys-apps/fwcrv-0.1.0
index 906c7993640d..cf47652c2fe2 100644
--- a/metadata/md5-cache/sys-apps/fwcrv-0.1.0
+++ b/metadata/md5-cache/sys-apps/fwcrv-0.1.0
@@ -3,10 +3,10 @@ DEPEND=sys-libs/libraw1394
 DESCRIPTION=FireWire CSR Config ROM Viewer
 EAPI=0
 HOMEPAGE=http://www.hugovil.com/en/fwcrv/
-KEYWORDS=x86 ~ppc
+KEYWORDS=~ppc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/libraw1394
 SLOT=0
 SRC_URI=http://www.hugovil.com/repository/fwcrv-0.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=84b8682e1aa2b8ef50c1d0a78819ec36
+_md5_=396e6fc2c50808d400a4a48410aa11a4
diff --git a/metadata/md5-cache/sys-apps/hbaapi-2.2 b/metadata/md5-cache/sys-apps/hbaapi-2.2
index d503311d5737..5d64caac1616 100644
--- a/metadata/md5-cache/sys-apps/hbaapi-2.2
+++ b/metadata/md5-cache/sys-apps/hbaapi-2.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=The Host Bus Adapter API for managing Fibre Channel Host Bus Adapters
 EAPI=4
 HOMEPAGE=http://hbaapi.sourceforge.net/
-KEYWORDS=~ppc ~x86 ~amd64
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=SNIA
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/hbaapi/hbaapi_src_2.2.tgz mirror://gentoo/hbaapi-2.2.Makefile.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cecdf76802680f245bb4b5600cc33f9b
+_md5_=e53cb065ba70107660b9da9d7efcbd04
diff --git a/metadata/md5-cache/sys-apps/hwdata-redhat-0.217 b/metadata/md5-cache/sys-apps/hwdata-redhat-0.217
index 86d1caf8bd2f..db061fc20018 100644
--- a/metadata/md5-cache/sys-apps/hwdata-redhat-0.217
+++ b/metadata/md5-cache/sys-apps/hwdata-redhat-0.217
@@ -4,10 +4,10 @@ DESCRIPTION=Hardware identification and configuration data
 EAPI=0
 HOMEPAGE=https://fedora.redhat.com/projects/config-tools/
 IUSE=test
-KEYWORDS=~ppc ~ppc64 ~x86 ~amd64
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 MIT
 RDEPEND=virtual/modutils !sys-apps/hwdata-gentoo
 SLOT=0
 SRC_URI=mirror://fedora-dev/releases/9/Everything/source/SRPMS/hwdata-0.217-1.fc9.src.rpm
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ae680536c19af876437098053a1a3206
+_md5_=faf93d79eee4a90495caa68273702ff1
diff --git a/metadata/md5-cache/sys-apps/most-5.0.0a-r1 b/metadata/md5-cache/sys-apps/most-5.0.0a-r1
index 8c697654f190..01ddfed17cf9 100644
--- a/metadata/md5-cache/sys-apps/most-5.0.0a-r1
+++ b/metadata/md5-cache/sys-apps/most-5.0.0a-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-libs/slang-2.1.3
 DESCRIPTION=Paging program that displays, one windowful at a time, the contents of a file
 EAPI=5
 HOMEPAGE=ftp://space.mit.edu/pub/davis/most
-KEYWORDS=alpha amd64 arm ~mips ~ppc64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/slang-2.1.3
 SLOT=0
 SRC_URI=ftp://space.mit.edu/pub/davis/most/most-5.0.0a.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bafe9186017e206008c9588768f231a8
+_md5_=bc9a0d8809946b5fcad3686209c5391d
diff --git a/metadata/md5-cache/sys-apps/newrelic-sysmond-1.1.2.124-r1 b/metadata/md5-cache/sys-apps/newrelic-sysmond-1.1.2.124-r1
index 28593c779723..fd07e73810d0 100644
--- a/metadata/md5-cache/sys-apps/newrelic-sysmond-1.1.2.124-r1
+++ b/metadata/md5-cache/sys-apps/newrelic-sysmond-1.1.2.124-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst setup
 DESCRIPTION=NewRelic System Monitor
 EAPI=6
 HOMEPAGE=http://www.newrelic.com/
-KEYWORDS=-* ~x86 ~amd64
+KEYWORDS=-* ~amd64 ~x86
 LICENSE=newrelic Apache-2.0 MIT ISC openssl GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://download.newrelic.com/server_monitor/archive/1.1.2.124/newrelic-sysmond-1.1.2.124-linux.tar.gz
 _eclasses_=user	e68863263b1e8611dacf381bec5c8b2b
-_md5_=36d4cd7e7bb7af5742184365796fddd3
+_md5_=0cb671061e919a743debd7f1cf6267e2
diff --git a/metadata/md5-cache/sys-apps/usbmon-6-r1 b/metadata/md5-cache/sys-apps/usbmon-6-r1
index 7abbe285bf9b..676d189201e8 100644
--- a/metadata/md5-cache/sys-apps/usbmon-6-r1
+++ b/metadata/md5-cache/sys-apps/usbmon-6-r1
@@ -3,9 +3,9 @@ DEPEND=!=sys-apps/usbutils-0.72-r2
 DESCRIPTION=Userland for USB monitoring framework
 EAPI=5
 HOMEPAGE=https://people.redhat.com/zaitcev/linux/
-KEYWORDS=~x86 ~ppc ~amd64
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://people.redhat.com/zaitcev/linux//usbmon-6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=100a98765a05b539068a8b6bc2247bea
+_md5_=eb1a61e9ce2ad82dbf2efa191a9c7994
diff --git a/metadata/md5-cache/sys-apps/usbmon-6.1 b/metadata/md5-cache/sys-apps/usbmon-6.1
index 2fca7296324b..dd2d2caa24e9 100644
--- a/metadata/md5-cache/sys-apps/usbmon-6.1
+++ b/metadata/md5-cache/sys-apps/usbmon-6.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Userland for USB monitoring framework
 EAPI=6
 HOMEPAGE=https://people.redhat.com/zaitcev/linux/
-KEYWORDS=~x86 ~ppc ~amd64
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://people.redhat.com/zaitcev/linux//usbmon-6.1.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=3ac402f0997d402367ae1e795c7e5313
+_md5_=6b399f834f22ac3824cca304948b3432
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.33.1 b/metadata/md5-cache/sys-apps/util-linux-2.33.1
index 37f51f579587..a6dedd59e7c1 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.33.1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.33.1
@@ -4,11 +4,11 @@ DESCRIPTION=Various useful Linux utilities
 EAPI=6
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
 IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~riscv ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.33/util-linux-2.33.1.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7848f220e5cac7a439c2ff2c19ab4570
+_md5_=c0b64a05ede22f9786d4d8ae3ed9c79f
diff --git a/metadata/md5-cache/sys-block/fwdl-1.2.3 b/metadata/md5-cache/sys-block/fwdl-1.2.3
index 77fa95f94018..06c29c93fc4e 100644
--- a/metadata/md5-cache/sys-block/fwdl-1.2.3
+++ b/metadata/md5-cache/sys-block/fwdl-1.2.3
@@ -3,9 +3,9 @@ DESCRIPTION=Seagate Fibre-Channel disk firmware upgrade tool
 EAPI=4
 HOMEPAGE=http://www.tc.umn.edu/~erick205/Projects/
 IUSE=debug
-KEYWORDS=~x86 ~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.tc.umn.edu/~erick205/Projects/fwdl/fwdl-1.2.3.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=fdd68adca24f4727f31069842574f5ef
+_md5_=8afc41a02ac4600a3c8a62f3dcae3428
diff --git a/metadata/md5-cache/sys-block/noflushd-2.7.3 b/metadata/md5-cache/sys-block/noflushd-2.7.3
index e55544aaa084..c805741e0f5c 100644
--- a/metadata/md5-cache/sys-block/noflushd-2.7.3
+++ b/metadata/md5-cache/sys-block/noflushd-2.7.3
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile install postinst
 DESCRIPTION=A daemon to spin down your disks and force accesses to be cached
 EAPI=0
 HOMEPAGE=http://noflushd.sourceforge.net
-KEYWORDS=x86 amd64 ppc
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/noflushd/noflushd-2.7.3.tar.gz
-_md5_=dec85902fd80aa65b7b780076a3d7225
+_md5_=41231a8799683c802233e5fb65097691
diff --git a/metadata/md5-cache/sys-block/sas2ircu-19 b/metadata/md5-cache/sys-block/sas2ircu-19
index 87d68e7d8865..d2b622517d80 100644
--- a/metadata/md5-cache/sys-block/sas2ircu-19
+++ b/metadata/md5-cache/sys-block/sas2ircu-19
@@ -3,10 +3,10 @@ DESCRIPTION=LSI MPT-SAS2 controller management tool
 EAPI=5
 HOMEPAGE=http://www.lsi.com/support/Pages/download-results.aspx?component=Storage+Component&productfamily=Host+Bus+Adapters&productcode=0&assettype=Miscellaneous&productname=&keyword=SAS2IRCU
 IUSE=efi doc
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd ~ppc64 ~amd64-fbsd ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=-* ~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LSI
 RESTRICT=strip fetch mirror
 SLOT=0
 SRC_URI=http://www.lsi.com/downloads/Public/Host%20Bus%20Adapters/Host%20Bus%20Adapters%20Common%20Files/SAS_SATA_6G_P19/SAS2IRCU_P19.zip doc? ( http://www.lsi.com/downloads/Public/Host%20Bus%20Adapters/Host%20Bus%20Adapters%20Common%20Files/SAS_SATA_6G_P12/SAS2IRCU_User_Guide.pdf )
 _eclasses_=mount-boot	1e82d96b7a7dcb483b412497a90bb646
-_md5_=02ae505e060bc41fa6d6d46c6767a875
+_md5_=471c2c7d08f958477c729275ae9acad8
diff --git a/metadata/md5-cache/sys-block/sas2ircu-20 b/metadata/md5-cache/sys-block/sas2ircu-20
index 8cf5d8458c06..231e6c9929ea 100644
--- a/metadata/md5-cache/sys-block/sas2ircu-20
+++ b/metadata/md5-cache/sys-block/sas2ircu-20
@@ -3,10 +3,10 @@ DESCRIPTION=LSI MPT-SAS2 controller management tool
 EAPI=6
 HOMEPAGE=https://www.broadcom.com/products/storage/host-bus-adapters/sas-9207-8e#tab-archive-drivers4-abc
 IUSE=efi doc
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd ~ppc64 ~amd64-fbsd ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=-* ~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LSI
 RESTRICT=strip fetch mirror
 SLOT=0
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/host-bus-adapters-common-files/sas_sata_6g_p20_point6/SAS2IRCU_P20.zip doc? ( https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/host-bus-adapters-common-files/SAS2_IR_User_Guide.pdf )
 _eclasses_=mount-boot	1e82d96b7a7dcb483b412497a90bb646
-_md5_=a2c4c699a47d67550a3a24ac1f50befd
+_md5_=e94ceae171a8dfbaca746fa8e500f961
diff --git a/metadata/md5-cache/sys-block/sas3flash-15 b/metadata/md5-cache/sys-block/sas3flash-15
index 1c11d00e12f5..d46915658eed 100644
--- a/metadata/md5-cache/sys-block/sas3flash-15
+++ b/metadata/md5-cache/sys-block/sas3flash-15
@@ -3,10 +3,10 @@ DESCRIPTION=Flash utility for LSI MPT-SAS3 controller
 EAPI=6
 HOMEPAGE=https://www.broadcom.com/products/storage/host-bus-adapters/sas-9300-8e#downloads
 IUSE=efi doc
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd ~ppc64 ~amd64-fbsd ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=-* ~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LSI
 RESTRICT=strip fetch mirror
 SLOT=0
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/host-bus-adapters-common-files/sas_sata_12g_p15/SAS3FLASH_P15.zip doc? ( https://docs.broadcom.com/docs-and-downloads/oracle/files/sas3Flash_quickRefGuide_rev1-0.pdf )
 _eclasses_=mount-boot	1e82d96b7a7dcb483b412497a90bb646
-_md5_=17f78dc41cd1382ec3365b8ed70b7626
+_md5_=5fc12c89b2186a5cda5d65e69dcbbd76
diff --git a/metadata/md5-cache/sys-block/sas3ircu-14 b/metadata/md5-cache/sys-block/sas3ircu-14
index 50b032cba4fe..d5a7f10a01fc 100644
--- a/metadata/md5-cache/sys-block/sas3ircu-14
+++ b/metadata/md5-cache/sys-block/sas3ircu-14
@@ -3,10 +3,10 @@ DESCRIPTION=LSI MPT-SAS3 controller management tool
 EAPI=5
 HOMEPAGE=https://www.broadcom.com/products/storage/host-bus-adapters/sas-9300-8e#downloads
 IUSE=efi doc
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd ~ppc64 ~amd64-fbsd ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=-* ~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LSI
 RESTRICT=strip fetch mirror
 SLOT=0
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/host-bus-adapters-common-files/sas_sata_12g_p14/SAS3IRCU_P14.zip doc? ( https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/SAS3_IR_UG.pdf )
 _eclasses_=mount-boot	1e82d96b7a7dcb483b412497a90bb646
-_md5_=feae2c5cbd01260b77d5f16568a2516e
+_md5_=9015c3ea7fb7935d279d806202c7b8eb
diff --git a/metadata/md5-cache/sys-block/sas3ircu-15 b/metadata/md5-cache/sys-block/sas3ircu-15
index f9e5ea79af44..9b3f46a10993 100644
--- a/metadata/md5-cache/sys-block/sas3ircu-15
+++ b/metadata/md5-cache/sys-block/sas3ircu-15
@@ -3,10 +3,10 @@ DESCRIPTION=LSI MPT-SAS3 controller management tool
 EAPI=5
 HOMEPAGE=https://www.broadcom.com/products/storage/host-bus-adapters/sas-9300-8e#downloads
 IUSE=efi doc
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd ~ppc64 ~amd64-fbsd ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=-* ~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LSI
 RESTRICT=strip fetch mirror
 SLOT=0
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/host-bus-adapters-common-files/sas_sata_12g_p15/SAS3IRCU_P15.zip doc? ( https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/SAS3_IR_UG.pdf )
 _eclasses_=mount-boot	1e82d96b7a7dcb483b412497a90bb646
-_md5_=443a76d2266a91bd84b1fc7e29f0b0bb
+_md5_=aef0dee3ac83a66fa490be596bbd33df
diff --git a/metadata/md5-cache/sys-block/sas3ircu-5 b/metadata/md5-cache/sys-block/sas3ircu-5
index bde77cf7befb..0c8f01b1153e 100644
--- a/metadata/md5-cache/sys-block/sas3ircu-5
+++ b/metadata/md5-cache/sys-block/sas3ircu-5
@@ -3,10 +3,10 @@ DESCRIPTION=LSI MPT-SAS3 controller management tool
 EAPI=5
 HOMEPAGE=http://www.lsi.com/support/Pages/download-results.aspx?component=Storage+Component&productfamily=Host+Bus+Adapters&productcode=0&assettype=Miscellaneous&productname=&keyword=SAS3IRCU
 IUSE=efi doc
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd ~ppc64 ~amd64-fbsd ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=-* ~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LSI
 RESTRICT=strip fetch mirror
 SLOT=0
 SRC_URI=http://www.lsi.com/downloads/Public/Host%20Bus%20Adapters/Host%20Bus%20Adapters%20Common%20Files/SAS_SATA_12G_P5/SAS3IRCU_P5.zip doc? ( http://www.lsi.com/downloads/Public/Host%20Bus%20Adapters/SAS3IRCU_UG.pdf )
 _eclasses_=mount-boot	1e82d96b7a7dcb483b412497a90bb646
-_md5_=36ea63e7fd8460e33cd54fd14f14815a
+_md5_=71464012e636a8c30532c07ccd2861c7
diff --git a/metadata/md5-cache/sys-block/tw_cli-10.2.2.1 b/metadata/md5-cache/sys-block/tw_cli-10.2.2.1
index 2e2a12217159..58bf37152431 100644
--- a/metadata/md5-cache/sys-block/tw_cli-10.2.2.1
+++ b/metadata/md5-cache/sys-block/tw_cli-10.2.2.1
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=3ware SATA/PATA/SAS RAID controller Command Line Interface tool
 EAPI=5
 HOMEPAGE=http://www.lsi.com/products/raid-controllers/pages/3ware-sas-9750-8i.aspx
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd ~amd64-fbsd
+KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LSI-tw_cli
 RESTRICT=strip primaryuri
 SLOT=0
 SRC_URI=kernel_linux? ( http://www.lsi.com/downloads/Public/SATA/SATA%20Common%20Files//CLI_linux-from_the_10.2.2.1_9.5.5.1_codesets.zip ) kernel_FreeBSD? ( http://www.lsi.com/downloads/Public/SATA/SATA%20Common%20Files//CLI_freebsd-from_the_10.2.2.1_9.5.5.1_codesets.zip ) https://gitweb.gentoo.org/repo/gentoo.git/plain/licenses/LSI-tw_cli
-_md5_=1b111b77691dc4b8e8470fb5aaa9c837
+_md5_=ee3a6dda522d0f5f5f59bd4b91a65323
diff --git a/metadata/md5-cache/sys-boot/bootcreator-1.1 b/metadata/md5-cache/sys-boot/bootcreator-1.1
index 2b0132243534..db477688e7ba 100644
--- a/metadata/md5-cache/sys-boot/bootcreator-1.1
+++ b/metadata/md5-cache/sys-boot/bootcreator-1.1
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Simple generator for Forth based BootMenu scripts for Pegasos machines
 EAPI=6
 HOMEPAGE=http://tbs-software.com/morgoth/projects.html
-KEYWORDS=ppc -*
+KEYWORDS=-* ppc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://tbs-software.com/morgoth/files/bootcreator-src.tar.gz
-_md5_=10b7ea8d5cadece0516ed79a3ffaffc6
+_md5_=a4b0c37a1dcb7677dee7310202439a09
diff --git a/metadata/md5-cache/sys-boot/bootcreator-1.2 b/metadata/md5-cache/sys-boot/bootcreator-1.2
index 2b0132243534..db477688e7ba 100644
--- a/metadata/md5-cache/sys-boot/bootcreator-1.2
+++ b/metadata/md5-cache/sys-boot/bootcreator-1.2
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Simple generator for Forth based BootMenu scripts for Pegasos machines
 EAPI=6
 HOMEPAGE=http://tbs-software.com/morgoth/projects.html
-KEYWORDS=ppc -*
+KEYWORDS=-* ppc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://tbs-software.com/morgoth/files/bootcreator-src.tar.gz
-_md5_=10b7ea8d5cadece0516ed79a3ffaffc6
+_md5_=a4b0c37a1dcb7677dee7310202439a09
diff --git a/metadata/md5-cache/sys-boot/tboot-1.9.6_p20171118 b/metadata/md5-cache/sys-boot/tboot-1.9.6_p20171118
index 97902e7addd9..500472cad6ea 100644
--- a/metadata/md5-cache/sys-boot/tboot-1.9.6_p20171118
+++ b/metadata/md5-cache/sys-boot/tboot-1.9.6_p20171118
@@ -4,11 +4,11 @@ DESCRIPTION=Performs a measured and verified boot using Intel Trusted Execution
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/tboot/
 IUSE=custom-cflags selinux
-KEYWORDS=~amd64 ~x86 -*
+KEYWORDS=-* ~amd64 ~x86
 LICENSE=BSD
 RDEPEND=app-crypt/trousers app-crypt/tpm-tools dev-libs/openssl:0=[-bindist] sys-boot/grub:2 selinux? ( sec-policy/selinux-tboot )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~perfinion/distfiles/tboot-1.9.6_p20171118.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a9c15286be435f98c27e0160ea23aec1
+_md5_=0b70bf3aeb37a45fb695d8bcc6de37a5
diff --git a/metadata/md5-cache/sys-cluster/hpl-2.0-r3 b/metadata/md5-cache/sys-cluster/hpl-2.0-r3
index 2fc3db608afb..8b17b250b0de 100644
--- a/metadata/md5-cache/sys-cluster/hpl-2.0-r3
+++ b/metadata/md5-cache/sys-cluster/hpl-2.0-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Portable Implementation of the Linpack Benchmark for Distributed-Mem
 EAPI=4
 HOMEPAGE=http://www.netlib.org/benchmark/hpl/
 IUSE=doc
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=HPL
 RDEPEND=virtual/blas virtual/lapack virtual/mpi
 SLOT=0
 SRC_URI=http://www.netlib.org/benchmark/hpl/hpl-2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=861b5f67e2513758e1c04085729d9096
+_md5_=893d3df2712516d5462f42b78ff7857f
diff --git a/metadata/md5-cache/sys-cluster/lspbs-1.1-r1 b/metadata/md5-cache/sys-cluster/lspbs-1.1-r1
index ee1c83a8b628..e21ce3d8cec9 100644
--- a/metadata/md5-cache/sys-cluster/lspbs-1.1-r1
+++ b/metadata/md5-cache/sys-cluster/lspbs-1.1-r1
@@ -3,9 +3,9 @@ DEPEND=sys-cluster/torque
 DESCRIPTION=Displays clear, concise and up-to-date PBS node and CPU usage information
 EAPI=0
 HOMEPAGE=http://homepages.inf.ed.ac.uk/s0239160/misc/lspbs/lspbs.html
-KEYWORDS=~x86 ~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-cluster/torque
 SLOT=0
 SRC_URI=http://homepages.inf.ed.ac.uk/s0239160/misc/lspbs/lspbs-1.1.tar.gz
-_md5_=061414e31c20619eb9b7f034928b47ba
+_md5_=e4c82ba02db4b8c2b308f54f3d359506
diff --git a/metadata/md5-cache/sys-cluster/mvapich2-1.6 b/metadata/md5-cache/sys-cluster/mvapich2-1.6
index 7eac37529126..32b558082852 100644
--- a/metadata/md5-cache/sys-cluster/mvapich2-1.6
+++ b/metadata/md5-cache/sys-cluster/mvapich2-1.6
@@ -4,10 +4,10 @@ DESCRIPTION=MVAPICH2 MPI-over-infiniband package auto-configured for OpenIB
 EAPI=4
 HOMEPAGE=http://mvapich.cse.ohio-state.edu/
 IUSE=debug fortran large-cluster medium-cluster romio threads
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=sys-fabric/libibverbs sys-fabric/libibumad sys-fabric/libibmad sys-fabric/librdmacm virtual/fortran
 SLOT=0
 SRC_URI=http://mvapich.cse.ohio-state.edu//download/mvapich2/mvapich2-1.6.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=44841a691994329f17f539ff16fb5409
+_md5_=0e27db3e1cb8c73c029f836572ce14d3
diff --git a/metadata/md5-cache/sys-firmware/nvidia-firmware-325.15 b/metadata/md5-cache/sys-firmware/nvidia-firmware-325.15
index d2db5fa01ed8..d6639a45f799 100644
--- a/metadata/md5-cache/sys-firmware/nvidia-firmware-325.15
+++ b/metadata/md5-cache/sys-firmware/nvidia-firmware-325.15
@@ -3,10 +3,10 @@ DEPEND==dev-lang/python-2*
 DESCRIPTION=Kernel and mesa firmware for nouveau (video accel and pgraph)
 EAPI=5
 HOMEPAGE=https://nouveau.freedesktop.org/wiki/VideoAcceleration/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT NVIDIA-r2
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://us.download.nvidia.com/XFree86/Linux-x86/325.15/NVIDIA-Linux-x86-325.15.run https://raw.github.com/imirkin/re-vp2/845a51ab607df85fc0ed01f0b5b6d57850e37662/extract_firmware.py -> nvidia_extract_firmware-325.15.py
 _eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=e9a298b84792cfed5e533f7806aaec35
+_md5_=92df02691f7a26f65f8b05680698975c
diff --git a/metadata/md5-cache/sys-fs/dislocker-0.7.1-r1 b/metadata/md5-cache/sys-fs/dislocker-0.7.1-r1
index a81863bb8f32..4b1511cefa74 100644
--- a/metadata/md5-cache/sys-fs/dislocker-0.7.1-r1
+++ b/metadata/md5-cache/sys-fs/dislocker-0.7.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Dislocker is used to read BitLocker encrypted partitions.
 EAPI=5
 HOMEPAGE=https://github.com/Aorimn/dislocker
 IUSE=ruby
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-fs/fuse:* net-libs/mbedtls ruby? ( dev-lang/ruby:2.4 )
 SLOT=0
 SRC_URI=https://github.com/Aorimn/dislocker/archive/v0.7.1.tar.gz -> dislocker-0.7.1.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7dbc46c6045dbda9158e1971ab6569f8
+_md5_=ab104b3a040a6135981869f2c652ccad
diff --git a/metadata/md5-cache/sys-fs/dislocker-9999 b/metadata/md5-cache/sys-fs/dislocker-9999
index ef4d74a281c7..5243c81abfef 100644
--- a/metadata/md5-cache/sys-fs/dislocker-9999
+++ b/metadata/md5-cache/sys-fs/dislocker-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/fuse:* net-libs/mbedtls ruby? ( dev-lang/ruby:2.3 )
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4c5da410a8d25384e9289a558727bc91
+_md5_=4ada014db7a42c8f25aeb2badc6ff3fd
diff --git a/metadata/md5-cache/sys-fs/libeatmydata-105-r1 b/metadata/md5-cache/sys-fs/libeatmydata-105-r1
index ed6dea8c346d..32fa3fa1a135 100644
--- a/metadata/md5-cache/sys-fs/libeatmydata-105-r1
+++ b/metadata/md5-cache/sys-fs/libeatmydata-105-r1
@@ -4,10 +4,10 @@ DESCRIPTION=LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP
 EAPI=5
 HOMEPAGE=https://launchpad.net/libeatmydata/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/libeatmydata/trunk/release-105/+download/libeatmydata-105.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=90c3689352a486d0dc7e3f1992e96820
+_md5_=e84df2bae68234293fb491ba36bf6360
diff --git a/metadata/md5-cache/sys-fs/libeatmydata-65 b/metadata/md5-cache/sys-fs/libeatmydata-65
index 5a41b2423521..579ec0fdcba6 100644
--- a/metadata/md5-cache/sys-fs/libeatmydata-65
+++ b/metadata/md5-cache/sys-fs/libeatmydata-65
@@ -3,10 +3,10 @@ DEPEND=sys-apps/sed
 DESCRIPTION=LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP
 EAPI=4
 HOMEPAGE=https://launchpad.net/libeatmydata/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/libeatmydata/trunk/release-65/+download/libeatmydata-65.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=38f465e9c8a93b4fb745916134d28f9c
+_md5_=26d4c997a8b169cba4f631e4771f73cc
diff --git a/metadata/md5-cache/sys-fs/libeatmydata-82 b/metadata/md5-cache/sys-fs/libeatmydata-82
index f4ecbc5a87df..58c4dea3606d 100644
--- a/metadata/md5-cache/sys-fs/libeatmydata-82
+++ b/metadata/md5-cache/sys-fs/libeatmydata-82
@@ -3,10 +3,10 @@ DEPEND=sys-apps/sed
 DESCRIPTION=LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP
 EAPI=5
 HOMEPAGE=https://launchpad.net/libeatmydata/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/libeatmydata/trunk/libeatmydata-82/+download/libeatmydata-82.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1296bbbe84e4f84468b2b1811f391db1
+_md5_=f425565f832688da7133e97c81c04679
diff --git a/metadata/md5-cache/sys-fs/libeatmydata-82-r1 b/metadata/md5-cache/sys-fs/libeatmydata-82-r1
index 76ced617e679..60d1aeb4a34c 100644
--- a/metadata/md5-cache/sys-fs/libeatmydata-82-r1
+++ b/metadata/md5-cache/sys-fs/libeatmydata-82-r1
@@ -4,10 +4,10 @@ DESCRIPTION=LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP
 EAPI=5
 HOMEPAGE=https://launchpad.net/libeatmydata/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/libeatmydata/trunk/libeatmydata-82/+download/libeatmydata-82.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=98ca258d6084deb268f22bd3b142d1a4
+_md5_=d6b2e482d786257b492f6a205a5496b5
diff --git a/metadata/md5-cache/sys-fs/lufs-0.9.7-r3 b/metadata/md5-cache/sys-fs/lufs-0.9.7-r3
index f340dd6bfdbf..606314ff3f79 100644
--- a/metadata/md5-cache/sys-fs/lufs-0.9.7-r3
+++ b/metadata/md5-cache/sys-fs/lufs-0.9.7-r3
@@ -4,10 +4,10 @@ DESCRIPTION=User-mode filesystem implementation
 EAPI=0
 HOMEPAGE=https://sourceforge.net/projects/lufs/
 IUSE=debug
-KEYWORDS=x86 ppc ~amd64
+KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=sys-fs/lufis
 SLOT=0
 SRC_URI=mirror://sourceforge/lufs/lufs-0.9.7.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=be4c315c1a51b3ef53fdafcade4572fc
+_md5_=8a43fb3298a267ab86d399a0cc360fbf
diff --git a/metadata/md5-cache/sys-fs/zerofree-1.0.4 b/metadata/md5-cache/sys-fs/zerofree-1.0.4
index 19b4378db07a..ac0032e01b9b 100644
--- a/metadata/md5-cache/sys-fs/zerofree-1.0.4
+++ b/metadata/md5-cache/sys-fs/zerofree-1.0.4
@@ -3,10 +3,10 @@ DEPEND=sys-libs/e2fsprogs-libs
 DESCRIPTION=Zero's out all free space on a filesystem
 EAPI=4
 HOMEPAGE=http://frippery.org/uml/index.html
-KEYWORDS=~amd64 ~arm ~x86 ~mips
+KEYWORDS=~amd64 ~arm ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/e2fsprogs-libs
 SLOT=0
 SRC_URI=http://frippery.org/uml/zerofree-1.0.4.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=855e8fb65d187cfe00ca9575de5f8d22
+_md5_=87164a3d5748af7cdb939d4e86943aed
diff --git a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26 b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
index d3ac619229ac..56dcf60b38cb 100644
--- a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
+++ b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources for the Xbox Linux kernel
 EAPI=5
 HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
 IUSE=symlink build
-KEYWORDS=~x86 -*
+KEYWORDS=-* ~x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=2.6.16.26
 SRC_URI=mirror://kernel/linux/kernel/v2.6/patch-2.6.16.26.xz mirror://kernel/linux/kernel/v2.6/linux-2.6.16.tar.xz mirror://sourceforge/xbox-linux/linux-2.6.16-xbox.patch.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	12a17088d0306f0e3d3c97d58534409e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fa63226fe1bc8f52b3b2b1fa23047775
+_md5_=5668a47c58461eb3e14a3d6890f51dda
diff --git a/metadata/md5-cache/sys-power/nvram-reboot-2004.10.03 b/metadata/md5-cache/sys-power/nvram-reboot-2004.10.03
index cabf9cb512dc..1192f51b7005 100644
--- a/metadata/md5-cache/sys-power/nvram-reboot-2004.10.03
+++ b/metadata/md5-cache/sys-power/nvram-reboot-2004.10.03
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst postrm preinst prerm
 DESCRIPTION=PowerOff Boot-Images for nvram-wakeup (not needed for GRUB)
 EAPI=0
 HOMEPAGE=https://sourceforge.net/projects/nvram-wakeup/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/nvram-wakeup/reboot-2004.10.03.tar.bz2
 _eclasses_=mount-boot	1e82d96b7a7dcb483b412497a90bb646
-_md5_=a322e345fb86c0552d607ba3d49ae24b
+_md5_=a501556262716ac5269cdc3e883730eb
diff --git a/metadata/md5-cache/sys-power/uhubctl-1.8-r1 b/metadata/md5-cache/sys-power/uhubctl-1.8-r1
index 5fad6f1eee32..8639c083bf4b 100644
--- a/metadata/md5-cache/sys-power/uhubctl-1.8-r1
+++ b/metadata/md5-cache/sys-power/uhubctl-1.8-r1
@@ -3,9 +3,9 @@ DEPEND=virtual/libusb:1
 DESCRIPTION=USB hub per-port power control
 EAPI=6
 HOMEPAGE=https://github.com/mvp/uhubctl
-KEYWORDS=~amd64 ~x86 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://github.com/mvp/uhubctl/archive/v1.8.tar.gz -> uhubctl-1.8.tar.gz
-_md5_=4af4983f7fd93a6dc97032d73c3d73b7
+_md5_=197629a19a9d6548704f5a348e14b934
diff --git a/metadata/md5-cache/sys-process/daemontools-encore-1.10 b/metadata/md5-cache/sys-process/daemontools-encore-1.10
index ca3746446d4e..c74eb263f960 100644
--- a/metadata/md5-cache/sys-process/daemontools-encore-1.10
+++ b/metadata/md5-cache/sys-process/daemontools-encore-1.10
@@ -4,10 +4,10 @@ DESCRIPTION=Collection of tools for managing UNIX services
 EAPI=5
 HOMEPAGE=http://untroubled.org/daemontools-encore/
 IUSE=selinux static
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=selinux? ( sec-policy/selinux-daemontools ) !sys-process/daemontools !app-doc/daemontools-man
 SLOT=0
 SRC_URI=http://untroubled.org/daemontools-encore/daemontools-encore-1.10.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	e68863263b1e8611dacf381bec5c8b2b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ceafa097ddbd3f0959b70a195e32d604
+_md5_=5b363e8e7d6c03c5ab94bbbeb91e5e74
diff --git a/metadata/md5-cache/sys-process/pkill-darwin-1.0 b/metadata/md5-cache/sys-process/pkill-darwin-1.0
index 9aac3982ade6..3912b7d85b08 100644
--- a/metadata/md5-cache/sys-process/pkill-darwin-1.0
+++ b/metadata/md5-cache/sys-process/pkill-darwin-1.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst
 DESCRIPTION=pgrep(1) and pkill(1) for Darwin
 EAPI=6
 HOMEPAGE=https://sourceforge.net/p/pkilldarwin/code/ci/default/tree/
-KEYWORDS=~ppc-macos ~x86-macos ~x64-macos
+KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://www.gentoo.org/~grobian/distfiles/pkill-darwin-1.0.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=dead2bd4bcb9fd17727935a9306acc1e
+_md5_=0de99bccaf0faa14dc7d384e39d293a4
diff --git a/metadata/md5-cache/www-apache/mod_geoip2-1.2.7-r1 b/metadata/md5-cache/www-apache/mod_geoip2-1.2.7-r1
index 174b009e9b03..52b55a24ef75 100644
--- a/metadata/md5-cache/www-apache/mod_geoip2-1.2.7-r1
+++ b/metadata/md5-cache/www-apache/mod_geoip2-1.2.7-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/geoip-1.4.8 =www-servers/apache-2*
 DESCRIPTION=geoip module gets the country and city a request originated from
 EAPI=0
 HOMEPAGE=http://www.maxmind.com/app/mod_geoip
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Apache-1.1
 RDEPEND=>=dev-libs/geoip-1.4.8 =www-servers/apache-2*
 SLOT=0
 SRC_URI=http://geolite.maxmind.com/download/geoip/api/mod_geoip2/mod_geoip2_1.2.7.tar.gz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4e4434ab03fc33ee5a14312f337cf3d4
+_md5_=81d29ab5a9345224af10534a490c06f1
diff --git a/metadata/md5-cache/www-apps/drraw-2.0.1 b/metadata/md5-cache/www-apps/drraw-2.0.1
index 7e2279dbce8e..da9fb78ecdc9 100644
--- a/metadata/md5-cache/www-apps/drraw-2.0.1
+++ b/metadata/md5-cache/www-apps/drraw-2.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=drraw is a simple web based presentation front-end for RRDtool
 EAPI=0
 HOMEPAGE=http://web.taranis.org/drraw
 IUSE=vhosts
-KEYWORDS=~x86 ppc
+KEYWORDS=ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.6 dev-perl/CGI >=net-analyzer/rrdtool-1.0.47 >=app-admin/webapp-config-1.50.15
 SLOT=2.0.1
 SRC_URI=http://web.taranis.org/drraw/dist/drraw-2.0.1.tgz
 _eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=0f760283e522f67f6c46b8a362209014
+_md5_=ce7da3a5c2a2df974ae87b169e4ce11e
diff --git a/metadata/md5-cache/www-apps/metadot-6.1.6-r1 b/metadata/md5-cache/www-apps/metadot-6.1.6-r1
index 69a1b72aafa0..6c68f3935c8e 100644
--- a/metadata/md5-cache/www-apps/metadot-6.1.6-r1
+++ b/metadata/md5-cache/www-apps/metadot-6.1.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Metadot is a CMS with file, page and link management, and collaborat
 EAPI=0
 HOMEPAGE=http://www.metadot.com
 IUSE=vhosts
-KEYWORDS=~x86 ppc
+KEYWORDS=ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.005 >=www-apache/mod_perl-2.0 dev-perl/DBI dev-perl/DBD-mysql dev-perl/Apache-DBI dev-perl/XML-RSS virtual/perl-Storable dev-perl/perl-ldap dev-perl/Log-Agent dev-perl/Mail-POP3Client dev-perl/IO-stringy dev-perl/MailTools dev-perl/MIME-tools dev-perl/Unicode-String dev-perl/Spreadsheet-WriteExcel dev-perl/Date-Calc dev-perl/AppConfig dev-perl/Image-Size dev-perl/Template-Toolkit virtual/perl-Time-HiRes dev-perl/Lingua-EN-NameParse dev-perl/Number-Format dev-perl/XML-Simple dev-perl/Text-CSV_XS dev-perl/Archive-Zip dev-perl/Date-Manip >=app-admin/webapp-config-1.50.15
 SLOT=6.1.6-r1
 SRC_URI=http://download.metadot.com/metadot6.1.6.tar.gz
 _eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=e8647327087e76f3478dd089f77042e9
+_md5_=907b3a64e2ed37ea577311619bf1a5a6
diff --git a/metadata/md5-cache/www-apps/pcgi-2.0_alpha5 b/metadata/md5-cache/www-apps/pcgi-2.0_alpha5
index 9bf00e54c7d5..8477ff2e841f 100644
--- a/metadata/md5-cache/www-apps/pcgi-2.0_alpha5
+++ b/metadata/md5-cache/www-apps/pcgi-2.0_alpha5
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Jeff Bauer's Persistent CGI
 EAPI=0
 HOMEPAGE=http://starship.python.net/crew/jbauer/persistcgi/
-KEYWORDS=~x86 ~ppc
+KEYWORDS=~ppc ~x86
 LICENSE=ZPL
 RDEPEND=dev-lang/python
 SLOT=0
 SRC_URI=http://www.zope.org/Products/Zope/2.6.1/Zope-2.6.1-src.tgz mirror://gentoo/PCGI-HOWTO-1998-08-13.html.bz2
-_md5_=cbe49766cc66e0b9f5f7fb2d0cbf6b84
+_md5_=dd9f76957263018f3d3bc7f4d198b4cb
diff --git a/metadata/md5-cache/www-misc/wsmake-0.6.4-r1 b/metadata/md5-cache/www-misc/wsmake-0.6.4-r1
index 14c02ccd422a..4bbfb8314892 100644
--- a/metadata/md5-cache/www-misc/wsmake-0.6.4-r1
+++ b/metadata/md5-cache/www-misc/wsmake-0.6.4-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Website pre-processor features tag substitution and page ordering
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/wsmake/
 IUSE=examples
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ Artistic
 SLOT=0
 SRC_URI=mirror://sourceforge/wsmake/wsmake-0.6.4.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=8ce3f331385986a92f3e31db9e425370
+_md5_=88c1929fed15cad8a25ce280cf5baf76
diff --git a/metadata/md5-cache/x11-misc/quitcount-3.1.3 b/metadata/md5-cache/x11-misc/quitcount-3.1.3
index 57f7a8e401fc..69ca99d18210 100644
--- a/metadata/md5-cache/x11-misc/quitcount-3.1.3
+++ b/metadata/md5-cache/x11-misc/quitcount-3.1.3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:3 >=dev-libs/glib-2.6:2
 DESCRIPTION=A simple applet that shows what you saved since you quit smoking.
 EAPI=5
 HOMEPAGE=http://quitcount.sourceforge.net/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:3 >=dev-libs/glib-2.6:2
 SLOT=0
 SRC_URI=mirror://sourceforge/quitcount/3.1/quitcount-3.1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a9662294c0a2ea33d583a475eb338c68
+_md5_=7d1e1c78868b7e8c0cb77a5a7af60619
diff --git a/metadata/md5-cache/x11-misc/xhkeys-2.2.1 b/metadata/md5-cache/x11-misc/xhkeys-2.2.1
index 2919c66ed79b..f46177c6766e 100644
--- a/metadata/md5-cache/x11-misc/xhkeys-2.2.1
+++ b/metadata/md5-cache/x11-misc/xhkeys-2.2.1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-base/xorg-proto
 DESCRIPTION=assign particular actions to any key or key combination
 EAPI=6
 HOMEPAGE=http://wmalms.tripod.com/#XHKEYS
-KEYWORDS=x86 ppc
+KEYWORDS=ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt
 SLOT=0
 SRC_URI=mirror://gentoo/xhkeys-2.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=da146aa8d8d500c9df9317299987b578
+_md5_=5c5a81dabc0f7d8c575e580b68723e0a
diff --git a/metadata/md5-cache/x11-plugins/gkrellkam-2.0.0 b/metadata/md5-cache/x11-plugins/gkrellkam-2.0.0
index 57dc97e3b329..b40b111fca44 100644
--- a/metadata/md5-cache/x11-plugins/gkrellkam-2.0.0
+++ b/metadata/md5-cache/x11-plugins/gkrellkam-2.0.0
@@ -3,10 +3,10 @@ DEPEND=app-admin/gkrellm:2[X] net-misc/wget virtual/pkgconfig
 DESCRIPTION=an Image-Watcher-Plugin for GKrellM2
 EAPI=6
 HOMEPAGE=http://gkrellkam.sourceforge.net
-KEYWORDS=x86 ppc sparc alpha amd64
+KEYWORDS=alpha amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] net-misc/wget
 SLOT=0
 SRC_URI=mirror://sourceforge/gkrellkam/gkrellkam_2.0.0.tar.gz
 _eclasses_=gkrellm-plugin	c01023a3c28bc24f50c00ae019e8861e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=20baaafe1a3dd14944f9b85f1b49cd5d
+_md5_=a37620a9b87cc558541402edd8e2e5e6
diff --git a/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5 b/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5
index db82c70b1b4c..9269a708df65 100644
--- a/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5
+++ b/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5
@@ -3,10 +3,10 @@ DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
 DESCRIPTION=A Program-Launcher Plugin for GKrellM2
 EAPI=6
 HOMEPAGE=http://gkrellmlaunch.sourceforge.net/
-KEYWORDS=x86 ppc sparc alpha amd64
+KEYWORDS=alpha amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=2
 SRC_URI=mirror://sourceforge/gkrellmlaunch/gkrellmlaunch-0.5.tar.gz
 _eclasses_=gkrellm-plugin	c01023a3c28bc24f50c00ae019e8861e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=38d895f94175105c5a7dd2e07b26597e
+_md5_=166b9a5073fceae0c558348d219df5ff
diff --git a/metadata/md5-cache/x11-plugins/wmcdplay-1.0_beta1 b/metadata/md5-cache/x11-plugins/wmcdplay-1.0_beta1
index d9c21f738f7c..473a3baf3e0a 100644
--- a/metadata/md5-cache/x11-plugins/wmcdplay-1.0_beta1
+++ b/metadata/md5-cache/x11-plugins/wmcdplay-1.0_beta1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto x11-
 DESCRIPTION=CD player applet for WindowMaker
 EAPI=0
 HOMEPAGE=https://www.dockapps.net/wmcdplay
-KEYWORDS=x86 ~ppc
+KEYWORDS=~ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmcdplay-1.0-beta1.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=54eb63f81aa2ad66aee5c14a9431abee
+_md5_=c31ee3afabab9cde32840858a99580f3
diff --git a/metadata/md5-cache/x11-plugins/wmlongrun-0.3.1 b/metadata/md5-cache/x11-plugins/wmlongrun-0.3.1
index b7046e841a67..9a0489c96156 100644
--- a/metadata/md5-cache/x11-plugins/wmlongrun-0.3.1
+++ b/metadata/md5-cache/x11-plugins/wmlongrun-0.3.1
@@ -3,9 +3,9 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 DESCRIPTION=A dockapp to monitor LongRun on a Transmeta Crusoe processor
 EAPI=6
 HOMEPAGE=https://www.dockapps.net/wmlongrun
-KEYWORDS=~x86 -*
+KEYWORDS=-* ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmlongrun-0.3.1.tar.gz
-_md5_=3e43cdb2a37d90c2ab0310e748a7ac80
+_md5_=fd7942407204e9a251f1816e5f75d7db
diff --git a/metadata/md5-cache/x11-plugins/wmpinboard-1.0 b/metadata/md5-cache/x11-plugins/wmpinboard-1.0
index 639adbb7ed10..48aae185f865 100644
--- a/metadata/md5-cache/x11-plugins/wmpinboard-1.0
+++ b/metadata/md5-cache/x11-plugins/wmpinboard-1.0
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=Window Maker dock applet resembling a miniature pinboard
 EAPI=0
 HOMEPAGE=https://github.com/bbidulock/wmpinboard
-KEYWORDS=x86 sparc alpha amd64 ppc
+KEYWORDS=alpha amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://github.com/bbidulock/wmpinboard/releases/download/1.0/wmpinboard-1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b937a19a2939f1469fb208f75d1aab7c
+_md5_=bc0bfe22b18c349a8020e2dc2ba58519
diff --git a/metadata/md5-cache/x11-themes/skinenigmang-logos-20131008 b/metadata/md5-cache/x11-themes/skinenigmang-logos-20131008
index 44bc26100ed3..1187eb5bec76 100644
--- a/metadata/md5-cache/x11-themes/skinenigmang-logos-20131008
+++ b/metadata/md5-cache/x11-themes/skinenigmang-logos-20131008
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=VDR - Skin Plugin: enigma-ng logos
 EAPI=5
 HOMEPAGE=http://andreas.vdr-developer.org/enigmang/download.html http://creimer.net/channellogos/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-plugins/vdr-skinenigmang
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/skinenigmang-logos/enigma-logos-20131008.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8e5bd8ca8d246d6cb65e33745b20de1d
+_md5_=9fd3182cf3bb12e4baad612728b971f5
diff --git a/metadata/md5-cache/x11-themes/vdr-channel-logos-0.2 b/metadata/md5-cache/x11-themes/vdr-channel-logos-0.2
index 4ab89a2086a8..4cbda92bb163 100644
--- a/metadata/md5-cache/x11-themes/vdr-channel-logos-0.2
+++ b/metadata/md5-cache/x11-themes/vdr-channel-logos-0.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Logos for vdr-skin*
 EAPI=5
 HOMEPAGE=http://www.vdrskins.org/
-KEYWORDS=x86 amd64
+KEYWORDS=amd64 x86
 LICENSE=fairuse
 SLOT=0
 SRC_URI=http://www.vdrskins.org/vdrskins/albums/userpics/10138/logos-0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e86fec967066a9aecdf59ad3a9763630
+_md5_=8c65a8413ed223f6c8190dc782c55a5f
diff --git a/metadata/md5-cache/x11-themes/vdr-channel-logos-0.2-r1 b/metadata/md5-cache/x11-themes/vdr-channel-logos-0.2-r1
index d5e8a1ec8002..b43abd949f27 100644
--- a/metadata/md5-cache/x11-themes/vdr-channel-logos-0.2-r1
+++ b/metadata/md5-cache/x11-themes/vdr-channel-logos-0.2-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Logos for vdr-skin*
 EAPI=5
 HOMEPAGE=http://www.vdrskins.org/
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=fairuse
 RDEPEND=app-text/convmv
 SLOT=0
 SRC_URI=http://www.vdrskins.org/vdrskins/albums/userpics/10138/logos-0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b2d9d879834f150acecbd54abb64694
+_md5_=dced46a3bba30f48336a7bb08006b32a
diff --git a/metadata/md5-cache/x11-themes/xxv-skins-1.6.1-r1 b/metadata/md5-cache/x11-themes/xxv-skins-1.6.1-r1
index c7eb9f9d7e13..8d77728c10a3 100644
--- a/metadata/md5-cache/x11-themes/xxv-skins-1.6.1-r1
+++ b/metadata/md5-cache/x11-themes/xxv-skins-1.6.1-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Additional skins for XXV
 EAPI=5
 HOMEPAGE=http://projects.vdr-developer.org/projects/xxv
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=~www-misc/xxv-1.6.1
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/719/xxv-skins-1.6.1.tgz mirror://vdr-developerorg/720/xxv-jason-1.6.1.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e0557df8f278a01fb3a9a89027ee2d66
+_md5_=b529a6601d60140d2eeeb6ba0235f1da
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 40843c2dd60f..0f8e9020678f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 15 Jul 2019 14:27:26 +0000
+Mon, 15 Jul 2019 15:47:18 +0000
author	Repository mirror & CI <repomirrorci@gentoo.org>	2019-07-15 15:47:19 +0000
committer	Repository mirror & CI <repomirrorci@gentoo.org>	2019-07-15 15:47:19 +0000
commit	3b009ada42e26fc9a26e69cf59c77209c49d2536 (patch)
tree	08a122ee57c33aad12e337272f2ddc820d9bb474 /metadata
parent	Merge updates from master (diff)
download	gentoo-3b009ada42e26fc9a26e69cf59c77209c49d2536.tar.gz gentoo-3b009ada42e26fc9a26e69cf59c77209c49d2536.tar.bz2 gentoo-3b009ada42e26fc9a26e69cf59c77209c49d2536.zip