2017-01-29 14:42:50 UTC

author: Repository QA checks <repo-qa-checks@gentoo.org> 2017-01-29 14:42:51 +0000
committer: Repository QA checks <repo-qa-checks@gentoo.org> 2017-01-29 14:42:51 +0000
commit: 8a4cab10c7de87f54f97d59762af4e0a4e58e66e (patch)
tree: 469bbb2f09ca554b1401f43d9fe3e0fde36b2d85 /metadata/md5-cache
parent: Merge updates from master (diff)
download: gentoo-8a4cab10c7de87f54f97d59762af4e0a4e58e66e.tar.gz
gentoo-8a4cab10c7de87f54f97d59762af4e0a4e58e66e.tar.bz2
gentoo-8a4cab10c7de87f54f97d59762af4e0a4e58e66e.zip
177 files changed, 346 insertions, 346 deletions
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.25 b/metadata/md5-cache/app-admin/apache-tools-2.4.25
index babf25f7d6d6..a40f3ded331b 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.25
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.25
@@ -4,7 +4,7 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=libressl ssl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.5.0:1 dev-libs/apr-util:1 dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.25.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f933c1be0a9fc1c336ef522ff42e974d
+_md5_=892d48d1b2e24d464c19329ab617b203
diff --git a/metadata/md5-cache/app-admin/apg-2.3.0b-r5 b/metadata/md5-cache/app-admin/apg-2.3.0b-r5
index 80722ceb5344..c41645b69d00 100644
--- a/metadata/md5-cache/app-admin/apg-2.3.0b-r5
+++ b/metadata/md5-cache/app-admin/apg-2.3.0b-r5
@@ -4,11 +4,11 @@ DESCRIPTION=Another Password Generator
 EAPI=2
 HOMEPAGE=http://www.adel.nursat.kz/apg/
 IUSE=cracklib
-KEYWORDS=~alpha amd64 hppa ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=cracklib? ( sys-libs/cracklib )
 SLOT=0
 SRC_URI=http://www.adel.nursat.kz/apg/download/apg-2.3.0b.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=0bb57a6b998158615ef38f7d192fb1d4
+_md5_=66629b07ab99f84a3a59976f19baa6b9
diff --git a/metadata/md5-cache/app-admin/chrpath-0.13-r2 b/metadata/md5-cache/app-admin/chrpath-0.13-r2
index 738f99bb6e00..482cd0df4a4e 100644
--- a/metadata/md5-cache/app-admin/chrpath-0.13-r2
+++ b/metadata/md5-cache/app-admin/chrpath-0.13-r2
@@ -4,10 +4,10 @@ DESCRIPTION=chrpath can modify the rpath and runpath of ELF executables
 EAPI=2
 HOMEPAGE=http://directory.fsf.org/project/chrpath/
 IUSE=static-libs
-KEYWORDS=amd64 arm ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://ftp.tux.org/pub/X-Windows/ftp.hungry.com/chrpath/chrpath-0.13.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=802d3d2809541279f4bf06e90c27ed7f
+_md5_=526873c7f92feb3e01830fb7a46fc09c
diff --git a/metadata/md5-cache/app-admin/emacs-updater-1.15 b/metadata/md5-cache/app-admin/emacs-updater-1.15
index 91f9fb707733..67493c488601 100644
--- a/metadata/md5-cache/app-admin/emacs-updater-1.15
+++ b/metadata/md5-cache/app-admin/emacs-updater-1.15
@@ -3,10 +3,10 @@ DEPEND=|| ( sys-apps/util-linux app-misc/getopt )
 DESCRIPTION=Rebuild Emacs packages
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=|| ( sys-apps/util-linux app-misc/getopt ) >=app-portage/portage-utils-0.3 virtual/emacs
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-updater-1.15.tar.xz
 _eclass_exported_funcs=src_prepare:- src_install:-
-_md5_=110434ccc4a824953d51daa672f86925
+_md5_=fd5a7695cd6bc1800e6c5a169818ed19
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.5 b/metadata/md5-cache/app-admin/eselect-1.4.5
index 4d130964d7e1..98da520af506 100644
--- a/metadata/md5-cache/app-admin/eselect-1.4.5
+++ b/metadata/md5-cache/app-admin/eselect-1.4.5
@@ -4,7 +4,7 @@ DESCRIPTION=Gentoo's multi-purpose configuration and management tool
 EAPI=4
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
 IUSE=doc emacs vim-syntax
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )
 PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.5.tar.xz
 _eclass_exported_funcs=pkg_postinst:- src_compile:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1ef625145cd8b315b2ec09fa3b1bde98
+_md5_=be227bd6ed28a81d0813cf4dc9bd8424
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.7 b/metadata/md5-cache/app-admin/eselect-1.4.7
index 4253c6ee1eb9..5afa48e12108 100644
--- a/metadata/md5-cache/app-admin/eselect-1.4.7
+++ b/metadata/md5-cache/app-admin/eselect-1.4.7
@@ -4,7 +4,7 @@ DESCRIPTION=Gentoo's multi-purpose configuration and management tool
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
 IUSE=doc emacs vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )
 PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.7.tar.xz
 _eclass_exported_funcs=pkg_postinst:- src_compile:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=9847b8de8c38e93d6b6a22bc89b4939f
+_md5_=f83343dc005b6f1942bfb7da4983a5f0
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.8 b/metadata/md5-cache/app-admin/eselect-1.4.8
index b2ac3f76a6a9..8286d73f1c11 100644
--- a/metadata/md5-cache/app-admin/eselect-1.4.8
+++ b/metadata/md5-cache/app-admin/eselect-1.4.8
@@ -4,7 +4,7 @@ DESCRIPTION=Gentoo's multi-purpose configuration and management tool
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
 IUSE=doc emacs vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )
 PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.8.tar.xz
 _eclass_exported_funcs=pkg_postinst:- src_compile:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=9847b8de8c38e93d6b6a22bc89b4939f
+_md5_=f83343dc005b6f1942bfb7da4983a5f0
diff --git a/metadata/md5-cache/app-admin/gamin-0.1.10-r1 b/metadata/md5-cache/app-admin/gamin-0.1.10-r1
index 2b42a512f58a..2fc468e5581e 100644
--- a/metadata/md5-cache/app-admin/gamin-0.1.10-r1
+++ b/metadata/md5-cache/app-admin/gamin-0.1.10-r1
@@ -3,11 +3,11 @@ DESCRIPTION=Meta package providing the File Alteration Monitor API & Server
 EAPI=5
 HOMEPAGE=https://www.gnome.org/~veillard/gamin/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 PDEPEND=>=app-admin/gam-server-0.1.10
 RDEPEND=!app-admin/fam >=dev-libs/libgamin-0.1.10-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 _eclass_exported_funcs=-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=97cd2dd6ce6e858bd62f72c0f0a0edad
+_md5_=7fe3205198286a7b877d59d480f18bea
diff --git a/metadata/md5-cache/app-admin/gnome-system-log-3.9.90 b/metadata/md5-cache/app-admin/gnome-system-log-3.9.90
index 978c78fbaa49..f462af4bc247 100644
--- a/metadata/md5-cache/app-admin/gnome-system-log-3.9.90
+++ b/metadata/md5-cache/app-admin/gnome-system-log-3.9.90
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/glib-2.31:2 sys-libs/zlib:= >=x11-libs/gtk+-3.9.11:3 x11-libs/
 DESCRIPTION=System log viewer for GNOME
 EAPI=5
 HOMEPAGE=https://live.gnome.org/GnomeUtils
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.31:2 sys-libs/zlib:= >=x11-libs/gtk+-3.9.11:3 x11-libs/pango gnome-base/gsettings-desktop-schemas !<gnome-extra/gnome-utils-3.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-system-log/3.9/gnome-system-log-3.9.90.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_unpack:gnome2 src_prepare:gnome2 src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c4ea6f9f250b5355e9e948e7007dead0	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=532434e066b58b10816a5062713abb60
+_md5_=11975a8acf898ced888905c6a050e669
diff --git a/metadata/md5-cache/app-admin/localepurge-0.5.4-r2 b/metadata/md5-cache/app-admin/localepurge-0.5.4-r2
index 988dbfb24d40..8870002ae465 100644
--- a/metadata/md5-cache/app-admin/localepurge-0.5.4-r2
+++ b/metadata/md5-cache/app-admin/localepurge-0.5.4-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Script to recover diskspace on unneeded locale files & localized man pages
 EAPI=4
 HOMEPAGE=https://gentoo.org https://cgit.gentoo.org/proj/localepurge.git
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=app-shells/bash
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hwoarang/distfiles/localepurge-0.5.4.tbz2
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=0d1e0c4ce34b509de95d2dc9e9698ace
+_md5_=bca4c28b180069f42f3c571cee265e9f
diff --git a/metadata/md5-cache/app-admin/makepasswd-1.10 b/metadata/md5-cache/app-admin/makepasswd-1.10
index 7dab5ea2b263..81136c7ba723 100644
--- a/metadata/md5-cache/app-admin/makepasswd-1.10
+++ b/metadata/md5-cache/app-admin/makepasswd-1.10
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Random password generator
 EAPI=0
 HOMEPAGE=http://packages.debian.org/stable/admin/makepasswd
-KEYWORDS=alpha amd64 ~arm ia64 ppc s390 sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ia64 ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=mirror://debian/dists/potato/main/source/admin/makepasswd_1.10.orig.tar.gz
 _eclass_exported_funcs=src_install:-
-_md5_=885004623180dc904a742f61362e01f2
+_md5_=ec4b05f26228de37feef053465273b10
diff --git a/metadata/md5-cache/app-admin/passook-20121001 b/metadata/md5-cache/app-admin/passook-20121001
index f8af69912c47..4d901ddd5cbe 100644
--- a/metadata/md5-cache/app-admin/passook-20121001
+++ b/metadata/md5-cache/app-admin/passook-20121001
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Password generator capable of generating pronounceable and/or secure passwords
 EAPI=4
 HOMEPAGE=https://github.com/mackers/passook
-KEYWORDS=amd64 hppa ppc ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl sys-apps/miscfiles
 SLOT=0
 SRC_URI=mirror://gentoo/passook-20121001.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=027e856b729636ffe342fbe8d484825f
+_md5_=9686d5a308ca1ae932aa7876b763da89
diff --git a/metadata/md5-cache/app-admin/perl-cleaner-2.20 b/metadata/md5-cache/app-admin/perl-cleaner-2.20
index 5b8491234724..1f0a48d1a82d 100644
--- a/metadata/md5-cache/app-admin/perl-cleaner-2.20
+++ b/metadata/md5-cache/app-admin/perl-cleaner-2.20
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=User land tool for cleaning up old perl installs
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/perl/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore sys-apps/paludis )
 SLOT=0
 SRC_URI=mirror://gentoo/perl-cleaner-2.20.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.20.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=959e39f9812032bd496387d6f1e62fdf
+_md5_=bedb8d5fe671a42e77e8b4dc142d9dc7
diff --git a/metadata/md5-cache/app-admin/perl-cleaner-2.22 b/metadata/md5-cache/app-admin/perl-cleaner-2.22
index 9356151c98fa..0cb36c1d4842 100644
--- a/metadata/md5-cache/app-admin/perl-cleaner-2.22
+++ b/metadata/md5-cache/app-admin/perl-cleaner-2.22
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=User land tool for cleaning up old perl installs
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/proj/en/perl/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore sys-apps/paludis )
 SLOT=0
 SRC_URI=mirror://gentoo/perl-cleaner-2.22.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.22.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=prefix	99dcca42e6528d8fe3c214bf5731aaf2
-_md5_=c8dcb63690ad910022906d7b9f8db802
+_md5_=632728453c8ebdc9c407d73643d00e6f
diff --git a/metadata/md5-cache/app-admin/perl-cleaner-2.23 b/metadata/md5-cache/app-admin/perl-cleaner-2.23
index d4277e3c9428..ac11a98de654 100644
--- a/metadata/md5-cache/app-admin/perl-cleaner-2.23
+++ b/metadata/md5-cache/app-admin/perl-cleaner-2.23
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=User land tool for cleaning up old perl installs
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/proj/en/perl/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore sys-apps/paludis )
 SLOT=0
 SRC_URI=mirror://gentoo/perl-cleaner-2.23.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.23.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=prefix	99dcca42e6528d8fe3c214bf5731aaf2
-_md5_=c8dcb63690ad910022906d7b9f8db802
+_md5_=632728453c8ebdc9c407d73643d00e6f
diff --git a/metadata/md5-cache/app-admin/perl-cleaner-9999 b/metadata/md5-cache/app-admin/perl-cleaner-9999
index 5d8c7d06f7d9..55d49c01cdbf 100644
--- a/metadata/md5-cache/app-admin/perl-cleaner-9999
+++ b/metadata/md5-cache/app-admin/perl-cleaner-9999
@@ -8,4 +8,4 @@ RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portag
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	git-r3	6efc2d7de07a77bf72c7207b48d0e123	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=c8dcb63690ad910022906d7b9f8db802
+_md5_=632728453c8ebdc9c407d73643d00e6f
diff --git a/metadata/md5-cache/app-admin/pwgen-2.07 b/metadata/md5-cache/app-admin/pwgen-2.07
index ff22c672b506..bfcfb70e0b9c 100644
--- a/metadata/md5-cache/app-admin/pwgen-2.07
+++ b/metadata/md5-cache/app-admin/pwgen-2.07
@@ -3,10 +3,10 @@ DESCRIPTION=Password Generator
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/pwgen/
 IUSE=livecd
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/pwgen/pwgen-2.07.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=893449aff62dffa076af4074dc08c3c5
+_md5_=bc8b5c6ee134fd6efc9fdba5ac1b0fde
diff --git a/metadata/md5-cache/app-admin/python-updater-0.13 b/metadata/md5-cache/app-admin/python-updater-0.13
index cb176cd41176..b738740c4220 100644
--- a/metadata/md5-cache/app-admin/python-updater-0.13
+++ b/metadata/md5-cache/app-admin/python-updater-0.13
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile
 DESCRIPTION=Script used to reinstall Python packages after changing active Python versions
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/Python/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions || ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 sys-apps/pkgcore )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/python-updater-0.13.tar.bz2
 _eclass_exported_funcs=src_compile:-
-_md5_=b6dd9ac92dc2f8b393100690ecfe0d06
+_md5_=7cc2c2355f2aface6ff468370d39b365
diff --git a/metadata/md5-cache/app-admin/python-updater-0.14 b/metadata/md5-cache/app-admin/python-updater-0.14
index d14070c553b6..59fb5ef5b6c6 100644
--- a/metadata/md5-cache/app-admin/python-updater-0.14
+++ b/metadata/md5-cache/app-admin/python-updater-0.14
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile
 DESCRIPTION=Script used to reinstall Python packages after changing active Python versions
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/Python/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions || ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 sys-apps/pkgcore )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/python-updater-0.14.tar.bz2
 _eclass_exported_funcs=src_compile:-
-_md5_=5958e5763f1471f9dd3c31064fd35f81
+_md5_=f9714a12e68f0bbf3634420af26a6382
diff --git a/metadata/md5-cache/app-admin/stow-2.2.2-r1 b/metadata/md5-cache/app-admin/stow-2.2.2-r1
index ba0edd47797a..d510ac2dbfc7 100644
--- a/metadata/md5-cache/app-admin/stow-2.2.2-r1
+++ b/metadata/md5-cache/app-admin/stow-2.2.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=GNU Stow is a symlink farm manager
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/stow/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://gnu/stow/stow-2.2.2.tar.gz
 _eclass_exported_funcs=src_configure:-
 _eclasses_=perl-functions	aac50de73be0a80ebe780e0b20850130
-_md5_=3182c1074eb907d930ccc6686197dfd8
+_md5_=4941129067803737595c0f7169510858
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.18_p1 b/metadata/md5-cache/app-admin/sudo-1.8.18_p1
index 731e9d9dbd4d..be92d1f17fc5 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.18_p1
+++ b/metadata/md5-cache/app-admin/sudo-1.8.18_p1
@@ -4,7 +4,7 @@ DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=6
 HOMEPAGE=http://www.sudo.ws/
 IUSE=ldap nls pam offensive selinux skey +sendmail
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris
 LICENSE=ISC BSD
 RDEPEND=pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://www.sudo.ws/sudo/dist/sudo-1.8.18p1.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.18p1.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f2910304f68001f8c14191efc53d3838
+_md5_=4e1c989869f09715e240e18e2dec21b8
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.19_p2 b/metadata/md5-cache/app-admin/sudo-1.8.19_p2
index 89f8ce0281bd..c0cba89836a6 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.19_p2
+++ b/metadata/md5-cache/app-admin/sudo-1.8.19_p2
@@ -4,7 +4,7 @@ DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=6
 HOMEPAGE=http://www.sudo.ws/
 IUSE=ldap nls pam offensive selinux skey +sendmail
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris
 LICENSE=ISC BSD
 RDEPEND=pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://www.sudo.ws/sudo/dist/sudo-1.8.19p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.19p2.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=915d5bc3bb8a88fa7132653f4058beea
+_md5_=d72c14c39874f046275f26ce78464775
diff --git a/metadata/md5-cache/app-admin/sudo-9999 b/metadata/md5-cache/app-admin/sudo-9999
index 992acb59ca1a..c632d1e47f95 100644
--- a/metadata/md5-cache/app-admin/sudo-9999
+++ b/metadata/md5-cache/app-admin/sudo-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=pam? ( !skey ) skey? ( !pam )
 SLOT=0
 _eclass_exported_funcs=pkg_postinst:- src_unpack:mercurial src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	mercurial	66da6d1ccacd123e28d2c64821052a9a	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=80f8349d24a6040b9d52c5471f672951
+_md5_=5cab98eeca7803957089f85feb452b09
diff --git a/metadata/md5-cache/app-arch/arc-5.21p b/metadata/md5-cache/app-arch/arc-5.21p
index 3ba39c52e2cc..b3840509b637 100644
--- a/metadata/md5-cache/app-arch/arc-5.21p
+++ b/metadata/md5-cache/app-arch/arc-5.21p
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Create & extract files from DOS .ARC files
 EAPI=2
 HOMEPAGE=http://arc.sourceforge.net
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/arc/arc-5.21p.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=a10e181196b208b0f955bf1fa90c268e
+_md5_=b60fe39454004bc7b84933d5a97b8817
diff --git a/metadata/md5-cache/app-arch/arj-3.10.22-r5 b/metadata/md5-cache/app-arch/arj-3.10.22-r5
index 5f56bda7cf5c..c92e6a9cd3ab 100644
--- a/metadata/md5-cache/app-arch/arj-3.10.22-r5
+++ b/metadata/md5-cache/app-arch/arj-3.10.22-r5
@@ -3,10 +3,10 @@ DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=s
 DESCRIPTION=Utility for opening arj archives
 EAPI=5
 HOMEPAGE=http://arj.sourceforge.net
-KEYWORDS=amd64 ~arm ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/arj/arj_3.10.22.orig.tar.gz mirror://debian/pool/main/a/arj/arj_3.10.22-13.debian.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=4c50988c98c51b2e51f0def6e002bd49
+_md5_=859a710fe3f90f0a62a822c0440df0d6
diff --git a/metadata/md5-cache/app-arch/arj-3.10.22-r7 b/metadata/md5-cache/app-arch/arj-3.10.22-r7
index 7a1bd3312881..4ca8181e551f 100644
--- a/metadata/md5-cache/app-arch/arj-3.10.22-r7
+++ b/metadata/md5-cache/app-arch/arj-3.10.22-r7
@@ -3,10 +3,10 @@ DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=s
 DESCRIPTION=Utility for opening arj archives
 EAPI=6
 HOMEPAGE=http://arj.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/arj/arj_3.10.22.orig.tar.gz mirror://debian/pool/main/a/arj/arj_3.10.22-15.debian.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=3580600d9b8f688cf544e499e7a639fe
+_md5_=716092e2dce2c751044fcf7a213026ca
diff --git a/metadata/md5-cache/app-arch/bsdsfv-1.18-r1 b/metadata/md5-cache/app-arch/bsdsfv-1.18-r1
index 7e4b0396fdbb..f4e1a7018669 100644
--- a/metadata/md5-cache/app-arch/bsdsfv-1.18-r1
+++ b/metadata/md5-cache/app-arch/bsdsfv-1.18-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=all-in-one SFV checksum utility
 EAPI=3
 HOMEPAGE=http://bsdsfv.sourceforge.net/
-KEYWORDS=amd64 arm ~hppa m68k ppc s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 arm ~hppa m68k ppc s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/bsdsfv/bsdsfv-1.18.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=a0f1df0bb8d4f07b1743f14ac25ef903
+_md5_=f4f3b7a8e9165b319d6b8c3a5bd69f65
diff --git a/metadata/md5-cache/app-arch/cabextract-1.6 b/metadata/md5-cache/app-arch/cabextract-1.6
index 9aade5133b54..473e70b84609 100644
--- a/metadata/md5-cache/app-arch/cabextract-1.6
+++ b/metadata/md5-cache/app-arch/cabextract-1.6
@@ -3,11 +3,11 @@ DESCRIPTION=Extracts files from Microsoft cabinet archive files
 EAPI=5
 HOMEPAGE=http://www.cabextract.org.uk/
 IUSE=extras
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=extras? ( dev-lang/perl )
 SLOT=0
 SRC_URI=http://www.cabextract.org.uk/cabextract-1.6.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=fac9cfa56b7b93810ad18d155e1fbdf3
+_md5_=99dfd2adaec794f1b465d5cda9480d13
diff --git a/metadata/md5-cache/app-arch/cfv-1.18.3-r1 b/metadata/md5-cache/app-arch/cfv-1.18.3-r1
index 79d5f9c95018..1b5048f8fa07 100644
--- a/metadata/md5-cache/app-arch/cfv-1.18.3-r1
+++ b/metadata/md5-cache/app-arch/cfv-1.18.3-r1
@@ -3,7 +3,7 @@ DESCRIPTION=Utility to test and create .sfv, .csv, .crc and md5sum files
 EAPI=5
 HOMEPAGE=http://cfv.sourceforge.net/
 IUSE=bittorrent python_targets_python2_7
-KEYWORDS=amd64 hppa ~ppc ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 hppa ~ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/python-fchksum[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] bittorrent? ( || ( net-p2p/bittorrent[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-p2p/bittornado[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) )
 REQUIRED_USE=python_targets_python2_7
@@ -11,4 +11,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/cfv/cfv-1.18.3.tar.gz
 _eclass_exported_funcs=pkg_setup:python-single-r1 src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=31ba45fd1ef61dbbe89600b99c34fe58
+_md5_=5e1023dd57b66b07dd8d20e88a8266da
diff --git a/metadata/md5-cache/app-arch/cksfv-1.3.14 b/metadata/md5-cache/app-arch/cksfv-1.3.14
index 0fab337f776c..57183a6929ed 100644
--- a/metadata/md5-cache/app-arch/cksfv-1.3.14
+++ b/metadata/md5-cache/app-arch/cksfv-1.3.14
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=SFV checksum utility (simple file verification)
 EAPI=4
 HOMEPAGE=http://zakalwe.fi/~shd/foss/cksfv/
-KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://zakalwe.fi/~shd/foss/cksfv/files/cksfv-1.3.14.tar.bz2
 _eclass_exported_funcs=src_configure:- src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=b0a3e1ccb5a9489859db2c4b934b9492
+_md5_=861887d7e17e2276d23bffe85207cb2d
diff --git a/metadata/md5-cache/app-arch/cpio-2.11-r3 b/metadata/md5-cache/app-arch/cpio-2.11-r3
index 4869142baac8..79932365756e 100644
--- a/metadata/md5-cache/app-arch/cpio-2.11-r3
+++ b/metadata/md5-cache/app-arch/cpio-2.11-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A file archival tool which can also read and write tar files
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/cpio/cpio.html
 IUSE=nls
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/cpio/cpio-2.11.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=6ca3c2c44e7f53957995a9dc28963f15
+_md5_=22eb8b7ad16972632073c75924594073
diff --git a/metadata/md5-cache/app-arch/cpio-2.12 b/metadata/md5-cache/app-arch/cpio-2.12
index 2f94d5fa8a30..6130a3f4060c 100644
--- a/metadata/md5-cache/app-arch/cpio-2.12
+++ b/metadata/md5-cache/app-arch/cpio-2.12
@@ -3,10 +3,10 @@ DESCRIPTION=A file archival tool which can also read and write tar files
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/cpio/cpio.html
 IUSE=nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/cpio/cpio-2.12.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=868a7c33d6599a73e3efd1707735fac1
+_md5_=03a9c8e4bc611c95fdecc8a4f4ed2390
diff --git a/metadata/md5-cache/app-arch/cpio-2.12-r1 b/metadata/md5-cache/app-arch/cpio-2.12-r1
index f34bf2f290b6..ea5241b49b9a 100644
--- a/metadata/md5-cache/app-arch/cpio-2.12-r1
+++ b/metadata/md5-cache/app-arch/cpio-2.12-r1
@@ -3,10 +3,10 @@ DESCRIPTION=A file archival tool which can also read and write tar files
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/cpio/cpio.html
 IUSE=nls
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/cpio/cpio-2.12.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f6a9334ea5671ae2efbde69d30cb8fee
+_md5_=9948298ff1f124d14fcc297659a244bb
diff --git a/metadata/md5-cache/app-arch/deb2targz-1-r2 b/metadata/md5-cache/app-arch/deb2targz-1-r2
index 11f26af9bc8e..d222e074e780 100644
--- a/metadata/md5-cache/app-arch/deb2targz-1-r2
+++ b/metadata/md5-cache/app-arch/deb2targz-1-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare unpack
 DESCRIPTION=Convert a .deb file to a .tar.gz archive
 EAPI=4
 HOMEPAGE=http://www.miketaylor.org.uk/tech/deb/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~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
 _eclass_exported_funcs=src_unpack:- src_prepare:base src_configure:base src_compile:base src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=0132768e021fe523e849418254ed2cd8
+_md5_=c08c086d05200e7434122e034f3349f9
diff --git a/metadata/md5-cache/app-arch/dpkg-1.17.26 b/metadata/md5-cache/app-arch/dpkg-1.17.26
index dc869a9dab84..17cdb3a30a08 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.17.26
+++ b/metadata/md5-cache/app-arch/dpkg-1.17.26
@@ -4,11 +4,11 @@ DESCRIPTION=Package maintenance system for Debian
 EAPI=5
 HOMEPAGE=http://packages.qa.debian.org/dpkg
 IUSE=+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.6.0:= dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.17.26.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=b7aea74d7d12fe0e0a4460ad4b320a7a
+_md5_=df6d4951076429a98643a3c73ad3a280
diff --git a/metadata/md5-cache/app-arch/dpkg-1.17.27 b/metadata/md5-cache/app-arch/dpkg-1.17.27
index 46ade20ad09f..370668fdea76 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.17.27
+++ b/metadata/md5-cache/app-arch/dpkg-1.17.27
@@ -4,11 +4,11 @@ DESCRIPTION=Package maintenance system for Debian
 EAPI=5
 HOMEPAGE=http://packages.qa.debian.org/dpkg
 IUSE=+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.6.0:= dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.17.27.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=3e1bb5c5cdd00f8c540ec6a273529ca2
+_md5_=019bb3c821590f0952b2c01e66439d4a
diff --git a/metadata/md5-cache/app-arch/dpkg-1.18.15 b/metadata/md5-cache/app-arch/dpkg-1.18.15
index 2334d48ec43b..67d60b973535 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.18.15
+++ b/metadata/md5-cache/app-arch/dpkg-1.18.15
@@ -4,11 +4,11 @@ DESCRIPTION=Package maintenance system for Debian
 EAPI=6
 HOMEPAGE=http://packages.qa.debian.org/dpkg
 IUSE=+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.18.15.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=5d070095bcffec75d76f2d5db6d58cf0
+_md5_=828b25214adbe34465b9c2f11f46d49c
diff --git a/metadata/md5-cache/app-arch/dpkg-1.18.18 b/metadata/md5-cache/app-arch/dpkg-1.18.18
index e18a03027443..bf5c9c8d8427 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.18.18
+++ b/metadata/md5-cache/app-arch/dpkg-1.18.18
@@ -4,11 +4,11 @@ DESCRIPTION=Package maintenance system for Debian
 EAPI=6
 HOMEPAGE=http://packages.qa.debian.org/dpkg
 IUSE=+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.18.18.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=5d070095bcffec75d76f2d5db6d58cf0
+_md5_=828b25214adbe34465b9c2f11f46d49c
diff --git a/metadata/md5-cache/app-arch/file-roller-3.20.3 b/metadata/md5-cache/app-arch/file-roller-3.20.3
index 2852b8d36681..4f170f0a77e3 100644
--- a/metadata/md5-cache/app-arch/file-roller-3.20.3
+++ b/metadata/md5-cache/app-arch/file-roller-3.20.3
@@ -4,11 +4,11 @@ DESCRIPTION=Archive manager for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/FileRoller
 IUSE=nautilus packagekit
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 >=x11-libs/libnotify-0.4.3:= sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango nautilus? ( >=gnome-base/nautilus-3 ) packagekit? ( app-admin/packagekit-base )
 SLOT=0
 SRC_URI=mirror://gnome/sources/file-roller/3.20/file-roller-3.20.3.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:- src_prepare:- src_configure:- src_compile:gnome2 src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c4ea6f9f250b5355e9e948e7007dead0	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=583c1437782ed38c93799fcef4e539a1
+_md5_=379ede9ccf960e480330250cd13d7a9e
diff --git a/metadata/md5-cache/app-arch/file-roller-3.20.4 b/metadata/md5-cache/app-arch/file-roller-3.20.4
index 5c79bf897932..ec60d017e8ce 100644
--- a/metadata/md5-cache/app-arch/file-roller-3.20.4
+++ b/metadata/md5-cache/app-arch/file-roller-3.20.4
@@ -4,11 +4,11 @@ DESCRIPTION=Archive manager for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/FileRoller
 IUSE=nautilus packagekit
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 >=x11-libs/libnotify-0.4.3:= sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango nautilus? ( >=gnome-base/nautilus-3 ) packagekit? ( app-admin/packagekit-base )
 SLOT=0
 SRC_URI=mirror://gnome/sources/file-roller/3.20/file-roller-3.20.4.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:- src_prepare:- src_configure:- src_compile:gnome2 src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c4ea6f9f250b5355e9e948e7007dead0	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=583c1437782ed38c93799fcef4e539a1
+_md5_=379ede9ccf960e480330250cd13d7a9e
diff --git a/metadata/md5-cache/app-arch/file-roller-3.22.1 b/metadata/md5-cache/app-arch/file-roller-3.22.1
index 420e9fe17385..1b175485429e 100644
--- a/metadata/md5-cache/app-arch/file-roller-3.22.1
+++ b/metadata/md5-cache/app-arch/file-roller-3.22.1
@@ -4,11 +4,11 @@ DESCRIPTION=Archive manager for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/FileRoller
 IUSE=libnotify packagekit
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) packagekit? ( app-admin/packagekit-base )
 SLOT=0
 SRC_URI=mirror://gnome/sources/file-roller/3.22/file-roller-3.22.1.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:- src_prepare:- src_configure:- src_compile:gnome2 src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c4ea6f9f250b5355e9e948e7007dead0	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=43cd5fc962171fbaabdc6eaaf3fb0632
+_md5_=e5d20c97b5417b4b235b05d4abbbb942
diff --git a/metadata/md5-cache/app-arch/file-roller-3.22.2 b/metadata/md5-cache/app-arch/file-roller-3.22.2
index f71d525619e5..32b681c86889 100644
--- a/metadata/md5-cache/app-arch/file-roller-3.22.2
+++ b/metadata/md5-cache/app-arch/file-roller-3.22.2
@@ -4,11 +4,11 @@ DESCRIPTION=Archive manager for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/FileRoller
 IUSE=libnotify packagekit
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) packagekit? ( app-admin/packagekit-base )
 SLOT=0
 SRC_URI=mirror://gnome/sources/file-roller/3.22/file-roller-3.22.2.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:- src_prepare:- src_configure:- src_compile:gnome2 src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c4ea6f9f250b5355e9e948e7007dead0	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=43cd5fc962171fbaabdc6eaaf3fb0632
+_md5_=e5d20c97b5417b4b235b05d4abbbb942
diff --git a/metadata/md5-cache/app-arch/gzip-1.6 b/metadata/md5-cache/app-arch/gzip-1.6
index 378e3370dbb0..5639bcc78e9f 100644
--- a/metadata/md5-cache/app-arch/gzip-1.6
+++ b/metadata/md5-cache/app-arch/gzip-1.6
@@ -3,10 +3,10 @@ DESCRIPTION=Standard GNU compressor
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/gzip/
 IUSE=pic static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu-alpha/gzip/gzip-1.6.tar.xz mirror://gnu/gzip/gzip-1.6.tar.xz mirror://gentoo/gzip-1.6.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=797e95a3176f77c5e6c2357c578316ef
+_md5_=1b1c02967d4019a6988f74723b39d3d0
diff --git a/metadata/md5-cache/app-arch/gzip-1.7 b/metadata/md5-cache/app-arch/gzip-1.7
index 95cc06441cc4..8d2d8cf60928 100644
--- a/metadata/md5-cache/app-arch/gzip-1.7
+++ b/metadata/md5-cache/app-arch/gzip-1.7
@@ -3,10 +3,10 @@ DESCRIPTION=Standard GNU compressor
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gzip/
 IUSE=pic static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu-alpha/gzip/gzip-1.7.tar.xz mirror://gnu/gzip/gzip-1.7.tar.xz mirror://gentoo/gzip-1.7.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=32d3b7fc2cb007b2731b676cca620c07
+_md5_=3df9d382fc63c711e6ea9988dda260ae
diff --git a/metadata/md5-cache/app-arch/gzip-1.8 b/metadata/md5-cache/app-arch/gzip-1.8
index 0dff3e6a23b2..c6de8ac0734a 100644
--- a/metadata/md5-cache/app-arch/gzip-1.8
+++ b/metadata/md5-cache/app-arch/gzip-1.8
@@ -3,10 +3,10 @@ DESCRIPTION=Standard GNU compressor
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gzip/
 IUSE=pic static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gzip/gzip-1.8.tar.xz mirror://gnu-alpha/gzip/gzip-1.8.tar.xz mirror://gentoo/gzip-1.8.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=10fd7a14fff2ff9bb4de6715a6e1fb37
+_md5_=d5281b556aa3e6117a1e4660e06ed9f9
diff --git a/metadata/md5-cache/app-arch/lha-114i-r7 b/metadata/md5-cache/app-arch/lha-114i-r7
index 102113c2f5d3..81cd2c44c823 100644
--- a/metadata/md5-cache/app-arch/lha-114i-r7
+++ b/metadata/md5-cache/app-arch/lha-114i-r7
@@ -3,10 +3,10 @@ DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=s
 DESCRIPTION=Utility for creating and opening lzh archives
 EAPI=4
 HOMEPAGE=http://lha.sourceforge.jp
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint
 LICENSE=lha
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/lha/22231/lha-1.14i-ac20050924p1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=2c8033199085110a34f3099bc0367df7
+_md5_=7b8deb60e69227b7de4aac41253185ee
diff --git a/metadata/md5-cache/app-arch/lha-114i-r8 b/metadata/md5-cache/app-arch/lha-114i-r8
index f86732de74f8..4553ebbd44df 100644
--- a/metadata/md5-cache/app-arch/lha-114i-r8
+++ b/metadata/md5-cache/app-arch/lha-114i-r8
@@ -3,10 +3,10 @@ DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=s
 DESCRIPTION=Utility for creating and opening lzh archives
 EAPI=5
 HOMEPAGE=http://lha.sourceforge.jp
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint
 LICENSE=lha
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/lha/22231/lha-1.14i-ac20050924p1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f66010d40bd839bfcc3892b645445b65
+_md5_=8dada08ebfe763fea6a5dcd0e77441e3
diff --git a/metadata/md5-cache/app-arch/libarchive-3.2.2 b/metadata/md5-cache/app-arch/libarchive-3.2.2
index 87cb2a922476..a3a81ec9f42d 100644
--- a/metadata/md5-cache/app-arch/libarchive-3.2.2
+++ b/metadata/md5-cache/app-arch/libarchive-3.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=BSD tar command
 EAPI=6
 HOMEPAGE=http://www.libarchive.org/
 IUSE=acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2 BSD-4 public-domain
 RDEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[threads=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/13
 SRC_URI=http://www.libarchive.org/downloads/libarchive-3.2.2.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=dbf6bce1a29e72d8bb028e909ef0cf12
+_md5_=6a18bf50c32e0f5cddb60c939f98e31e
diff --git a/metadata/md5-cache/app-arch/mscompress-0.3-r1 b/metadata/md5-cache/app-arch/mscompress-0.3-r1
index 92df25753d4c..46dd30aff302 100644
--- a/metadata/md5-cache/app-arch/mscompress-0.3-r1
+++ b/metadata/md5-cache/app-arch/mscompress-0.3-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=Microsoft compress.exe/expand.exe compatible (de)compressor
 EAPI=5
 HOMEPAGE=http://gnuwin32.sourceforge.net/packages/mscompress.htm
-KEYWORDS=amd64 hppa ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.penguin.cz/pub/users/mhi/mscompress/mscompress-0.3.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=5d16fe6f839103946ead5e4d6b1d616c
+_md5_=0c8e8d9116225ce28738890380e2d329
diff --git a/metadata/md5-cache/app-arch/ncompress-4.2.4.4 b/metadata/md5-cache/app-arch/ncompress-4.2.4.4
index bce1a4529818..6c4383381e26 100644
--- a/metadata/md5-cache/app-arch/ncompress-4.2.4.4
+++ b/metadata/md5-cache/app-arch/ncompress-4.2.4.4
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Another uncompressor for compatibility
 EAPI=4
 HOMEPAGE=https://github.com/vapier/ncompress
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/ncompress/ncompress-4.2.4.4.tar.gz
 _eclass_exported_funcs=src_compile:- src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ccf2ca1cd689f7de76b0217ae1b9eb63
+_md5_=83cb890885a67d4369bc1f6ba5686ae4
diff --git a/metadata/md5-cache/app-arch/p7zip-16.02-r1 b/metadata/md5-cache/app-arch/p7zip-16.02-r1
index 691258b20152..315dec6052a7 100644
--- a/metadata/md5-cache/app-arch/p7zip-16.02-r1
+++ b/metadata/md5-cache/app-arch/p7zip-16.02-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Port of 7-Zip archiver for Unix
 EAPI=6
 HOMEPAGE=http://p7zip.sourceforge.net/
 IUSE=abi_x86_x32 doc kde +pch rar static wxwidgets
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=LGPL-2.1 rar? ( unRAR )
 RDEPEND=wxwidgets? ( x11-libs/wxGTK:3.0[X] )
 REQUIRED_USE=kde? ( wxwidgets )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/p7zip/p7zip_16.02_src_all.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_compile:- src_test:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
-_md5_=ea44a27aa3e81bf73c7c445f621b91fa
+_md5_=3052de94c2c7bb86a04ae323228eb39d
diff --git a/metadata/md5-cache/app-arch/par-1.1 b/metadata/md5-cache/app-arch/par-1.1
index fb24377bcffa..132db4571710 100644
--- a/metadata/md5-cache/app-arch/par-1.1
+++ b/metadata/md5-cache/app-arch/par-1.1
@@ -3,11 +3,11 @@ DEPEND=!app-text/par !dev-util/par
 DESCRIPTION=Parchive archive fixing tool
 EAPI=2
 HOMEPAGE=http://parchive.sourceforge.net/
-KEYWORDS=amd64 ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=!app-text/par !dev-util/par
 SLOT=0
 SRC_URI=mirror://sourceforge/parchive/par-v1.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1af0dcbda479b560d0e616587c789b1f
+_md5_=6cc59a0aca713b9bf9a10521b9ce6298
diff --git a/metadata/md5-cache/app-arch/par2cmdline-0.6.11 b/metadata/md5-cache/app-arch/par2cmdline-0.6.11
index d75099451993..60d7b0d3f851 100644
--- a/metadata/md5-cache/app-arch/par2cmdline-0.6.11
+++ b/metadata/md5-cache/app-arch/par2cmdline-0.6.11
@@ -3,10 +3,10 @@ DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=s
 DESCRIPTION=A PAR-2.0 file verification and repair tool
 EAPI=5
 HOMEPAGE=https://github.com/BlackIkeEagle/par2cmdline
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/BlackIkeEagle/par2cmdline/archive/v0.6.11.tar.gz -> par2cmdline-0.6.11.tar.gz
 _eclass_exported_funcs=src_prepare:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=96c85ceaf02fc3288e6730034c6ca715
+_md5_=871e449a15b523ee45e2bc2a8b89f94c
diff --git a/metadata/md5-cache/app-arch/par2cmdline-0.6.12 b/metadata/md5-cache/app-arch/par2cmdline-0.6.12
index d289a4838260..68a0fa7c4164 100644
--- a/metadata/md5-cache/app-arch/par2cmdline-0.6.12
+++ b/metadata/md5-cache/app-arch/par2cmdline-0.6.12
@@ -3,10 +3,10 @@ DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=s
 DESCRIPTION=A PAR-2.0 file verification and repair tool
 EAPI=5
 HOMEPAGE=https://github.com/BlackIkeEagle/par2cmdline
-KEYWORDS=amd64 ~hppa ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/BlackIkeEagle/par2cmdline/archive/v0.6.12.tar.gz -> par2cmdline-0.6.12.tar.gz
 _eclass_exported_funcs=src_prepare:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=db33950766275529285931f602e174d7
+_md5_=01f7d5171ea2ffe483b53eccef10dc7a
diff --git a/metadata/md5-cache/app-arch/par2cmdline-0.6.13 b/metadata/md5-cache/app-arch/par2cmdline-0.6.13
index 81a4e25adca0..d21694e1ad97 100644
--- a/metadata/md5-cache/app-arch/par2cmdline-0.6.13
+++ b/metadata/md5-cache/app-arch/par2cmdline-0.6.13
@@ -3,10 +3,10 @@ DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=s
 DESCRIPTION=A PAR-2.0 file verification and repair tool
 EAPI=5
 HOMEPAGE=https://github.com/BlackIkeEagle/par2cmdline
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/BlackIkeEagle/par2cmdline/archive/v0.6.13.tar.gz -> par2cmdline-0.6.13.tar.gz
 _eclass_exported_funcs=src_prepare:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=adadf4579739a1d91b68173f3cf90347
+_md5_=ffde86e8ca74863c54fc8c30b2fa5bfe
diff --git a/metadata/md5-cache/app-arch/par2cmdline-0.6.3 b/metadata/md5-cache/app-arch/par2cmdline-0.6.3
index e2588c449a42..d3930cfab17c 100644
--- a/metadata/md5-cache/app-arch/par2cmdline-0.6.3
+++ b/metadata/md5-cache/app-arch/par2cmdline-0.6.3
@@ -3,10 +3,10 @@ DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=s
 DESCRIPTION=A PAR-2.0 file verification and repair tool
 EAPI=5
 HOMEPAGE=https://github.com/BlackIkeEagle/par2cmdline
-KEYWORDS=amd64 ~hppa ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/BlackIkeEagle/par2cmdline/archive/v0.6.3.tar.gz -> par2cmdline-0.6.3.tar.gz
 _eclass_exported_funcs=src_prepare:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=622832edbb3654692cf13c43843b724f
+_md5_=01f7d5171ea2ffe483b53eccef10dc7a
diff --git a/metadata/md5-cache/app-arch/rpm2targz-9.0.0.5g b/metadata/md5-cache/app-arch/rpm2targz-9.0.0.5g
index 77f6ccff1681..28c4f11e0e6e 100644
--- a/metadata/md5-cache/app-arch/rpm2targz-9.0.0.5g
+++ b/metadata/md5-cache/app-arch/rpm2targz-9.0.0.5g
@@ -3,11 +3,11 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Convert a .rpm file to a .tar.gz archive
 EAPI=4
 HOMEPAGE=http://www.slackware.com/config/packages.php
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-1
 RDEPEND=app-arch/cpio
 SLOT=0
 SRC_URI=mirror://gentoo/rpm2targz-9.0.0.5g.tar.xz
 _eclass_exported_funcs=src_compile:- src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=e0447853b3f31b32be81e96f8872f38b
+_md5_=373a351f40b0d82a0a532178805050af
diff --git a/metadata/md5-cache/app-arch/rzip-2.1-r2 b/metadata/md5-cache/app-arch/rzip-2.1-r2
index 237b2324651c..858a37d30fa6 100644
--- a/metadata/md5-cache/app-arch/rzip-2.1-r2
+++ b/metadata/md5-cache/app-arch/rzip-2.1-r2
@@ -3,11 +3,11 @@ DEPEND=app-arch/bzip2 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-
 DESCRIPTION=Compression program for large files
 EAPI=2
 HOMEPAGE=http://rzip.samba.org
-KEYWORDS=amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2
 SLOT=0
 SRC_URI=http://rzip.samba.org/ftp/rzip/rzip-2.1.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=35811eb834a3aefd219785b7665da276
+_md5_=36f53e6e9650262cf7819a831d70b787
diff --git a/metadata/md5-cache/app-arch/sharutils-4.14-r1 b/metadata/md5-cache/app-arch/sharutils-4.14-r1
index 018af1986b0b..87a884f65b23 100644
--- a/metadata/md5-cache/app-arch/sharutils-4.14-r1
+++ b/metadata/md5-cache/app-arch/sharutils-4.14-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Tools to deal with shar archives
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/sharutils/
 IUSE=nls
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/sharutils/sharutils-4.14.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ee4aa712400bee6d2a245f7bcc325e32
+_md5_=a7f00ba5cb5b7b48e9a2e8e7e3e65714
diff --git a/metadata/md5-cache/app-arch/sharutils-4.15.1 b/metadata/md5-cache/app-arch/sharutils-4.15.1
index e69a43d09448..8c55603cdece 100644
--- a/metadata/md5-cache/app-arch/sharutils-4.15.1
+++ b/metadata/md5-cache/app-arch/sharutils-4.15.1
@@ -4,10 +4,10 @@ DESCRIPTION=Tools to deal with shar archives
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/sharutils/
 IUSE=nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/sharutils/sharutils-4.15.1.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=397578a8a2833ed27c16a080ade717f1
+_md5_=a51534bfa6234f2002319b3a21d0a88a
diff --git a/metadata/md5-cache/app-arch/sharutils-4.15.2 b/metadata/md5-cache/app-arch/sharutils-4.15.2
index ac5cfd1642f9..34310aa5cb21 100644
--- a/metadata/md5-cache/app-arch/sharutils-4.15.2
+++ b/metadata/md5-cache/app-arch/sharutils-4.15.2
@@ -4,10 +4,10 @@ DESCRIPTION=Tools to deal with shar archives
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/sharutils/
 IUSE=nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/sharutils/sharutils-4.15.2.tar.xz
 _eclass_exported_funcs=src_configure:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=89aa8bfa9396cea06d6c3de0e06532b3
+_md5_=f547b76579d78a602dcf780e4e92619d
diff --git a/metadata/md5-cache/app-arch/tar-1.29-r1 b/metadata/md5-cache/app-arch/tar-1.29-r1
index dd08396fc1d6..dbfed6da90be 100644
--- a/metadata/md5-cache/app-arch/tar-1.29-r1
+++ b/metadata/md5-cache/app-arch/tar-1.29-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Use this to make tarballs :)
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/tar/
 IUSE=acl elibc_glibc minimal nls selinux static userland_GNU xattr
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://gnu/tar/tar-1.29.tar.bz2 mirror://gnu-alpha/tar/tar-1.29.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1797eae97feb42042a947790991641ef
+_md5_=9ffd78e4e1cca9d11860351050247bb5
diff --git a/metadata/md5-cache/app-arch/tar-1.29-r2 b/metadata/md5-cache/app-arch/tar-1.29-r2
index 92aa75a7933b..8036471c1054 100644
--- a/metadata/md5-cache/app-arch/tar-1.29-r2
+++ b/metadata/md5-cache/app-arch/tar-1.29-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Use this to make tarballs :)
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/tar/
 IUSE=acl elibc_glibc minimal nls selinux static userland_GNU xattr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://gnu/tar/tar-1.29.tar.bz2 mirror://gnu-alpha/tar/tar-1.29.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=3f69ec7257fa200fc4422efbc3fb223e
+_md5_=54e2d641813d4116a545aa9c9d6ebc4b
diff --git a/metadata/md5-cache/app-arch/tar-1.29-r3 b/metadata/md5-cache/app-arch/tar-1.29-r3
index 13d3acfccaa3..fd4bf721278c 100644
--- a/metadata/md5-cache/app-arch/tar-1.29-r3
+++ b/metadata/md5-cache/app-arch/tar-1.29-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Use this to make tarballs :)
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/tar/
 IUSE=acl elibc_glibc minimal nls selinux static userland_GNU xattr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://gnu/tar/tar-1.29.tar.bz2 mirror://gnu-alpha/tar/tar-1.29.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=47bf0ace5ff7e0dd28de0c17eeb89e01
+_md5_=506371f9f442ce6f18b8e8dad21b1c2c
diff --git a/metadata/md5-cache/app-arch/unadf-0.7.12 b/metadata/md5-cache/app-arch/unadf-0.7.12
index f5f5f2ac6258..dc480418d862 100644
--- a/metadata/md5-cache/app-arch/unadf-0.7.12
+++ b/metadata/md5-cache/app-arch/unadf-0.7.12
@@ -4,10 +4,10 @@ DESCRIPTION=Extract files from Amiga adf disk images
 EAPI=5
 HOMEPAGE=http://lclevy.free.fr/adflib/
 IUSE=static-libs
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc-macos ~sparc-solaris ~x86 ~x86-interix ~x86-linux ~x86-solaris
+KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://lclevy.free.fr/adflib/adflib-0.7.12.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1f1347f4052e84a2e20773aa59afe9a4
+_md5_=19b37cad75524159989a773a9b70fd08
diff --git a/metadata/md5-cache/app-arch/unadf-0.7.9b b/metadata/md5-cache/app-arch/unadf-0.7.9b
index 483e437d4e6f..8979869e8981 100644
--- a/metadata/md5-cache/app-arch/unadf-0.7.9b
+++ b/metadata/md5-cache/app-arch/unadf-0.7.9b
@@ -3,10 +3,10 @@ DEPEND=app-arch/unzip x11-misc/makedepend
 DESCRIPTION=Extract files from Amiga adf disk images
 EAPI=0
 HOMEPAGE=http://lclevy.free.fr/adflib/
-KEYWORDS=hppa ppc x86 ~x86-interix ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=hppa ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/adflib.zip
 _eclass_exported_funcs=src_unpack:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f2662ab5100f1c1a5ce38ff5554907b0
+_md5_=229e33091c9324aed6bb0caed5a498e6
diff --git a/metadata/md5-cache/app-arch/unarj-2.65 b/metadata/md5-cache/app-arch/unarj-2.65
index c96869d1a8eb..a67d816ebfe4 100644
--- a/metadata/md5-cache/app-arch/unarj-2.65
+++ b/metadata/md5-cache/app-arch/unarj-2.65
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install unpack
 DESCRIPTION=Utility for opening arj archives
 EAPI=0
 HOMEPAGE=http://www.arjsoftware.com/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=arj
 SLOT=0
 SRC_URI=mirror://freebsd/ports/local-distfiles/ache/unarj-2.65.tgz
 _eclass_exported_funcs=src_unpack:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f7e872c11f7c0bcf5bbf50c5d20464fa
+_md5_=3a22b1a8bfa09b0e3c735a1d260bc7db
diff --git a/metadata/md5-cache/app-arch/undms-1.3-r1 b/metadata/md5-cache/app-arch/undms-1.3-r1
index dbd107210594..dd029c39d8a4 100644
--- a/metadata/md5-cache/app-arch/undms-1.3-r1
+++ b/metadata/md5-cache/app-arch/undms-1.3-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Decompress Amiga DMS disk images to ADF
 EAPI=0
 HOMEPAGE=ftp://us.aminet.net/pub/aminet/misc/unix/
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-interix ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=freedist
 SLOT=0
 SRC_URI=ftp://us.aminet.net/pub/aminet/misc/unix/undms-1.3.c.Z ftp://us.aminet.net/pub/aminet/misc/unix/undms-1.3.c.Z.readme
 _eclass_exported_funcs=src_compile:- src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=23ba28d26ce146aef42140424dc13b73
+_md5_=84d02e7937140547af46da1595ccf967
diff --git a/metadata/md5-cache/app-arch/unlzx-1.1 b/metadata/md5-cache/app-arch/unlzx-1.1
index 306dcb093b28..74f851fdb1e2 100644
--- a/metadata/md5-cache/app-arch/unlzx-1.1
+++ b/metadata/md5-cache/app-arch/unlzx-1.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install unpack
 DESCRIPTION=Unarchiver for Amiga LZX archives
 EAPI=0
 HOMEPAGE=ftp://us.aminet.net/pub/aminet/misc/unix/unlzx.c.gz.readme
-KEYWORDS=alpha amd64 ~hppa ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=freedist
 SLOT=0
 SRC_URI=ftp://us.aminet.net/pub/aminet/misc/unix/unlzx.c.gz ftp://us.aminet.net/pub/aminet/misc/unix/unlzx.c.gz.readme
 _eclass_exported_funcs=src_unpack:- src_compile:- src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=b86023dd18cb808770b70035ee93c6a2
+_md5_=6e9d8effa81d3043073eaf7c4b85603d
diff --git a/metadata/md5-cache/app-arch/xarchiver-0.5.4 b/metadata/md5-cache/app-arch/xarchiver-0.5.4
index 91464ba88833..f30cba33200e 100644
--- a/metadata/md5-cache/app-arch/xarchiver-0.5.4
+++ b/metadata/md5-cache/app-arch/xarchiver-0.5.4
@@ -4,11 +4,11 @@ DESCRIPTION=a GTK+ based and advanced archive manager that can be used with Thun
 EAPI=5
 HOMEPAGE=http://xarchiver.sourceforge.net/
 IUSE=debug
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 >=x11-libs/gtk+-2.24:2
 SLOT=0
 SRC_URI=mirror://sourceforge/xarchiver/xarchiver-0.5.4.tar.bz2
 _eclass_exported_funcs=pkg_preinst:xfconf pkg_postrm:xfconf pkg_postinst:- pkg_setup:- src_prepare:- src_configure:xfconf src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48	xfconf	d842ab8b2140980394561496bf157447
-_md5_=d244bbce23f002ce42f0f8d13723d784
+_md5_=8e0087d59c7fb0c2ee2f2abfab121ee7
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.2 b/metadata/md5-cache/app-arch/xz-utils-5.2.2
index a563d18d9add..75820f6a9e8f 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.2
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=utils for managing LZMA compressed files
 EAPI=4
 HOMEPAGE=http://tukaani.org/xz/
 IUSE=elibc_FreeBSD nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
 SLOT=0
 SRC_URI=http://tukaani.org/xz/xz-5.2.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=77daabca7b095963189a5fb040baac22
+_md5_=2873341998aa04639c60068e5a97d456
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.3 b/metadata/md5-cache/app-arch/xz-utils-5.2.3
index f873e85bd89f..75df802139d3 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.3
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.3
@@ -4,11 +4,11 @@ DESCRIPTION=utils for managing LZMA compressed files
 EAPI=5
 HOMEPAGE=http://tukaani.org/xz/
 IUSE=elibc_FreeBSD nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
 SLOT=0
 SRC_URI=http://tukaani.org/xz/xz-5.2.3.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=415b8555afdb7285dd4784299058f905
+_md5_=07a709d44f6b23a2ec468e39c8e6a244
diff --git a/metadata/md5-cache/app-arch/xz-utils-9999 b/metadata/md5-cache/app-arch/xz-utils-9999
index 0e4c0afcb188..fa6cab369ade 100644
--- a/metadata/md5-cache/app-arch/xz-utils-9999
+++ b/metadata/md5-cache/app-arch/xz-utils-9999
@@ -9,4 +9,4 @@ RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
 SLOT=0
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- src_unpack:git-2 src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	git-2	7af5d170bfc02983b4bcd3167dc5edd4	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d3092bfb0588da6d7b666500f9df5de3
+_md5_=c625f491209897a855764a4a0c2f5045
diff --git a/metadata/md5-cache/app-arch/zip-3.0 b/metadata/md5-cache/app-arch/zip-3.0
index ef4908cc0618..2015d4cac0b6 100644
--- a/metadata/md5-cache/app-arch/zip-3.0
+++ b/metadata/md5-cache/app-arch/zip-3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Info ZIP (encryption support)
 EAPI=0
 HOMEPAGE=http://www.info-zip.org/
 IUSE=bzip2 crypt unicode
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Info-ZIP
 RDEPEND=bzip2? ( app-arch/bzip2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/infozip/zip30.zip
 _eclass_exported_funcs=src_unpack:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=80e13861b0f13f5a7fe2f6fa9a59c017
+_md5_=ba8efc391c609f32700c2ed18dd04a80
diff --git a/metadata/md5-cache/app-arch/zoo-2.10-r4 b/metadata/md5-cache/app-arch/zoo-2.10-r4
index 96f49080d6a4..14b6ab814d31 100644
--- a/metadata/md5-cache/app-arch/zoo-2.10-r4
+++ b/metadata/md5-cache/app-arch/zoo-2.10-r4
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install unpack
 DESCRIPTION=Manipulate archives of files in compressed form
 EAPI=0
 HOMEPAGE=ftp://ftp.kiarchive.ru/pub/unix/arcers
-KEYWORDS=alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~x86-solaris
 LICENSE=zoo
 SLOT=0
 SRC_URI=ftp://ftp.kiarchive.ru/pub/unix/arcers/zoo-2.10pl1.tar.gz mirror://gentoo/zoo-2.10-gcc-issues-fix.patch
 _eclass_exported_funcs=src_unpack:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=2517aeff5a06d1155ea795f06afac4bf
+_md5_=94957a994cabcd94ed93aa8f90ebc277
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r1 b/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r1
index d7377d1351b6..e90367993e82 100644
--- a/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r1
+++ b/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Local/remote mirroring+incremental backup
 EAPI=5
 HOMEPAGE=https://github.com/sol1/rdiff-backup
 IUSE=examples python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~mips ppc ppc64 ~sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=alpha amd64 arm ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pylibacl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/sol1/rdiff-backup/archive/r1-3-3.tar.gz -> rdiff-backup-1.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=32f321ee2e3b2b84cefdbf9ca4d9477e
+_md5_=b133acccee41fce7b61d5be695e8797c
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r2 b/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r2
index 9c9ea9116b28..662f86edfa4a 100644
--- a/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r2
+++ b/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Local/remote mirroring+incremental backup
 EAPI=5
 HOMEPAGE=https://github.com/sol1/rdiff-backup
 IUSE=examples python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pylibacl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/sol1/rdiff-backup/archive/r1-3-3.tar.gz -> rdiff-backup-1.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8f615700f73cb74744bccc1aaa25312a
+_md5_=e49096d262a2b314ec0c613b3d3a9596
diff --git a/metadata/md5-cache/app-cdr/bchunk-1.2.0-r1 b/metadata/md5-cache/app-cdr/bchunk-1.2.0-r1
index 14e3bfbf44ec..54b1a4de4608 100644
--- a/metadata/md5-cache/app-cdr/bchunk-1.2.0-r1
+++ b/metadata/md5-cache/app-cdr/bchunk-1.2.0-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Converts bin/cue CD-images to iso+wav/cdr
 EAPI=0
 HOMEPAGE=http://he.fi/bchunk/
-KEYWORDS=amd64 ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://he.fi/bchunk/bchunk-1.2.0.tar.gz
 _eclass_exported_funcs=src_compile:- src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d571d421b52a60b7768f2812abac1f34
+_md5_=311aac638dc039a3f0cb6cde22028435
diff --git a/metadata/md5-cache/app-cdr/bin2iso-19b-r2 b/metadata/md5-cache/app-cdr/bin2iso-19b-r2
index 1bd23a8e0b36..3fc2ad5dfa74 100644
--- a/metadata/md5-cache/app-cdr/bin2iso-19b-r2
+++ b/metadata/md5-cache/app-cdr/bin2iso-19b-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install unpack
 DESCRIPTION=converts RAW format (.bin/.cue) files to ISO/WAV format
 EAPI=0
 HOMEPAGE=http://users.andara.com/~doiron/bin2iso/
-KEYWORDS=alpha amd64 ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://gentoo/bin2iso-19b.tar.bz2
 _eclass_exported_funcs=src_unpack:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=fc8323a935e011dbe52cf893a970f081
+_md5_=21882e8d982a2965309e1358c5d9270f
diff --git a/metadata/md5-cache/app-cdr/ccd2iso-0.3 b/metadata/md5-cache/app-cdr/ccd2iso-0.3
index 09db65eed33f..aef7c0ad7f05 100644
--- a/metadata/md5-cache/app-cdr/ccd2iso-0.3
+++ b/metadata/md5-cache/app-cdr/ccd2iso-0.3
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Converts CloneCD images (popular under Windows) to ISOs
 EAPI=0
 HOMEPAGE=https://sourceforge.net/projects/ccd2iso/
-KEYWORDS=amd64 ppc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/ccd2iso/ccd2iso-0.3.tar.gz
 _eclass_exported_funcs=src_unpack:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=e1464e071c313c9b11a49443497bb1bc
+_md5_=6b6f67ad2b6cf7b690dbd45273723a42
diff --git a/metadata/md5-cache/app-cdr/nrg2iso-0.4-r1 b/metadata/md5-cache/app-cdr/nrg2iso-0.4-r1
index 036cc67b00f0..4c02e8a7747c 100644
--- a/metadata/md5-cache/app-cdr/nrg2iso-0.4-r1
+++ b/metadata/md5-cache/app-cdr/nrg2iso-0.4-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Converts Nero nrg CD-images to iso
 EAPI=0
 HOMEPAGE=http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html
-KEYWORDS=amd64 ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://gregory.kokanosky.free.fr/v4/linux/nrg2iso-0.4.tar.gz
 _eclass_exported_funcs=src_compile:- src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=4deb0109d1bd99958d617736490c86b2
+_md5_=c787b6a7852454cf5aacb6fdf9dad9f5
diff --git a/metadata/md5-cache/app-cdr/xbiso-0.6.1 b/metadata/md5-cache/app-cdr/xbiso-0.6.1
index 3176d153add1..a0814a67e985 100644
--- a/metadata/md5-cache/app-cdr/xbiso-0.6.1
+++ b/metadata/md5-cache/app-cdr/xbiso-0.6.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Xbox xdvdfs ISO extraction utility
 EAPI=0
 HOMEPAGE=https://sourceforge.net/projects/xbiso/
-KEYWORDS=~amd64 x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/xbiso/xbiso-0.6.1.tar.gz
 _eclass_exported_funcs=src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f2a50dc294b591bdd098cd3ba6b0abac
+_md5_=90797214fb072b01add0649af1f5bc47
diff --git a/metadata/md5-cache/app-cdr/xbiso-0.6.1-r1 b/metadata/md5-cache/app-cdr/xbiso-0.6.1-r1
index 8ad7fd94f0c1..697d4b61c7b9 100644
--- a/metadata/md5-cache/app-cdr/xbiso-0.6.1-r1
+++ b/metadata/md5-cache/app-cdr/xbiso-0.6.1-r1
@@ -3,11 +3,11 @@ DEPEND=net-libs/ftplib
 DESCRIPTION=Xbox xdvdfs ISO extraction utility
 EAPI=4
 HOMEPAGE=https://sourceforge.net/projects/xbiso/
-KEYWORDS=~amd64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=net-libs/ftplib
 SLOT=0
 SRC_URI=mirror://sourceforge/xbiso/xbiso-0.6.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f61b53f64d582588c1dec54e4135df3e
+_md5_=376e4176d3ae7be3d3e9081c0eca7253
diff --git a/metadata/md5-cache/app-cdr/xbiso-0.6.1-r2 b/metadata/md5-cache/app-cdr/xbiso-0.6.1-r2
index 1e086d44d541..0a314ba7bc4f 100644
--- a/metadata/md5-cache/app-cdr/xbiso-0.6.1-r2
+++ b/metadata/md5-cache/app-cdr/xbiso-0.6.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Xbox xdvdfs ISO extraction utility
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/xbiso/
 IUSE=ftp
-KEYWORDS=~amd64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=ftp? ( <net-libs/ftplib-4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/xbiso/xbiso-0.6.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=2d0d8a55faaf1759d38f9f477b8897fb
+_md5_=db2888a3f9e93cb659aa16bcc9be05f0
diff --git a/metadata/md5-cache/app-crypt/aespipe-2.3e b/metadata/md5-cache/app-crypt/aespipe-2.3e
index da1fd43f0b4d..f1ab68f4d24c 100644
--- a/metadata/md5-cache/app-crypt/aespipe-2.3e
+++ b/metadata/md5-cache/app-crypt/aespipe-2.3e
@@ -3,11 +3,11 @@ DESCRIPTION=Encrypts data from stdin to stdout
 EAPI=0
 HOMEPAGE=http://loop-aes.sourceforge.net
 IUSE=static
-KEYWORDS=amd64 arm ppc ppc64 sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=amd64 arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=app-arch/sharutils
 SLOT=0
 SRC_URI=http://loop-aes.sourceforge.net/aespipe/aespipe-v2.3e.tar.bz2
 _eclass_exported_funcs=src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=9e2dfc6100ce24421d8c5849cd4612e1
+_md5_=48cd343b704a0379a7adbfd57881a40a
diff --git a/metadata/md5-cache/app-crypt/aespipe-2.4c-r1 b/metadata/md5-cache/app-crypt/aespipe-2.4c-r1
index 52d926e9ae92..cd6d02c86c88 100644
--- a/metadata/md5-cache/app-crypt/aespipe-2.4c-r1
+++ b/metadata/md5-cache/app-crypt/aespipe-2.4c-r1
@@ -3,11 +3,11 @@ DESCRIPTION=Encrypts data from stdin to stdout
 EAPI=5
 HOMEPAGE=http://loop-aes.sourceforge.net
 IUSE=+asm cpu_flags_x86_aes cpu_flags_x86_padlock static
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=app-arch/sharutils app-crypt/gnupg
 SLOT=0
 SRC_URI=http://loop-aes.sourceforge.net/aespipe/aespipe-v2.4c.tar.bz2
 _eclass_exported_funcs=src_configure:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=38de5d9ff7dd34a6398f645ef39c97c9
+_md5_=5c99d2e34aa08dc3e46b427b78327b13
diff --git a/metadata/md5-cache/app-crypt/aespipe-2.4d b/metadata/md5-cache/app-crypt/aespipe-2.4d
index 8d728e858bfb..634701f9b270 100644
--- a/metadata/md5-cache/app-crypt/aespipe-2.4d
+++ b/metadata/md5-cache/app-crypt/aespipe-2.4d
@@ -3,11 +3,11 @@ DESCRIPTION=Encrypts data from stdin to stdout
 EAPI=5
 HOMEPAGE=http://loop-aes.sourceforge.net
 IUSE=+asm cpu_flags_x86_aes cpu_flags_x86_padlock static
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=app-arch/sharutils app-crypt/gnupg
 SLOT=0
 SRC_URI=http://loop-aes.sourceforge.net/aespipe/aespipe-v2.4d.tar.bz2
 _eclass_exported_funcs=src_configure:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=38de5d9ff7dd34a6398f645ef39c97c9
+_md5_=5c99d2e34aa08dc3e46b427b78327b13
diff --git a/metadata/md5-cache/app-crypt/ccrypt-1.10 b/metadata/md5-cache/app-crypt/ccrypt-1.10
index 11978d9fff62..2d3e1ccdf497 100644
--- a/metadata/md5-cache/app-crypt/ccrypt-1.10
+++ b/metadata/md5-cache/app-crypt/ccrypt-1.10
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Encryption and decryption
 EAPI=3
 HOMEPAGE=http://ccrypt.sourceforge.net
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://ccrypt.sourceforge.net/download/ccrypt-1.10.tar.gz
 _eclass_exported_funcs=src_install:-
-_md5_=5239be4198e63d8b3525e8050c51a51c
+_md5_=5a58ac844bfcab72c31cda831b4fc9d2
diff --git a/metadata/md5-cache/app-crypt/ccrypt-1.9 b/metadata/md5-cache/app-crypt/ccrypt-1.9
index 5a2b085fe50b..2921a31f393e 100644
--- a/metadata/md5-cache/app-crypt/ccrypt-1.9
+++ b/metadata/md5-cache/app-crypt/ccrypt-1.9
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Encryption and decryption
 EAPI=3
 HOMEPAGE=http://ccrypt.sourceforge.net
-KEYWORDS=amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://ccrypt.sourceforge.net/download/ccrypt-1.9.tar.gz
 _eclass_exported_funcs=src_install:-
-_md5_=99957a6200f5b183fce0e7dbb87f0ffb
+_md5_=dffa2a68ac2757fc9e895114fa850953
diff --git a/metadata/md5-cache/app-crypt/gnupg-1.4.21 b/metadata/md5-cache/app-crypt/gnupg-1.4.21
index ab0c51150fec..90ab5113ef43 100644
--- a/metadata/md5-cache/app-crypt/gnupg-1.4.21
+++ b/metadata/md5-cache/app-crypt/gnupg-1.4.21
@@ -4,11 +4,11 @@ DESCRIPTION=The GNU Privacy Guard, a GPL pgp replacement
 EAPI=5
 HOMEPAGE=http://www.gnupg.org/
 IUSE=bzip2 curl ldap mta nls readline selinux smartcard static usb zlib
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=!static? ( ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl ) mta? ( virtual/mta ) readline? ( sys-libs/readline:0= ) smartcard? ( =virtual/libusb-0* ) usb? ( =virtual/libusb-0* ) ) selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-1.4.21.tar.bz2
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=78091dd52a19420fddd9897dbb95ac58
+_md5_=cc51aeef1c300e074466bc024acc9df2
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.0.28 b/metadata/md5-cache/app-crypt/gnupg-2.0.28
index 51562f71f33b..8dcf7bd50d4e 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.0.28
+++ b/metadata/md5-cache/app-crypt/gnupg-2.0.28
@@ -4,7 +4,7 @@ DESCRIPTION=The GNU Privacy Guard, a GPL pgp replacement
 EAPI=5
 HOMEPAGE=http://www.gnupg.org/
 IUSE=bzip2 doc ldap nls mta readline static selinux smartcard tools usb
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.5:0= >=dev-libs/libgpg-error-1.11 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) ldap? ( net-nds/openldap ) ) app-crypt/pinentry mta? ( virtual/mta ) !<=app-crypt/gnupg-2.0.1 selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
 REQUIRED_USE=smartcard? ( !static )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.0.28.tar.bz2
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=4d4fa42f5d1b8bbc6fbaad067262d6b4
+_md5_=95bc970c9024776634d157d4f0e0a6eb
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.1.15 b/metadata/md5-cache/app-crypt/gnupg-2.1.15
index f93710559d9d..ebcae595cb5e 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.1.15
+++ b/metadata/md5-cache/app-crypt/gnupg-2.1.15
@@ -4,11 +4,11 @@ DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
 EAPI=5
 HOMEPAGE=http://www.gnupg.org/
 IUSE=bzip2 doc +gnutls ldap nls readline selinux smartcard tofu tools usb
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.4.3 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 gnutls? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.1.15.tar.bz2
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=95f1e6ebd33b76c2abf80dac36d2ca9f
+_md5_=f8e4a476ff53e96ac06175a9bfde9cde
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.1.17-r1 b/metadata/md5-cache/app-crypt/gnupg-2.1.17-r1
index ad94caaad49c..509d569c99b8 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.1.17-r1
+++ b/metadata/md5-cache/app-crypt/gnupg-2.1.17-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
 EAPI=5
 HOMEPAGE=http://www.gnupg.org/
 IUSE=bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.4.3 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 gnutls? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.1.17.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=9802e26520246ac6edbaaa465ec51208
+_md5_=a181592ef618a0346ad4711785f372d0
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.1.17-r2 b/metadata/md5-cache/app-crypt/gnupg-2.1.17-r2
index 72372fab09c5..526a64aecc14 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.1.17-r2
+++ b/metadata/md5-cache/app-crypt/gnupg-2.1.17-r2
@@ -4,11 +4,11 @@ DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
 EAPI=6
 HOMEPAGE=http://www.gnupg.org/
 IUSE=bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.4.3 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 gnutls? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.1.17.tar.bz2
 _eclass_exported_funcs=src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=cb102df064d559a8209d358e29ab0dd9
+_md5_=afdb8eab2b4bc5262de54331e86eb6e2
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.1.18 b/metadata/md5-cache/app-crypt/gnupg-2.1.18
index ce87dd851886..cf95b3bf1f31 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.1.18
+++ b/metadata/md5-cache/app-crypt/gnupg-2.1.18
@@ -4,11 +4,11 @@ DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
 EAPI=6
 HOMEPAGE=http://www.gnupg.org/
 IUSE=bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.4.3 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 gnutls? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.1.18.tar.bz2
 _eclass_exported_funcs=src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=aec83794e7c97a0b07eceadd01c83b44
+_md5_=a02f24152a7981a578899fb9743776c8
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.5.5 b/metadata/md5-cache/app-crypt/gpgme-1.5.5
index d7ed676882c4..c6b3f7343b2d 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.5.5
+++ b/metadata/md5-cache/app-crypt/gpgme-1.5.5
@@ -4,11 +4,11 @@ DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
 EAPI=5
 HOMEPAGE=http://www.gnupg.org/related_software/gpgme
 IUSE=common-lisp static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-crypt/gnupg >=dev-libs/libassuan-2.0.2 >=dev-libs/libgpg-error-1.11
 SLOT=1/11
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.5.5.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d3adbffafdcb74b37f8d9f1f8ea633ed
+_md5_=05749cbe37b2e509f8c0bf29d45d0b25
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.6.0 b/metadata/md5-cache/app-crypt/gpgme-1.6.0
index c58bbedf26c9..b583e6b7e9b7 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.6.0
+++ b/metadata/md5-cache/app-crypt/gpgme-1.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
 EAPI=5
 HOMEPAGE=http://www.gnupg.org/related_software/gpgme
 IUSE=common-lisp static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-crypt/gnupg >=dev-libs/libassuan-2.0.2 >=dev-libs/libgpg-error-1.11
 SLOT=1/11
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.6.0.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=7e3d50313252acc026782fc05686dfcc
+_md5_=aa91ab47397c3da6e4c75bf062a8b6b5
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.8.0-r2 b/metadata/md5-cache/app-crypt/gpgme-1.8.0-r2
index 10f9c4c021ab..9b3b92bb3020 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.8.0-r2
+++ b/metadata/md5-cache/app-crypt/gpgme-1.8.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
 EAPI=6
 HOMEPAGE=http://www.gnupg.org/related_software/gpgme
 IUSE=common-lisp static-libs cxx python qt5 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-crypt/gnupg >=dev-libs/libassuan-2.0.2 >=dev-libs/libgpg-error-1.11 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) qt5? ( dev-qt/qtcore:5 ) cxx? ( !kde-apps/gpgmepp !kde-apps/kdepimlibs:4 )
 REQUIRED_USE=qt5? ( cxx )
@@ -12,4 +12,4 @@ SLOT=1/11
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.8.0.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=aeb789283381099f88eaf65b40e3a952
+_md5_=a63bfc27c66bdb3f3222bcac83598f11
diff --git a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r10 b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r10
index 56e9a177822c..b287308f0d2d 100644
--- a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r10
+++ b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r10
@@ -4,7 +4,7 @@ DESCRIPTION=fast password cracker
 EAPI=5
 HOMEPAGE=http://www.openwall.com/john/
 IUSE=cuda custom-cflags -minimal cpu_flags_x86_mmx libressl mozilla mpi opencl openmp cpu_flags_x86_sse2
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib !minimal? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mpi? ( virtual/mpi ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit:= ) opencl? ( virtual/opencl ) mozilla? ( dev-libs/nss dev-libs/nspr )
 REQUIRED_USE=openmp? ( !minimal ) mpi? ( !minimal ) cuda? ( !minimal ) opencl? ( !minimal ) mozilla? ( !minimal )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://www.openwall.com/john/g/john-1.7.9.tar.bz2 !minimal? ( http://www.openwall.com/john/g/john-1.7.9-jumbo-7.diff.gz )
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_compile:- src_test:- src_install:-
 _eclasses_=cuda	f150e667cc5826799d86be0fff518252	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=70a3b07c9c28097a470842a8f18e415c
+_md5_=6d7a5ce3328e0611164093cd9604a859
diff --git a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r11 b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r11
index 2eeb2bd62938..43024cfae2c4 100644
--- a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r11
+++ b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r11
@@ -4,7 +4,7 @@ DESCRIPTION=fast password cracker
 EAPI=6
 HOMEPAGE=http://www.openwall.com/john/
 IUSE=cuda custom-cflags -minimal cpu_flags_x86_mmx libressl mozilla mpi opencl openmp cpu_flags_x86_sse2
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib !minimal? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mpi? ( virtual/mpi ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit:= ) opencl? ( virtual/opencl ) mozilla? ( dev-libs/nss dev-libs/nspr )
 REQUIRED_USE=openmp? ( !minimal ) mpi? ( !minimal ) cuda? ( !minimal ) opencl? ( !minimal ) mozilla? ( !minimal )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://www.openwall.com/john/g/john-1.7.9.tar.bz2 !minimal? ( http://www.openwall.com/john/g/john-1.7.9-jumbo-7.diff.gz )
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_compile:- src_test:- src_install:-
 _eclasses_=cuda	f150e667cc5826799d86be0fff518252	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c89bfa40cec2c384f9254bc91856e08c
+_md5_=b11f3383a0e836b34042f9050f43660c
diff --git a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6 b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6
index fdfd8efa13c6..fafb80196fe3 100644
--- a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6
+++ b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6
@@ -4,7 +4,7 @@ DESCRIPTION=fast password cracker
 EAPI=4
 HOMEPAGE=http://www.openwall.com/john/
 IUSE=cuda custom-cflags -minimal cpu_flags_x86_mmx mpi opencl openmp cpu_flags_x86_sse2
-KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib !minimal? ( >=dev-libs/openssl-0.9.7:0 ) mpi? ( virtual/mpi ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) opencl? ( virtual/opencl )
 REQUIRED_USE=openmp? ( !minimal ) mpi? ( !minimal ) cuda? ( !minimal ) opencl? ( !minimal )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=http://www.openwall.com/john/g/john-1.7.9.tar.bz2 !minimal? ( http://www.openwall.com/john/g/john-1.7.9-jumbo-7.diff.gz )
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_compile:- src_test:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=4b8aa3d69e1fd769e8d3d5de332cf8b1
+_md5_=ff07dfefa4471c30556af7e9820345ac
diff --git a/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r1 b/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r1
index afdc86e28cf8..ff65f10ae9f3 100644
--- a/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r1
+++ b/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r1
@@ -4,10 +4,10 @@ DESCRIPTION=library providing a uniform interface to a large number of hash algo
 EAPI=4
 HOMEPAGE=http://mhash.sourceforge.net/
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/mhash/mhash-0.9.9.9.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=fea39692ab7d01128671d35b8e83608f
+_md5_=9aa1d042d3ee45913d2b7e32a35d0da4
diff --git a/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r2 b/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r2
index 972cb206fe7e..5f318265794d 100644
--- a/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r2
+++ b/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r2
@@ -4,10 +4,10 @@ DESCRIPTION=library providing a uniform interface to a large number of hash algo
 EAPI=6
 HOMEPAGE=http://mhash.sourceforge.net/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/mhash/mhash-0.9.9.9.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=89aba117a46b146d333fff167e4ab668
+_md5_=0f0f2bef66f35a461f2cc10e61b98718
diff --git a/metadata/md5-cache/app-crypt/pinentry-0.9.7-r1 b/metadata/md5-cache/app-crypt/pinentry-0.9.7-r1
index 1c7952e31418..a828a534fd62 100644
--- a/metadata/md5-cache/app-crypt/pinentry-0.9.7-r1
+++ b/metadata/md5-cache/app-crypt/pinentry-0.9.7-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol
 EAPI=5
 HOMEPAGE=http://gnupg.org/aegypten2/index.html
 IUSE=emacs gtk ncurses qt4 qt5 caps gnome-keyring static
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libgpg-error-1.17 >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2 ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) caps? ( sys-libs/libcap ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) app-eselect/eselect-pinentry gnome-keyring? ( app-crypt/libsecret ) gnome-keyring? ( app-crypt/gcr )
 REQUIRED_USE=|| ( ncurses gtk qt4 qt5 ) gtk? ( !static ) qt4? ( !static ) qt5? ( !static ) static? ( ncurses ) ?? ( qt4 qt5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-0.9.7.tar.bz2
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=7aaf82d2b8ba91e9030deced6b3c595e
+_md5_=a3ef528f5c3f68064efc81d9d3837dbd
diff --git a/metadata/md5-cache/app-crypt/pinentry-1.0.0 b/metadata/md5-cache/app-crypt/pinentry-1.0.0
index 21445bd92531..65a1f8a7bb8d 100644
--- a/metadata/md5-cache/app-crypt/pinentry-1.0.0
+++ b/metadata/md5-cache/app-crypt/pinentry-1.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol
 EAPI=6
 HOMEPAGE=http://gnupg.org/aegypten2/index.html
 IUSE=emacs gtk ncurses qt4 qt5 caps gnome-keyring static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libgpg-error-1.17 >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2 ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) caps? ( sys-libs/libcap ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) app-eselect/eselect-pinentry gnome-keyring? ( app-crypt/libsecret ) gnome-keyring? ( app-crypt/gcr )
 REQUIRED_USE=|| ( ncurses gtk qt4 qt5 ) gtk? ( !static ) qt4? ( !static ) qt5? ( !static ) static? ( ncurses ) ?? ( qt4 qt5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-1.0.0.tar.bz2
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=6b7df4a24bf1b48b0cfe6941ff47be8b
+_md5_=9c58396e6360f064cb27d0c7854825c8
diff --git a/metadata/md5-cache/app-crypt/rotix-0.83 b/metadata/md5-cache/app-crypt/rotix-0.83
index ee102b60f1ba..e6fde594e4da 100644
--- a/metadata/md5-cache/app-crypt/rotix-0.83
+++ b/metadata/md5-cache/app-crypt/rotix-0.83
@@ -3,11 +3,11 @@ DEPEND=sys-devel/gettext
 DESCRIPTION=Rotix allows you to generate rotational obfuscations
 EAPI=5
 HOMEPAGE=https://gentoo.org
-KEYWORDS=amd64 ia64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-devel/gettext
 SLOT=0
 SRC_URI=http://elektron.its.tudelft.nl/~hemmin98/rotix_releases/rotix-0.83/rotix-0.83.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=90238c6eef7b3c4174a4ad5c7c9b696d
+_md5_=93d2ca1b6e1f4c4bce9dc07a57a20998
diff --git a/metadata/md5-cache/app-crypt/shash-0.2.6-r2 b/metadata/md5-cache/app-crypt/shash-0.2.6-r2
index ede07a12b785..077d0898b9bc 100644
--- a/metadata/md5-cache/app-crypt/shash-0.2.6-r2
+++ b/metadata/md5-cache/app-crypt/shash-0.2.6-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Generate or check digests or MACs of files
 EAPI=5
 HOMEPAGE=http://mcrypt.hellug.gr/shash/
 IUSE=static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/mhash-0.8.18-r1
 SLOT=0
 SRC_URI=ftp://mcrypt.hellug.gr/pub/mcrypt/shash/shash-0.2.6.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=437893d6ff6438162b8d8473e172f44d
+_md5_=ec31bd01f3572bc6e205dd7ccd4438d2
diff --git a/metadata/md5-cache/app-crypt/shash-0.2.6-r3 b/metadata/md5-cache/app-crypt/shash-0.2.6-r3
index 2b624466d005..bf61f515fec4 100644
--- a/metadata/md5-cache/app-crypt/shash-0.2.6-r3
+++ b/metadata/md5-cache/app-crypt/shash-0.2.6-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Generate or check digests or MACs of files
 EAPI=6
 HOMEPAGE=http://mcrypt.hellug.gr/shash/
 IUSE=static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/mhash-0.8.18-r1
 SLOT=0
 SRC_URI=ftp://mcrypt.hellug.gr/pub/mcrypt/shash/shash-0.2.6.tar.gz
 _eclass_exported_funcs=src_configure:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=37b58c98e9af5a2aeb5ba94a08826f84
+_md5_=a408079280ee4f7182afebb10d9c08b0
diff --git a/metadata/md5-cache/app-crypt/sign-1.0.7 b/metadata/md5-cache/app-crypt/sign-1.0.7
index 2a7f62089ad4..ca136803f00e 100644
--- a/metadata/md5-cache/app-crypt/sign-1.0.7
+++ b/metadata/md5-cache/app-crypt/sign-1.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=File signing and signature verification utility
 EAPI=5
 HOMEPAGE=http://swapped.cc/sign/
 IUSE=libressl
-KEYWORDS=amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BZIP2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=http://swapped.cc/sign/files/sign-1.0.7.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=4083636f7440142db2d96285a91124ff
+_md5_=fa4f25d45c0b337e18b1cdc8b0e51478
diff --git a/metadata/md5-cache/app-dicts/aspell-de-0.60_pre20030222 b/metadata/md5-cache/app-dicts/aspell-de-0.60_pre20030222
index 1a130b75768a..9d0da6cd5bef 100644
--- a/metadata/md5-cache/app-dicts/aspell-de-0.60_pre20030222
+++ b/metadata/md5-cache/app-dicts/aspell-de-0.60_pre20030222
@@ -3,11 +3,11 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=German and Swiss-German language dictionary for aspell
 EAPI=0
 HOMEPAGE=http://aspell.net
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/de/aspell6-de-20030222-1.tar.bz2
 _eclass_exported_funcs=src_compile:aspell-dict src_install:aspell-dict
 _eclasses_=aspell-dict	5e1fcef2869735a5ddd48c0d8fb4f48a
-_md5_=48652c2d8cbfac14d5ba4ebd1995082e
+_md5_=013782b38fb5ffd04ca49b86bf54969d
diff --git a/metadata/md5-cache/app-dicts/edictionary-2.6 b/metadata/md5-cache/app-dicts/edictionary-2.6
index fdb5f11a55d1..f754c44a10cf 100644
--- a/metadata/md5-cache/app-dicts/edictionary-2.6
+++ b/metadata/md5-cache/app-dicts/edictionary-2.6
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Command line dictionary and thesaurus
 EAPI=3
 HOMEPAGE=http://edictionary.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/edictionary/edict-2.6.tar.gz
 _eclass_exported_funcs=src_install:-
-_md5_=b63d365b36713f3f7a4ffbf5090dae98
+_md5_=9a523db134a3d28fdec8de4cc352d374
diff --git a/metadata/md5-cache/app-dicts/gnome-dictionary-3.18.1 b/metadata/md5-cache/app-dicts/gnome-dictionary-3.18.1
index 495f409a307d..3d28f15fb16f 100644
--- a/metadata/md5-cache/app-dicts/gnome-dictionary-3.18.1
+++ b/metadata/md5-cache/app-dicts/gnome-dictionary-3.18.1
@@ -4,11 +4,11 @@ DESCRIPTION=Dictionary utility for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Dictionary
 IUSE=+introspection ipv6 debug
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.39:2[dbus] x11-libs/cairo:= >=x11-libs/gtk+-3.14:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.42:= ) gnome-base/gsettings-desktop-schemas !<gnome-extra/gnome-utils-3.4
 SLOT=0/9
 SRC_URI=mirror://gnome/sources/gnome-dictionary/3.18/gnome-dictionary-3.18.1.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_unpack:gnome2 src_prepare:gnome2 src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c4ea6f9f250b5355e9e948e7007dead0	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a9434b57594de5949bcb72b5bc9ab697
+_md5_=63b183effe6c9f23219bd456799f9a19
diff --git a/metadata/md5-cache/app-dicts/gnome-dictionary-3.20.0 b/metadata/md5-cache/app-dicts/gnome-dictionary-3.20.0
index 9b7b115af112..1129bf7032c5 100644
--- a/metadata/md5-cache/app-dicts/gnome-dictionary-3.20.0
+++ b/metadata/md5-cache/app-dicts/gnome-dictionary-3.20.0
@@ -4,11 +4,11 @@ DESCRIPTION=Dictionary utility for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Dictionary
 IUSE=debug +introspection ipv6
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.39:2[dbus] x11-libs/cairo:= >=x11-libs/gtk+-3.20:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.42:= ) gnome-base/gsettings-desktop-schemas !<gnome-extra/gnome-utils-3.4
 SLOT=0/10
 SRC_URI=mirror://gnome/sources/gnome-dictionary/3.20/gnome-dictionary-3.20.0.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:gnome2 src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c4ea6f9f250b5355e9e948e7007dead0	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=271fd1ca1ac0e6ae77b78dd9b90a533a
+_md5_=c12518bbff9a8e6d56cca68ecb414273
diff --git a/metadata/md5-cache/app-dicts/migemo-dict-200812 b/metadata/md5-cache/app-dicts/migemo-dict-200812
index e45714ea11cf..33b3af119140 100644
--- a/metadata/md5-cache/app-dicts/migemo-dict-200812
+++ b/metadata/md5-cache/app-dicts/migemo-dict-200812
@@ -3,9 +3,9 @@ DESCRIPTION=Dictionary files for the Migemo and C/Migemo
 EAPI=0
 HOMEPAGE=http://openlab.ring.gr.jp/skk/dic.html
 IUSE=unicode
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/migemo-dict-200812.tar.bz2
 _eclass_exported_funcs=src_unpack:- src_install:-
-_md5_=16d9f2b194ec57729958d7c757c62726
+_md5_=23107885a0bed78413359fe18f920068
diff --git a/metadata/md5-cache/app-dicts/myspell-cy-20130708 b/metadata/md5-cache/app-dicts/myspell-cy-20130708
index 4d979aca0d85..4b88960c986f 100644
--- a/metadata/md5-cache/app-dicts/myspell-cy-20130708
+++ b/metadata/md5-cache/app-dicts/myspell-cy-20130708
@@ -3,10 +3,10 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Welsh dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=http://extensions.openoffice.org/en/project/gwirydd-sillafu-cymraeg-welsh-language-spell-checker
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/geiriadur-cy.oxt -> myspell-cy-20130708.oxt
 _eclass_exported_funcs=src_unpack:myspell-r2 src_install:myspell-r2
 _eclasses_=myspell-r2	d7e8733370dd6a9a1a3b64fdda0146d2
-_md5_=5ec50c20941382a5602cb9f41592272b
+_md5_=b1de68fc1b0820e7498377883b6d4a33
diff --git a/metadata/md5-cache/app-dicts/myspell-en-20160901 b/metadata/md5-cache/app-dicts/myspell-en-20160901
index 404e8df2aebf..59c04a4ad7c2 100644
--- a/metadata/md5-cache/app-dicts/myspell-en-20160901
+++ b/metadata/md5-cache/app-dicts/myspell-en-20160901
@@ -3,10 +3,10 @@ DEPEND=app-arch/unzip
 DESCRIPTION=English dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=http://extensions.libreoffice.org/extensions/english-dictionaries
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extensions/english-dictionaries/2016.09.01/@@download/file/dict-en.oxt -> dict-en-20160901.oxt
 _eclass_exported_funcs=src_unpack:myspell-r2 src_install:myspell-r2
 _eclasses_=myspell-r2	d7e8733370dd6a9a1a3b64fdda0146d2
-_md5_=a3ff9fa55a87da8142f423a0eba0e586
+_md5_=ed7a35a949565f8bf59592cd09e07827
diff --git a/metadata/md5-cache/app-dicts/myspell-en-20170101 b/metadata/md5-cache/app-dicts/myspell-en-20170101
index 63675b27cbf4..747db07064da 100644
--- a/metadata/md5-cache/app-dicts/myspell-en-20170101
+++ b/metadata/md5-cache/app-dicts/myspell-en-20170101
@@ -3,10 +3,10 @@ DEPEND=app-arch/unzip
 DESCRIPTION=English dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=http://extensions.libreoffice.org/extensions/english-dictionaries
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extensions/english-dictionaries/2017-01.01/@@download/file/dict-en-20170101.oxt
 _eclass_exported_funcs=src_unpack:myspell-r2 src_install:myspell-r2
 _eclasses_=myspell-r2	d7e8733370dd6a9a1a3b64fdda0146d2
-_md5_=067ae9c155e410bbf3ae00a625a5f66d
+_md5_=77d0e57cb6771c4c2fd558e47b5a73f3
diff --git a/metadata/md5-cache/app-dicts/wordnet-3.0-r4 b/metadata/md5-cache/app-dicts/wordnet-3.0-r4
index 2e15ed8afea9..6ec3d06d534f 100644
--- a/metadata/md5-cache/app-dicts/wordnet-3.0-r4
+++ b/metadata/md5-cache/app-dicts/wordnet-3.0-r4
@@ -4,11 +4,11 @@ DESCRIPTION=A lexical database for the English language
 EAPI=5
 HOMEPAGE=http://wordnet.princeton.edu/
 IUSE=doc
-KEYWORDS=amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=Princeton
 RDEPEND=dev-lang/tcl:0= dev-lang/tk:0=
 SLOT=0
 SRC_URI=ftp://ftp.cogsci.princeton.edu/pub/wordnet/3.0/WordNet-3.0.tar.gz mirror://gentoo/wordnet-3.0-patchset-1.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=3b829916c8786ac823a5409773a2fd06
+_md5_=6daf843e39014649d323d879121a65ec
diff --git a/metadata/md5-cache/app-dicts/wordnet-3.0-r5 b/metadata/md5-cache/app-dicts/wordnet-3.0-r5
index b685aff78285..4eb551f2dd92 100644
--- a/metadata/md5-cache/app-dicts/wordnet-3.0-r5
+++ b/metadata/md5-cache/app-dicts/wordnet-3.0-r5
@@ -4,11 +4,11 @@ DESCRIPTION=A lexical database for the English language
 EAPI=6
 HOMEPAGE=http://wordnet.princeton.edu/
 IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=Princeton
 RDEPEND=dev-lang/tcl:0= dev-lang/tk:0=
 SLOT=0
 SRC_URI=http://wordnetcode.princeton.edu/3.0/WordNet-3.0.tar.gz mirror://gentoo/wordnet-3.0-patchset-1.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=03bd59b9110534e6c026e851e14ca694
+_md5_=e1725c6b36fde415475e5d20d453a819
diff --git a/metadata/md5-cache/app-doc/blas-docs-3.1.1 b/metadata/md5-cache/app-doc/blas-docs-3.1.1
index 0766574632c5..3225746d8ca7 100644
--- a/metadata/md5-cache/app-doc/blas-docs-3.1.1
+++ b/metadata/md5-cache/app-doc/blas-docs-3.1.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Documentation reference and man pages for blas implementations
 EAPI=0
 HOMEPAGE=http://www.netlib.org/blas
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://gentoo/lapack-man-3.1.1.tgz http://www.netlib.org/blas/blasqr.ps http://www.netlib.org/blas/blast-forum/blas-report.ps
 _eclass_exported_funcs=src_install:-
-_md5_=be2a17c97dca4d89f92ddd9bd25311ce
+_md5_=0deb24af10f9d14ccbff11b7d002723e
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.10-r1 b/metadata/md5-cache/app-doc/doxygen-1.8.10-r1
index 26dde1ed425a..45ead3d947d1 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.8.10-r1
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.10-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Documentation system for most programming languages
 EAPI=4
 HOMEPAGE=http://www.doxygen.org/
 IUSE=clang debug doc dot doxysearch latex qt4 sqlite userland_GNU linguas_hy linguas_ar linguas_pt_BR linguas_ca linguas_zh linguas_cs linguas_de linguas_da linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_el linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_lt linguas_mk linguas_nl linguas_nb linguas_pl linguas_pt linguas_ro linguas_ru linguas_sl linguas_sk linguas_sr linguas_sv linguas_tr linguas_uk linguas_vi linguas_af
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng virtual/libiconv clang? ( sys-devel/clang ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( =dev-libs/xapian-1.2* ) latex? ( app-text/texlive[extra] ) qt4? ( dev-qt/qtgui:4 ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=doc? ( latex )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.10.src.tar.gz https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_unpack:qt4-r2 src_prepare:- src_configure:- src_compile:- src_test:cmake-utils src_install:-
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d275302cd06aedef2ba08f81f3104206	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f6d6f6749c36e37f21035303632efd91
+_md5_=fd4f39a22df35ce22d2b94cd2153c09c
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.11-r2 b/metadata/md5-cache/app-doc/doxygen-1.8.11-r2
index 1539f49739b8..23432083d598 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.8.11-r2
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.11-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Documentation system for most programming languages
 EAPI=5
 HOMEPAGE=http://www.doxygen.org/
 IUSE=clang debug doc dot doxysearch latex qt5 sqlite userland_GNU
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( sys-devel/clang ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( =dev-libs/xapian-1.2* ) latex? ( app-text/texlive[extra] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=doc? ( latex )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.11.src.tar.gz https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=732dffa40da84bb192700bef6deeff80
+_md5_=17f4f850d33f129a7a3eef0c7696eac1
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.12 b/metadata/md5-cache/app-doc/doxygen-1.8.12
index f82a9001602e..4f2e69fb8cbb 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.8.12
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.12
@@ -4,7 +4,7 @@ DESCRIPTION=Documentation system for most programming languages
 EAPI=6
 HOMEPAGE=http://www.doxygen.org/
 IUSE=clang debug doc dot doxysearch latex qt5 sqlite userland_GNU
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( sys-devel/clang ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( =dev-libs/xapian-1.2* ) latex? ( app-text/texlive[extra] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=doc? ( latex )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.12.src.tar.gz https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=47b5dd0cf645040685f8299361287eb8
+_md5_=3f5c1067a3c55dd68e21494b80ca700b
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.13 b/metadata/md5-cache/app-doc/doxygen-1.8.13
index 2837ea96ee68..e3eb19fac067 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.8.13
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.13
@@ -4,7 +4,7 @@ DESCRIPTION=Documentation system for most programming languages
 EAPI=6
 HOMEPAGE=http://www.doxygen.org/
 IUSE=clang debug doc dot doxysearch latex qt5 sqlite userland_GNU
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( sys-devel/clang ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( =dev-libs/xapian-1.2* ) latex? ( app-text/texlive[extra] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=doc? ( latex )
@@ -13,4 +13,4 @@ SLOT=0
 SRC_URI=http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.13.src.tar.gz https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8cec521d814c23f22b1a90bc88588586
+_md5_=97cf6976b6293c61c6e1995739317672
diff --git a/metadata/md5-cache/app-doc/doxygen-9999 b/metadata/md5-cache/app-doc/doxygen-9999
index 439a4ed32ce7..08672d078e99 100644
--- a/metadata/md5-cache/app-doc/doxygen-9999
+++ b/metadata/md5-cache/app-doc/doxygen-9999
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_unpack:git-r3 src_prepare:- src_configure:- src_compile:- src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	6efc2d7de07a77bf72c7207b48d0e123	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3786d247ca8e46ddb69ca01397b5adc6
+_md5_=8cf8de98b34869d5f549f06efc2c37a6
diff --git a/metadata/md5-cache/app-doc/motif-reference-manual-2.3.0-r1 b/metadata/md5-cache/app-doc/motif-reference-manual-2.3.0-r1
index 6fe63498f148..33f4bf55c2e2 100644
--- a/metadata/md5-cache/app-doc/motif-reference-manual-2.3.0-r1
+++ b/metadata/md5-cache/app-doc/motif-reference-manual-2.3.0-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Motif Reference Manual
 EAPI=4
 HOMEPAGE=http://www.motifzone.net/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=OPL
 SLOT=0
 SRC_URI=ftp://ftp.ics.com/openmotif/openmotif-2.3.0-manual.pdf.tgz
 _eclass_exported_funcs=pkg_postinst:readme.gentoo src_install:readme.gentoo
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f632d935d3d06b6047a7bb3fca1b7975
+_md5_=c166338aa2684f3ceb50f48a3afb39c9
diff --git a/metadata/md5-cache/app-doc/pms-6_p20151113 b/metadata/md5-cache/app-doc/pms-6_p20151113
index 9cb916471c4f..87b4e23c1f0b 100644
--- a/metadata/md5-cache/app-doc/pms-6_p20151113
+++ b/metadata/md5-cache/app-doc/pms-6_p20151113
@@ -4,9 +4,9 @@ DESCRIPTION=Gentoo Package Manager Specification
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification
 IUSE=binary html
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=CC-BY-SA-3.0
 SLOT=0
 SRC_URI=!binary? ( https://dev.gentoo.org/~ulm/distfiles/pms-6_p20151113.tar.xz ) binary? ( https://dev.gentoo.org/~ulm/distfiles/pms-6_p20151113-prebuilt.tar.xz )
 _eclass_exported_funcs=src_compile:- src_install:-
-_md5_=feaeca603206fa74a1fd6fc954f97827
+_md5_=1a3f2c26cdddb044044a326e08f6836c
diff --git a/metadata/md5-cache/app-doc/zsh-lovers-0.9.0 b/metadata/md5-cache/app-doc/zsh-lovers-0.9.0
index cfba2ca1a43b..035dbefd0e0f 100644
--- a/metadata/md5-cache/app-doc/zsh-lovers-0.9.0
+++ b/metadata/md5-cache/app-doc/zsh-lovers-0.9.0
@@ -3,9 +3,9 @@ DEPEND=app-text/asciidoc
 DESCRIPTION=Tips, tricks and examples for the Z shell
 EAPI=5
 HOMEPAGE=http://grml.org/zsh/zsh-lovers.html
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://deb.grml.org/pool/main/z/zsh-lovers/zsh-lovers_0.9.0.tar.gz
 _eclass_exported_funcs=src_compile:- src_install:-
-_md5_=7fa6a3086ad8344a2ea7abc11a543378
+_md5_=b235f006c7ec626190c89908b05859cc
diff --git a/metadata/md5-cache/app-editors/bvi-1.3.2-r2 b/metadata/md5-cache/app-editors/bvi-1.3.2-r2
index 4979c25539cb..a713dd949781 100644
--- a/metadata/md5-cache/app-editors/bvi-1.3.2-r2
+++ b/metadata/md5-cache/app-editors/bvi-1.3.2-r2
@@ -3,11 +3,11 @@ DEPEND=sys-libs/ncurses !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automak
 DESCRIPTION=display-oriented editor for binary files, based on the vi texteditor
 EAPI=4
 HOMEPAGE=http://bvi.sourceforge.net/
-KEYWORDS=amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://sourceforge/bvi/bvi-1.3.2.src.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:autotools-utils src_test:autotools-utils src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=404fcbb98612b1c0d6a20b5987941f95
+_md5_=7ae1fb9c33534130c52553a218633c43
diff --git a/metadata/md5-cache/app-editors/bvi-1.4.0_alpha b/metadata/md5-cache/app-editors/bvi-1.4.0_alpha
index 54b932ac4637..445b33441211 100644
--- a/metadata/md5-cache/app-editors/bvi-1.4.0_alpha
+++ b/metadata/md5-cache/app-editors/bvi-1.4.0_alpha
@@ -3,11 +3,11 @@ DEPEND=sys-libs/ncurses
 DESCRIPTION=display-oriented editor for binary files, based on the vi texteditor
 EAPI=4
 HOMEPAGE=http://bvi.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://sourceforge/bvi/bvi-1.4.0alpha.src.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b622bd6e3388128cdb4710adad76145d
+_md5_=8e28124cd534e13c3e52e71c6fe202e8
diff --git a/metadata/md5-cache/app-editors/cooledit-3.17.17-r1 b/metadata/md5-cache/app-editors/cooledit-3.17.17-r1
index 2ed3040c183b..491efebb4208 100644
--- a/metadata/md5-cache/app-editors/cooledit-3.17.17-r1
+++ b/metadata/md5-cache/app-editors/cooledit-3.17.17-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Cooledit is a full featured multiple window text editor
 EAPI=0
 HOMEPAGE=http://freshmeat.net/projects/cooledit/
 IUSE=nls
-KEYWORDS=~amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXau
 SLOT=0
 SRC_URI=ftp://ftp.ibiblio.org/pub/Linux/apps/editors/X/cooledit/cooledit-3.17.17.tar.gz https://dev.gentoo.org/~hwoarang/distfiles/cooledit-3.17.17-nopython.tar.gz
 _eclass_exported_funcs=src_unpack:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=bb39c66a0ac31b6fb379653dd9f75cd6
+_md5_=2649e5f328fb18d59beeb80c4a340264
diff --git a/metadata/md5-cache/app-editors/ee-1.5.2 b/metadata/md5-cache/app-editors/ee-1.5.2
index d7711dc3d993..bf20d9373ad6 100644
--- a/metadata/md5-cache/app-editors/ee-1.5.2
+++ b/metadata/md5-cache/app-editors/ee-1.5.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=An easy to use text editor. A subset of aee
 EAPI=4
 HOMEPAGE=http://mahon.cwx.net/
-KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD-2
 RDEPEND=!app-editors/ersatz-emacs
 SLOT=0
 SRC_URI=http://mahon.cwx.net/sources/ee-1.5.2.src.tgz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d724da7b4be13121671e573f956a9cb0
+_md5_=322d45c4696b03c726ac42080e0ea71a
diff --git a/metadata/md5-cache/app-editors/elvis-2.2.0-r4 b/metadata/md5-cache/app-editors/elvis-2.2.0-r4
index bf5afa3e29ec..d66b9c871db5 100644
--- a/metadata/md5-cache/app-editors/elvis-2.2.0-r4
+++ b/metadata/md5-cache/app-editors/elvis-2.2.0-r4
@@ -4,11 +4,11 @@ DESCRIPTION=A vi/ex clone
 EAPI=5
 HOMEPAGE=ftp://ftp.cs.pdx.edu/pub/elvis/
 IUSE=X
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-interix ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris
 LICENSE=Artistic
 RDEPEND=>=sys-libs/ncurses-5.7-r7 X? ( >=x11-proto/xproto-7.0.4 >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 ) app-eselect/eselect-vi
 SLOT=0
 SRC_URI=ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=85268e8c27af11f2f53597e96ae74dc2
+_md5_=5d4099562137c9f70a3fe41f5ea4a114
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r14 b/metadata/md5-cache/app-editors/emacs-23.4-r14
index 4d56508f3bfc..53cc26828e22 100644
--- a/metadata/md5-cache/app-editors/emacs-23.4-r14
+++ b/metadata/md5-cache/app-editors/emacs-23.4-r14
@@ -4,7 +4,7 @@ DESCRIPTION=The extensible, customizable, self-documenting real-time display edi
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IUSE=alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=sys-libs/ncurses:0 >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) !<app-editors/emacs-vcs-23.4
 REQUIRED_USE=?? ( aqua X )
@@ -12,4 +12,4 @@ SLOT=23
 SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 https://dev.gentoo.org/~ulm/emacs/emacs-23.4-patches-19.tar.xz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=4b39df0e40d163680c85891687ea6189
+_md5_=c9d602802a794764e7d41c6ec5b86270
diff --git a/metadata/md5-cache/app-editors/emacs-24.4-r4 b/metadata/md5-cache/app-editors/emacs-24.4-r4
index 72f30567e567..3581fee98b30 100644
--- a/metadata/md5-cache/app-editors/emacs-24.4-r4
+++ b/metadata/md5-cache/app-editors/emacs-24.4-r4
@@ -4,7 +4,7 @@ DESCRIPTION=The extensible, customizable, self-documenting real-time display edi
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IUSE=acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=sys-libs/ncurses:0 >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gfile? ( >=dev-libs/glib-2.28.6 ) gnutls? ( net-libs/gnutls ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) !<app-editors/emacs-vcs-24.4
 REQUIRED_USE=?? ( aqua X )
@@ -12,4 +12,4 @@ SLOT=24
 SRC_URI=mirror://gnu/emacs/emacs-24.4.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.4-patches-5.tar.xz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=80612b1ae3f32aeed96e02abb335a260
+_md5_=3b3706db0c4070df1c8e2c8192b6e9d9
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r3 b/metadata/md5-cache/app-editors/emacs-24.5-r3
index 954c517369fd..252bdb16f976 100644
--- a/metadata/md5-cache/app-editors/emacs-24.5-r3
+++ b/metadata/md5-cache/app-editors/emacs-24.5-r3
@@ -4,7 +4,7 @@ DESCRIPTION=The extensible, customizable, self-documenting real-time display edi
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IUSE=acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=sys-libs/ncurses:0 >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) !<app-editors/emacs-vcs-24.5
 REQUIRED_USE=?? ( aqua X )
@@ -12,4 +12,4 @@ SLOT=24
 SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-2.tar.xz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=dae0afc1d702be0b01e74d3d757e2f41
+_md5_=9dfbe79cd2f93f73259f547f99a04ee2
diff --git a/metadata/md5-cache/app-editors/emacs-25.1 b/metadata/md5-cache/app-editors/emacs-25.1
index 6eab5643fce3..514ec1182d22 100644
--- a/metadata/md5-cache/app-editors/emacs-25.1
+++ b/metadata/md5-cache/app-editors/emacs-25.1
@@ -4,7 +4,7 @@ DESCRIPTION=The extensible, customizable, self-documenting real-time display edi
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IUSE=acl alsa aqua athena cairo dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=sys-libs/ncurses:0 >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( x11-libs/gtk+:3 net-libs/webkit-gtk:3= ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) !<app-editors/emacs-vcs-25.1
 REQUIRED_USE=?? ( aqua X )
@@ -12,4 +12,4 @@ SLOT=25
 SRC_URI=mirror://gnu/emacs/emacs-25.1.tar.xz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=14314fe1e1f1da454a6409aa80b1636e
+_md5_=c8d1fbeeca0c161b41d8bc23bd5b0a8c
diff --git a/metadata/md5-cache/app-editors/fte-20051115-r3 b/metadata/md5-cache/app-editors/fte-20051115-r3
index 0751f1dd5cb6..ba5597f1d148 100644
--- a/metadata/md5-cache/app-editors/fte-20051115-r3
+++ b/metadata/md5-cache/app-editors/fte-20051115-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight text-mode editor
 EAPI=4
 HOMEPAGE=http://fte.sourceforge.net
 IUSE=gpm slang X
-KEYWORDS=~alpha amd64 ppc -sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( GPL-2 Artistic )
 RDEPEND=>=sys-libs/ncurses-5.2 X? ( x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXpm ) gpm? ( >=sys-libs/gpm-1.20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fte/fte-20051115-src.zip mirror://sourceforge/fte/fte-20051115-common.zip
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=0f99e560fd5ca0ecdcd3ecaaf11e73a1
+_md5_=c5470e2529ff653ebba7ef2ab37b1192
diff --git a/metadata/md5-cache/app-editors/fte-20110708-r1 b/metadata/md5-cache/app-editors/fte-20110708-r1
index 0210588169f7..89823f2e0f0c 100644
--- a/metadata/md5-cache/app-editors/fte-20110708-r1
+++ b/metadata/md5-cache/app-editors/fte-20110708-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight text-mode editor
 EAPI=6
 HOMEPAGE=http://fte.sourceforge.net
 IUSE=gpm slang X
-KEYWORDS=~alpha ~amd64 ~ppc -sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( GPL-2 Artistic )
 RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXpm ) gpm? ( >=sys-libs/gpm-1.20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fte/fte-20110708-src.zip mirror://sourceforge/fte/fte-20110708-common.zip
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f5ec875df8ff1ab7b0c3bcd599d99a67
+_md5_=3114dcea01b5ea04af54d69c5857d85e
diff --git a/metadata/md5-cache/app-editors/gedit-3.20.2 b/metadata/md5-cache/app-editors/gedit-3.20.2
index a3a7c3210838..c120b0e62793 100644
--- a/metadata/md5-cache/app-editors/gedit-3.20.2
+++ b/metadata/md5-cache/app-editors/gedit-3.20.2
@@ -4,7 +4,7 @@ DESCRIPTION=A text editor for the GNOME desktop
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Gedit
 IUSE=+introspection +python spell vala python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/libxml2-2.5.0:2 >=dev-libs/glib-2.44:2[dbus] >=x11-libs/gtk+-3.19.0:3[introspection?] >=x11-libs/gtksourceview-3.19.4:3.0[introspection?] >=dev-libs/libpeas-1.14.1[gtk] gnome-base/gsettings-desktop-schemas gnome-base/gvfs x11-libs/libX11 net-libs/libsoup:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/libpeas[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) spell? ( >=app-text/gspell-0.2.5:0= ) x11-themes/adwaita-icon-theme
 REQUIRED_USE=python? ( introspection ) python? ( ^^ ( python_targets_python3_4 python_targets_python3_5 ) )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://gnome/sources/gedit/3.20/gedit-3.20.2.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 pkg_setup:- src_prepare:- src_configure:- src_compile:gnome2 src_test:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c4ea6f9f250b5355e9e948e7007dead0	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vala	ca3f1c504058f5de407febddfae73167	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4504918a6fd0e5d736f60e8996bf8a1b
+_md5_=3c83dbf434931b7e4ac992e9ceee9b8b
diff --git a/metadata/md5-cache/app-editors/gedit-3.22.0 b/metadata/md5-cache/app-editors/gedit-3.22.0
index f9fed10a8fff..7a53d0c5a6b2 100644
--- a/metadata/md5-cache/app-editors/gedit-3.22.0
+++ b/metadata/md5-cache/app-editors/gedit-3.22.0
@@ -4,7 +4,7 @@ DESCRIPTION=A text editor for the GNOME desktop
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Gedit
 IUSE=+introspection +python spell vala python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/libxml2-2.5.0:2 >=dev-libs/glib-2.44:2[dbus] >=x11-libs/gtk+-3.21.3:3[introspection?] >=x11-libs/gtksourceview-3.21.2:3.0[introspection?] >=dev-libs/libpeas-1.14.1[gtk] gnome-base/gsettings-desktop-schemas gnome-base/gvfs x11-libs/libX11 introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/libpeas[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) spell? ( >=app-text/gspell-0.2.5:0= ) x11-themes/adwaita-icon-theme
 REQUIRED_USE=python? ( introspection ) python? ( ^^ ( python_targets_python3_4 python_targets_python3_5 ) )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://gnome/sources/gedit/3.22/gedit-3.22.0.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 pkg_setup:- src_prepare:- src_configure:- src_compile:gnome2 src_test:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c4ea6f9f250b5355e9e948e7007dead0	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vala	ca3f1c504058f5de407febddfae73167	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=bcc89017df8b37e4c6e83e087c2c6029
+_md5_=73d5f4188a7b6e09805955b37f978776
diff --git a/metadata/md5-cache/app-editors/ghex-3.18.2 b/metadata/md5-cache/app-editors/ghex-3.18.2
index 63ae5af7ad9b..021c6d2b9d1e 100644
--- a/metadata/md5-cache/app-editors/ghex-3.18.2
+++ b/metadata/md5-cache/app-editors/ghex-3.18.2
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/atk-1 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3 >=dev-
 DESCRIPTION=GNOME hexadecimal editor
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Ghex
-KEYWORDS=amd64 ~arm ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/atk-1 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3
 SLOT=2
 SRC_URI=mirror://gnome/sources/ghex/3.18/ghex-3.18.2.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:gnome2 src_configure:gnome2 src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c4ea6f9f250b5355e9e948e7007dead0	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=bf33beb054b1a3b3c0bb7588f684d050
+_md5_=2cee93ca39d3356a7a6599d4405db890
diff --git a/metadata/md5-cache/app-editors/ghex-3.18.3 b/metadata/md5-cache/app-editors/ghex-3.18.3
index e0b29c754ad4..d2b346301e6f 100644
--- a/metadata/md5-cache/app-editors/ghex-3.18.3
+++ b/metadata/md5-cache/app-editors/ghex-3.18.3
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/atk-1 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3 >=dev-
 DESCRIPTION=GNOME hexadecimal editor
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Ghex
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/atk-1 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3
 SLOT=2
 SRC_URI=mirror://gnome/sources/ghex/3.18/ghex-3.18.3.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:gnome2 src_configure:gnome2 src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c4ea6f9f250b5355e9e948e7007dead0	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7782ca04dd51ce55ad1ab007867299fa
+_md5_=bd858a1fadcf4ce42cf02bd5366cb052
diff --git a/metadata/md5-cache/app-editors/gvim-8.0.0106 b/metadata/md5-cache/app-editors/gvim-8.0.0106
index e14dcadb4b74..9d985bba15ec 100644
--- a/metadata/md5-cache/app-editors/gvim-8.0.0106
+++ b/metadata/md5-cache/app-editors/gvim-8.0.0106
@@ -4,7 +4,7 @@ DESCRIPTION=GUI version of the Vim text editor
 EAPI=6
 HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim
 IUSE=acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=vim
 RDEPEND=~app-editors/vim-core-8.0.0106 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=luajit? ( lua ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ?? ( python_targets_python2_7 ) ?? ( python_targets_python3_4 python_targets_python3_5 ) )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.0106.tar.gz -> vim-8.0.0106.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	ea170b525f6a38a006be05c9d9429f13	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=88f9ea3c3675574c68e16d5e6e8ce052
+_md5_=462dc182e1fcb3a56b9cbfc896bc233d
diff --git a/metadata/md5-cache/app-editors/gvim-9999 b/metadata/md5-cache/app-editors/gvim-9999
index c39e178bb0d0..ba0b937383c7 100644
--- a/metadata/md5-cache/app-editors/gvim-9999
+++ b/metadata/md5-cache/app-editors/gvim-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=luajit? ( lua ) python? ( || ( python_targets_python2_7 python_targ
 SLOT=0
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_unpack:git-r3 src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	ea170b525f6a38a006be05c9d9429f13	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	6efc2d7de07a77bf72c7207b48d0e123	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0980c855a3f440f43f9dea1ba2f000c9
+_md5_=ed68b12a54f6b3635bb20ba9edfe5618
diff --git a/metadata/md5-cache/app-editors/hexcurse-1.55 b/metadata/md5-cache/app-editors/hexcurse-1.55
index 4cb38fc2d495..85452a534db4 100644
--- a/metadata/md5-cache/app-editors/hexcurse-1.55
+++ b/metadata/md5-cache/app-editors/hexcurse-1.55
@@ -3,11 +3,11 @@ DEPEND=>=sys-libs/ncurses-5.2 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/a
 DESCRIPTION=ncurses based hex editor
 EAPI=5
 HOMEPAGE=http://www.jewfish.net/description.php?title=HexCurse
-KEYWORDS=alpha amd64 arm hppa ppc s390 sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm hppa ppc s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2
 SLOT=0
 SRC_URI=http://www.jewfish.net/downloads/hexcurse-1.55.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=4f0751137b4c52738541c82d0d358cbc
+_md5_=43577ba12374739775f9acb5280f3810
diff --git a/metadata/md5-cache/app-editors/hexedit-1.2.13 b/metadata/md5-cache/app-editors/hexedit-1.2.13
index d5df729931d4..e1c688e5480b 100644
--- a/metadata/md5-cache/app-editors/hexedit-1.2.13
+++ b/metadata/md5-cache/app-editors/hexedit-1.2.13
@@ -3,11 +3,11 @@ DEPEND=sys-libs/ncurses:= !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/autom
 DESCRIPTION=View and edit files in hex or ASCII
 EAPI=5
 HOMEPAGE=http://rigaux.org/hexedit.html
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=http://rigaux.org/hexedit-1.2.13.src.tgz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=4807a7f09acf944dff582338d1a0b570
+_md5_=7bb6e89bdc0aae7e8155eeb1f54534ca
diff --git a/metadata/md5-cache/app-editors/joe-4.2 b/metadata/md5-cache/app-editors/joe-4.2
index 35bec4e0c066..29e4ef2c84ef 100644
--- a/metadata/md5-cache/app-editors/joe-4.2
+++ b/metadata/md5-cache/app-editors/joe-4.2
@@ -4,10 +4,10 @@ DESCRIPTION=A free ASCII-Text Screen Editor for UNIX
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/joe-editor/
 IUSE=xterm
-KEYWORDS=alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=GPL-1+ CC-BY-3.0
 RDEPEND=xterm? ( >=x11-terms/xterm-239 )
 SLOT=0
 SRC_URI=mirror://sourceforge/joe-editor/joe-4.2.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:-
-_md5_=6e94666efbb87f6f893c7e025e9153cc
+_md5_=de168e692df25ef638265ee83a7bfa29
diff --git a/metadata/md5-cache/app-editors/joe-4.3-r1 b/metadata/md5-cache/app-editors/joe-4.3-r1
index a7a6d87a01ef..abf2ce1ea4f5 100644
--- a/metadata/md5-cache/app-editors/joe-4.3-r1
+++ b/metadata/md5-cache/app-editors/joe-4.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A free ASCII-Text Screen Editor for UNIX
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/joe-editor/
 IUSE=xterm
-KEYWORDS=alpha amd64 ~arm ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+KEYWORDS=alpha amd64 ~arm ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=GPL-1+ CC-BY-3.0
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= xterm? ( >=x11-terms/xterm-239 )
 SLOT=0
 SRC_URI=mirror://sourceforge/joe-editor/joe-4.3.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=cb24c34d294f621ad6b27e7a59a29e92
+_md5_=3926ee2dad76c783e5a8109172114c16
diff --git a/metadata/md5-cache/app-editors/leafpad-0.8.18.1 b/metadata/md5-cache/app-editors/leafpad-0.8.18.1
index 753f320f6911..db6d9941e585 100644
--- a/metadata/md5-cache/app-editors/leafpad-0.8.18.1
+++ b/metadata/md5-cache/app-editors/leafpad-0.8.18.1
@@ -4,11 +4,11 @@ DESCRIPTION=A simple GTK2 text editor
 EAPI=5
 HOMEPAGE=http://tarot.freeshell.org/leafpad/
 IUSE=emacs
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/libintl x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://nongnu/leafpad/leafpad-0.8.18.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=94f76f0b439a83607182ea07060a218a
+_md5_=9b254ac2c61dcf2a17c65578671edc7e
diff --git a/metadata/md5-cache/app-editors/mp-5.2.2 b/metadata/md5-cache/app-editors/mp-5.2.2
index 2996ed23ef56..96298e9f6239 100644
--- a/metadata/md5-cache/app-editors/mp-5.2.2
+++ b/metadata/md5-cache/app-editors/mp-5.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=Minimum Profit: A text editor for programmers
 EAPI=4
 HOMEPAGE=http://www.triptico.com/software/mp.html
 IUSE=gtk iconv kde ncurses nls pcre qt4 linguas_de linguas_es linguas_it linguas_nl linguas_ru linguas_sv
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-interix ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ncurses? ( sys-libs/ncurses ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) >=x11-libs/pango-1.8.0 dev-libs/atk dev-libs/glib media-libs/fontconfig media-libs/freetype x11-libs/cairo ) !gtk? ( sys-libs/ncurses ) app-text/grutatxt iconv? ( virtual/libiconv ) nls? ( sys-devel/gettext ) pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://www.triptico.com/download/mp-5.2.2.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ec01dcc0bf614a1db68bd51b505cb3d2
+_md5_=793faeb538a7ab7e4f291fb78e76ead1
diff --git a/metadata/md5-cache/app-editors/nano-2.5.3 b/metadata/md5-cache/app-editors/nano-2.5.3
index 1eb4b32ccbc2..ce020ca0523c 100644
--- a/metadata/md5-cache/app-editors/nano-2.5.3
+++ b/metadata/md5-cache/app-editors/nano-2.5.3
@@ -4,11 +4,11 @@ DESCRIPTION=GNU GPL'd Pico clone with more functionality
 EAPI=5
 HOMEPAGE=http://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
 IUSE=debug justify +magic minimal ncurses nls slang +spell static unicode
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
 SLOT=0
 SRC_URI=http://www.nano-editor.org/dist/v2.5/nano-2.5.3.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=a84ff7cd4fe1672a598ac46eded18450
+_md5_=35ee272b450a67502ed8d324f0318e0d
diff --git a/metadata/md5-cache/app-editors/nano-2.6.3 b/metadata/md5-cache/app-editors/nano-2.6.3
index 646be1f3caa9..ba6511f42c27 100644
--- a/metadata/md5-cache/app-editors/nano-2.6.3
+++ b/metadata/md5-cache/app-editors/nano-2.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GNU GPL'd Pico clone with more functionality
 EAPI=5
 HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
 IUSE=debug justify +magic minimal ncurses nls slang +spell static unicode
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
 SLOT=0
 SRC_URI=https://www.nano-editor.org/dist/v2.6/nano-2.6.3.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=39dec959b9343147af2ad7050bc5670f
+_md5_=b966b1d6587c7d013b2b6438a1de4bcd
diff --git a/metadata/md5-cache/app-editors/nano-2.7.4 b/metadata/md5-cache/app-editors/nano-2.7.4
index ebfc0c702770..cdb2f5a4e3a4 100644
--- a/metadata/md5-cache/app-editors/nano-2.7.4
+++ b/metadata/md5-cache/app-editors/nano-2.7.4
@@ -4,11 +4,11 @@ DESCRIPTION=GNU GPL'd Pico clone with more functionality
 EAPI=5
 HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
 IUSE=debug justify +magic minimal ncurses nls slang +spell static unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
 SLOT=0
 SRC_URI=https://www.nano-editor.org/dist/v2.7/nano-2.7.4.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=0745fb5f3464ba7f5374db35c0b72aae
+_md5_=fdb2f1066696e29f161321d6eccd16e7
diff --git a/metadata/md5-cache/app-editors/nano-9999 b/metadata/md5-cache/app-editors/nano-9999
index 256d02288059..1b32d17e6189 100644
--- a/metadata/md5-cache/app-editors/nano-9999
+++ b/metadata/md5-cache/app-editors/nano-9999
@@ -9,4 +9,4 @@ RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= ma
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	6efc2d7de07a77bf72c7207b48d0e123	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1d3f8001dbff7946b9b2cdc5382c6499
+_md5_=823da0c91c5f56971fb8dd1fdd6f5bd7
diff --git a/metadata/md5-cache/app-editors/ne-2.5 b/metadata/md5-cache/app-editors/ne-2.5
index f83ec541d019..1d1d570bbf37 100644
--- a/metadata/md5-cache/app-editors/ne-2.5
+++ b/metadata/md5-cache/app-editors/ne-2.5
@@ -4,11 +4,11 @@ DESCRIPTION=the nice editor, easy to use for the beginner and powerful for the w
 EAPI=5
 HOMEPAGE=http://ne.di.unimi.it/
 IUSE=tinfo
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2[tinfo?] dev-lang/perl
 SLOT=0
 SRC_URI=http://ne.di.unimi.it//ne-2.5.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=239a6912d714f519ad60603815d37c05
+_md5_=6c2123404815b0bea1d857b0e1f53a49
diff --git a/metadata/md5-cache/app-editors/ne-3.0.1 b/metadata/md5-cache/app-editors/ne-3.0.1
index a3ddb852cf11..aa03366e9c63 100644
--- a/metadata/md5-cache/app-editors/ne-3.0.1
+++ b/metadata/md5-cache/app-editors/ne-3.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=the nice editor, easy to use for the beginner and powerful for the w
 EAPI=5
 HOMEPAGE=http://ne.di.unimi.it/
 IUSE=tinfo
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2[tinfo?] dev-lang/perl
 SLOT=0
 SRC_URI=http://ne.di.unimi.it//ne-3.0.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=de75208f455d5a6bf5d5e8af49c6571f
+_md5_=221635cb6cbf83b4460fb3bb62ddeb2d
diff --git a/metadata/md5-cache/app-editors/scite-3.5.5 b/metadata/md5-cache/app-editors/scite-3.5.5
index 7563fd57d5e1..7c44f9c50f8b 100644
--- a/metadata/md5-cache/app-editors/scite-3.5.5
+++ b/metadata/md5-cache/app-editors/scite-3.5.5
@@ -4,11 +4,11 @@ DESCRIPTION=A very powerful editor for programmers
 EAPI=5
 HOMEPAGE=http://www.scintilla.org/SciTE.html
 IUSE=lua
-KEYWORDS=amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=amd64 ppc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=HPND lua? ( MIT )
 RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/gdk-pixbuf x11-libs/pango lua? ( >=dev-lang/lua-5:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/scintilla/scite355.tgz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=2b7efa8c29bb629a4b56fe8c2948452c
+_md5_=e3d77930473487a51871eea1bfd4b272
diff --git a/metadata/md5-cache/app-editors/scite-3.6.2-r1 b/metadata/md5-cache/app-editors/scite-3.6.2-r1
index b2dc972325b9..94c30705d46d 100644
--- a/metadata/md5-cache/app-editors/scite-3.6.2-r1
+++ b/metadata/md5-cache/app-editors/scite-3.6.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A very powerful editor for programmers
 EAPI=6
 HOMEPAGE=http://www.scintilla.org/SciTE.html
 IUSE=lua
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=HPND lua? ( MIT )
 RDEPEND=dev-libs/glib:= x11-libs/cairo x11-libs/gtk+:2= x11-libs/gdk-pixbuf x11-libs/pango lua? ( >=dev-lang/lua-5:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/scintilla/scite362.tgz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=2cfdd2972bb52cf319dcf44a808c4bc8
+_md5_=d67d111814850cfa015b64055f6b925a
diff --git a/metadata/md5-cache/app-editors/scite-3.6.4-r1 b/metadata/md5-cache/app-editors/scite-3.6.4-r1
index 7683f0faaa82..929750293814 100644
--- a/metadata/md5-cache/app-editors/scite-3.6.4-r1
+++ b/metadata/md5-cache/app-editors/scite-3.6.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A very powerful editor for programmers
 EAPI=5
 HOMEPAGE=http://www.scintilla.org/SciTE.html
 IUSE=lua
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=HPND lua? ( MIT )
 RDEPEND=dev-libs/glib:= x11-libs/cairo >=x11-libs/gtk+-2.0:2= x11-libs/gdk-pixbuf x11-libs/pango lua? ( >=dev-lang/lua-5:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/scintilla/scite364.tgz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=291d310c7f44a7715543f2ea1bdb62c8
+_md5_=a49334b50f11d2713f008d86b6c3303f
diff --git a/metadata/md5-cache/app-editors/scite-3.6.5-r1 b/metadata/md5-cache/app-editors/scite-3.6.5-r1
index 754a13bebe4e..1d7cdee18d0f 100644
--- a/metadata/md5-cache/app-editors/scite-3.6.5-r1
+++ b/metadata/md5-cache/app-editors/scite-3.6.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A very powerful editor for programmers
 EAPI=6
 HOMEPAGE=http://www.scintilla.org/SciTE.html
 IUSE=lua
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=HPND lua? ( MIT )
 RDEPEND=dev-libs/glib:= x11-libs/cairo x11-libs/gtk+:2 x11-libs/gdk-pixbuf x11-libs/pango lua? ( >=dev-lang/lua-5:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/scintilla/scite365.tgz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=c8c6b81b492522474578202116bf93fb
+_md5_=41f2a792e9055306b6e559a3b74ee718
diff --git a/metadata/md5-cache/app-editors/shed-1.15 b/metadata/md5-cache/app-editors/shed-1.15
index 7bd3c33dccdc..0c6994bac8c3 100644
--- a/metadata/md5-cache/app-editors/shed-1.15
+++ b/metadata/md5-cache/app-editors/shed-1.15
@@ -3,11 +3,11 @@ DEPEND=sys-libs/ncurses virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=Simple Hex EDitor
 EAPI=5
 HOMEPAGE=http://shed.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://sourceforge/shed/shed-1.15.tar.gz
 _eclass_exported_funcs=src_prepare:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=abbfcb68c80e835459a57fe1b4bd74a3
+_md5_=422c76bfa1939dbe4c903c547c29137c
diff --git a/metadata/md5-cache/app-editors/vile-9.8k b/metadata/md5-cache/app-editors/vile-9.8k
index a82eb00b12a1..ff0105555db7 100644
--- a/metadata/md5-cache/app-editors/vile-9.8k
+++ b/metadata/md5-cache/app-editors/vile-9.8k
@@ -4,11 +4,11 @@ DESCRIPTION=VI Like Emacs -- yet another full-featured vi clone
 EAPI=5
 HOMEPAGE=http://invisible-island.net/vile/
 IUSE=perl
-KEYWORDS=alpha amd64 ia64 ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=ftp://invisible-island.net/vile/current/vile-9.8k.tgz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f623ecf55458de4d606201179bcca250
+_md5_=2971362ff4064868f9b373b36902fc8f
diff --git a/metadata/md5-cache/app-editors/vile-9.8n b/metadata/md5-cache/app-editors/vile-9.8n
index 29387e39b240..6fe4ca63c3d2 100644
--- a/metadata/md5-cache/app-editors/vile-9.8n
+++ b/metadata/md5-cache/app-editors/vile-9.8n
@@ -4,10 +4,10 @@ DESCRIPTION=VI Like Emacs -- yet another full-featured vi clone
 EAPI=5
 HOMEPAGE=http://invisible-island.net/vile/
 IUSE=perl
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=ftp://invisible-island.net/vile/current/vile-9.8n.tgz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_configure:- src_install:-
-_md5_=f2f97655d08bff1ffdcc40278a1a35cf
+_md5_=1e6076f8d35bc82ccfb068396c8ebc8e
diff --git a/metadata/md5-cache/app-editors/vile-9.8o b/metadata/md5-cache/app-editors/vile-9.8o
index df40134222e9..fbba9f820872 100644
--- a/metadata/md5-cache/app-editors/vile-9.8o
+++ b/metadata/md5-cache/app-editors/vile-9.8o
@@ -4,10 +4,10 @@ DESCRIPTION=VI Like Emacs -- yet another full-featured vi clone
 EAPI=5
 HOMEPAGE=http://invisible-island.net/vile/
 IUSE=perl
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=ftp://invisible-island.net/vile/current/vile-9.8o.tgz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_configure:- src_install:-
-_md5_=fada6579ce85b176517863d4eaa0bc79
+_md5_=24955c7814772fe3f4c1b93d22a630cb
diff --git a/metadata/md5-cache/app-editors/vile-9.8p b/metadata/md5-cache/app-editors/vile-9.8p
index 3354715b20be..74242ef79835 100644
--- a/metadata/md5-cache/app-editors/vile-9.8p
+++ b/metadata/md5-cache/app-editors/vile-9.8p
@@ -4,10 +4,10 @@ DESCRIPTION=VI Like Emacs -- yet another full-featured vi clone
 EAPI=5
 HOMEPAGE=http://invisible-island.net/vile/
 IUSE=perl
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:0 perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=ftp://invisible-island.net/vile/current/vile-9.8p.tgz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_configure:- src_install:-
-_md5_=7b5627ad3639c1700905fb60e038fdc1
+_md5_=9e7312fa9e65ba542324c170529c8494
diff --git a/metadata/md5-cache/app-editors/vile-9.8r b/metadata/md5-cache/app-editors/vile-9.8r
index 21f1e8c0bb7f..7fa139721195 100644
--- a/metadata/md5-cache/app-editors/vile-9.8r
+++ b/metadata/md5-cache/app-editors/vile-9.8r
@@ -4,10 +4,10 @@ DESCRIPTION=VI Like Emacs -- yet another full-featured vi clone
 EAPI=6
 HOMEPAGE=http://invisible-island.net/vile/
 IUSE=perl
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:0= perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=ftp://invisible-island.net/vile/current/vile-9.8r.tgz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- src_configure:- src_install:-
-_md5_=1c2ee99de6409cc6e85c4d399a669d86
+_md5_=ee7dca6d12e814db56520a3d119e0e8f
diff --git a/metadata/md5-cache/app-editors/vim-8.0.0106 b/metadata/md5-cache/app-editors/vim-8.0.0106
index 5bad57b33bdf..e89c00f87509 100644
--- a/metadata/md5-cache/app-editors/vim-8.0.0106
+++ b/metadata/md5-cache/app-editors/vim-8.0.0106
@@ -4,7 +4,7 @@ DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=6
 HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim
 IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.0106 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=luajit? ( lua ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ?? ( python_targets_python2_7 ) ?? ( python_targets_python3_4 python_targets_python3_5 ) )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.0106.tar.gz -> vim-8.0.0106.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	ea170b525f6a38a006be05c9d9429f13	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf
-_md5_=d902cab44c65b74868be8cb213086602
+_md5_=7b37146b19cd134e5d3ed4c470590706
diff --git a/metadata/md5-cache/app-editors/vim-9999 b/metadata/md5-cache/app-editors/vim-9999
index 5d98f3bcf9aa..cebc7e2bb5b8 100644
--- a/metadata/md5-cache/app-editors/vim-9999
+++ b/metadata/md5-cache/app-editors/vim-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=luajit? ( lua ) python? ( || ( python_targets_python2_7 python_targ
 SLOT=0
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_unpack:git-r3 src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	ea170b525f6a38a006be05c9d9429f13	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	6efc2d7de07a77bf72c7207b48d0e123	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf
-_md5_=54177f450989437170bff9990d8e5a22
+_md5_=179268f93ea936e8233f7c4addbc9efc
diff --git a/metadata/md5-cache/app-editors/vim-core-7.4.2102 b/metadata/md5-cache/app-editors/vim-core-7.4.2102
index 768ce9cfe8c6..3837e503497d 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.4.2102
+++ b/metadata/md5-cache/app-editors/vim-core-7.4.2102
@@ -4,11 +4,11 @@ DESCRIPTION=vim and gvim shared files
 EAPI=6
 HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim
 IUSE=nls acl minimal
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v7.4.2102.tar.gz -> vim-7.4.2102.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-7.4.2102-gentoo-patches.tar.bz2
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf
-_md5_=5087c7bcb784ce896eaab7e4a64415c3
+_md5_=a5cdd99bb6c29637e9d56e7d118fa523
diff --git a/metadata/md5-cache/app-editors/vim-core-7.4.769 b/metadata/md5-cache/app-editors/vim-core-7.4.769
index bdf8771e41cd..f5508046b81c 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.4.769
+++ b/metadata/md5-cache/app-editors/vim-core-7.4.769
@@ -4,11 +4,11 @@ DESCRIPTION=vim and gvim shared files
 EAPI=5
 HOMEPAGE=http://www.vim.org/
 IUSE=nls acl minimal
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v7.4.769.tar.gz -> vim-7.4.769.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf
-_md5_=f1aa0bc7706d1a91738478d8519a9245
+_md5_=0dd10a6b446ee09b9e7fc4929f752a3f
diff --git a/metadata/md5-cache/app-editors/vim-core-8.0.0005 b/metadata/md5-cache/app-editors/vim-core-8.0.0005
index dc679c983ec9..add53cfc8b22 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.0.0005
+++ b/metadata/md5-cache/app-editors/vim-core-8.0.0005
@@ -4,11 +4,11 @@ DESCRIPTION=vim and gvim shared files
 EAPI=6
 HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim
 IUSE=nls acl minimal
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.0005.tar.gz -> vim-8.0.0005.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-7.4.2102-gentoo-patches.tar.bz2
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf
-_md5_=0a1882255e333008a9467fc741756eeb
+_md5_=ae91b712e08102b0a6635226b98bf583
diff --git a/metadata/md5-cache/app-editors/vim-core-8.0.0005-r1 b/metadata/md5-cache/app-editors/vim-core-8.0.0005-r1
index bb0cd50a3392..e7e28db4b106 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.0.0005-r1
+++ b/metadata/md5-cache/app-editors/vim-core-8.0.0005-r1
@@ -4,11 +4,11 @@ DESCRIPTION=vim and gvim shared files
 EAPI=6
 HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim
 IUSE=nls acl minimal
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.0005.tar.gz -> vim-8.0.0005.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-7.4.2102-gentoo-patches.tar.bz2
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf
-_md5_=fdf539f6ff6dc77996a8e815ed39b89a
+_md5_=e6111739127dcd73077ab25f755f7c44
diff --git a/metadata/md5-cache/app-editors/vim-core-8.0.0106 b/metadata/md5-cache/app-editors/vim-core-8.0.0106
index 715c9bd241ed..4dd8dd4c833a 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.0.0106
+++ b/metadata/md5-cache/app-editors/vim-core-8.0.0106
@@ -4,11 +4,11 @@ DESCRIPTION=vim and gvim shared files
 EAPI=6
 HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim
 IUSE=nls acl minimal
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.0106.tar.gz -> vim-8.0.0106.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf
-_md5_=ae32bcf849e6eada61f427d404eae2fb
+_md5_=2887bc4fb1a7e7526b9c31a8dca673f3
diff --git a/metadata/md5-cache/app-editors/vim-core-9999 b/metadata/md5-cache/app-editors/vim-core-9999
index 2f33417b0849..f5fa6c674392 100644
--- a/metadata/md5-cache/app-editors/vim-core-9999
+++ b/metadata/md5-cache/app-editors/vim-core-9999
@@ -9,4 +9,4 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_unpack:git-r3 src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	6efc2d7de07a77bf72c7207b48d0e123	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf
-_md5_=b9fec538791e3c6d0c1d4bb85622d605
+_md5_=b977c0e26a23d55d85b9a1f78b12bc57
diff --git a/metadata/md5-cache/app-editors/zile-2.3.24-r1 b/metadata/md5-cache/app-editors/zile-2.3.24-r1
index 6094848e1995..75cebbf994ff 100644
--- a/metadata/md5-cache/app-editors/zile-2.3.24-r1
+++ b/metadata/md5-cache/app-editors/zile-2.3.24-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Zile is a small Emacs clone
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/zile/
 IUSE=test valgrind
-KEYWORDS=alpha amd64 ppc sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://gnu/zile/zile-2.3.24.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=4a1d8a4223aeabc82831b78774a358f9
+_md5_=179a7099b36caa4129d4aa7301fffd7a
diff --git a/metadata/md5-cache/app-editors/zile-2.4.11 b/metadata/md5-cache/app-editors/zile-2.4.11
index d9ce9d4926e3..058b8ab3bb81 100644
--- a/metadata/md5-cache/app-editors/zile-2.4.11
+++ b/metadata/md5-cache/app-editors/zile-2.4.11
@@ -4,10 +4,10 @@ DESCRIPTION=Zile is a small Emacs clone
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/zile/
 IUSE=acl test
-KEYWORDS=alpha amd64 arm ppc sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/boehm-gc-7.2 sys-libs/ncurses:0 acl? ( virtual/acl )
 SLOT=0
 SRC_URI=mirror://gnu/zile/zile-2.4.11.tar.gz
 _eclass_exported_funcs=src_configure:- src_install:-
-_md5_=420ff039fa70d7cadb94779fb58160de
+_md5_=64679b04ff798510c8f74dbd8f622ba2
author	Repository QA checks <repo-qa-checks@gentoo.org>	2017-01-29 14:42:51 +0000
committer	Repository QA checks <repo-qa-checks@gentoo.org>	2017-01-29 14:42:51 +0000
commit	8a4cab10c7de87f54f97d59762af4e0a4e58e66e (patch)
tree	469bbb2f09ca554b1401f43d9fe3e0fde36b2d85 /metadata/md5-cache
parent	Merge updates from master (diff)
download	gentoo-8a4cab10c7de87f54f97d59762af4e0a4e58e66e.tar.gz gentoo-8a4cab10c7de87f54f97d59762af4e0a4e58e66e.tar.bz2 gentoo-8a4cab10c7de87f54f97d59762af4e0a4e58e66e.zip